sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to expire if there is no expirey 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer 2003-11-14 04:11:03 +00:00
parent ae77308b3f
commit 6f6ff1a673
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/chan_iax.c
View File

@ -1594,6 +1594,7 @@ static struct iax_peer *mysql_peer(char *peer)
strncpy(p->name, peer, sizeof(p->name) - 1);
p->dynamic = 1;
p->delme = 1;
p->expire = -1;
p->capability = iax_capability;
strcpy(p->methods, "md5,plaintext");
}
@ -3447,7 +3448,8 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno)
/* Setup the expirey */
if (p->expire > -1)
ast_sched_del(sched, p->expire);
p->expire = ast_sched_add(sched, p->expirey * 1000, expire_registry, (void *)p);
if (p->expirey)
p->expire = ast_sched_add(sched, p->expirey * 1000, expire_registry, (void *)p);
MYSNPRINTF "peer=%s;yourip=%s;yourport=%d;refresh=%d;",
p->name, inet_ntoa(p->addr.sin_addr), ntohs(p->addr.sin_port), p->expirey);
if (p->hascallerid)

4
channels/chan_iax2.c
View File

@ -1596,6 +1596,7 @@ static struct iax2_peer *mysql_peer(char *peer)
strncpy(p->name, peer, sizeof(p->name) - 1);
p->dynamic = 1;
p->delme = 1;
p->expire = -1;
p->capability = iax2_capability;
p->authmethods = IAX_AUTH_MD5 | IAX_AUTH_PLAINTEXT;
}
@ -3568,7 +3569,8 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno)
/* Setup the expirey */
if (p->expire > -1)
ast_sched_del(sched, p->expire);
p->expire = ast_sched_add(sched, p->expirey * 1000, expire_registry, (void *)p);
if (p->expirey)
p->expire = ast_sched_add(sched, p->expirey * 1000, expire_registry, (void *)p);
iax_ie_append_str(&ied, IAX_IE_USERNAME, p->name);
iax_ie_append_short(&ied, IAX_IE_REFRESH, p->expirey);
iax_ie_append_addr(&ied, IAX_IE_APPARENT_ADDR, &p->addr);