kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't call reg_source_db() until after the peer has been added to the peer list

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-06-05 20:05:55 +00:00
parent 723d6b5be8
commit 8a0ade1fd8
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_iax2.c
View File

@@ -238,7 +238,6 @@ struct iax2_context {
static int global_rtautoclear = 120;
static struct iax2_peer *realtime_peer(const char *peername);
static int reload_config(void);
static int iax2_reload(int fd, int argc, char *argv[]);
@@ -611,6 +610,9 @@ static struct iax2_dpcache {
AST_MUTEX_DEFINE_STATIC(dpcache_lock);
static void reg_source_db(struct iax2_peer *p);
static struct iax2_peer *realtime_peer(const char *peername);
static void destroy_peer(struct iax2_peer *peer);
static int ast_cli_netstats(int fd, int limit_fmt);
@@ -2567,6 +2569,8 @@ static struct iax2_peer *realtime_peer(const char *peername)
peer->next = peerl.peers;
peerl.peers = peer;
ast_mutex_unlock(&peerl.lock);
if (ast_test_flag(peer, IAX_DYNAMIC))
reg_source_db(peer);
} else {
ast_set_flag(peer, IAX_TEMPONLY);
}
@@ -7957,8 +7961,6 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
ast_clear_flag(peer, IAX_DELME);
/* Make sure these are IPv4 addresses */
peer->addr.sin_family = AF_INET;
if (!found && ast_test_flag(peer, IAX_DYNAMIC) && !temponly)
reg_source_db(peer);
}
if (oldha)
ast_free_ha(oldha);
@@ -8458,6 +8460,8 @@ static int set_config(char *config_file, int reload)
peer->next = peerl.peers;
peerl.peers = peer;
ast_mutex_unlock(&peerl.lock);
if (ast_test_flag(peer, IAX_DYNAMIC))
reg_source_db(peer);
}
} else if (strcasecmp(utype, "user")) {
ast_log(LOG_WARNING, "Unknown type '%s' for '%s' in %s\n", utype, cat, config_file);