kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve initial poking behavior (bug #2419)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-09-11 13:50:26 +00:00
parent e31d4ee777
commit ac1e884328
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
channels/chan_sip.c
View File

@@ -4270,6 +4270,14 @@ static int expire_register(void *data)
static int sip_poke_peer(struct sip_peer *peer); static int sip_poke_peer(struct sip_peer *peer);
static int sip_poke_peer_s(void *data)
{
struct sip_peer *peer = data;
peer->pokeexpire = -1;
sip_poke_peer(peer);
return 0;
}
/*--- reg_source_db: Save registration in Asterisk DB ---*/ /*--- reg_source_db: Save registration in Asterisk DB ---*/
static void reg_source_db(struct sip_peer *p) static void reg_source_db(struct sip_peer *p)
{ {
@@ -4308,7 +4316,13 @@ static void reg_source_db(struct sip_peer *p)
p->addr.sin_family = AF_INET; p->addr.sin_family = AF_INET;
p->addr.sin_addr = in; p->addr.sin_addr = in;
p->addr.sin_port = htons(atoi(c)); p->addr.sin_port = htons(atoi(c));
sip_poke_peer(p); if (sipsock < 0) {
/* SIP isn't up yet, so schedule a poke only, pretty soon */
if (p->pokeexpire > -1)
ast_sched_del(sched, p->pokeexpire);
p->pokeexpire = ast_sched_add(sched, rand() % 5000 + 1, sip_poke_peer_s, p);
} else
sip_poke_peer(p);
if (p->expire > -1) if (p->expire > -1)
ast_sched_del(sched, p->expire); ast_sched_del(sched, p->expire);
p->expire = ast_sched_add(sched, (expiry + 10) * 1000, expire_register, (void *)p); p->expire = ast_sched_add(sched, (expiry + 10) * 1000, expire_register, (void *)p);
@@ -6445,14 +6459,6 @@ static struct ast_cli_entry cli_no_history =
static struct ast_cli_entry cli_no_debug = static struct ast_cli_entry cli_no_debug =
{ { "sip", "no", "debug", NULL }, sip_no_debug, "Disable SIP debugging", no_debug_usage }; { { "sip", "no", "debug", NULL }, sip_no_debug, "Disable SIP debugging", no_debug_usage };
static int sip_poke_peer_s(void *data)
{
struct sip_peer *peer = data;
peer->pokeexpire = -1;
sip_poke_peer(peer);
return 0;
}
/*--- parse_moved_contact: Parse 302 Moved temporalily response */ /*--- parse_moved_contact: Parse 302 Moved temporalily response */
static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req) static void parse_moved_contact(struct sip_pvt *p, struct sip_request *req)
{ {
@@ -7818,6 +7824,8 @@ static int sip_poke_peer(struct sip_peer *peer)
if (!peer->maxms || !peer->addr.sin_addr.s_addr) { if (!peer->maxms || !peer->addr.sin_addr.s_addr) {
/* IF we have no IP, or this isn't to be monitored, return /* IF we have no IP, or this isn't to be monitored, return
imeediately after clearing things out */ imeediately after clearing things out */
if (peer->pokeexpire > -1)
ast_sched_del(sched, peer->pokeexpire);
peer->lastms = 0; peer->lastms = 0;
peer->pokeexpire = -1; peer->pokeexpire = -1;
peer->call = NULL; peer->call = NULL;
@@ -8368,7 +8376,7 @@ static struct sip_peer *build_peer(char *name, struct ast_variable *v)
*/ */
v=v->next; v=v->next;
} }
if (!found && peer->dynamic && (sipsock > -1)) if (!found && peer->dynamic)
reg_source_db(peer); reg_source_db(peer);
peer->delme = 0; peer->delme = 0;
} }