merge brian's cleanups
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
2d8c703fa0
commit
22243ee9ae
1 changed files with 9 additions and 4 deletions
|
@ -3648,6 +3648,7 @@ static int parse_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_req
|
||||||
int expiry = atoi(expires);
|
int expiry = atoi(expires);
|
||||||
char *c, *n, *pt;
|
char *c, *n, *pt;
|
||||||
int port;
|
int port;
|
||||||
|
char *useragent;
|
||||||
struct hostent *hp;
|
struct hostent *hp;
|
||||||
struct ast_hostent ahp;
|
struct ast_hostent ahp;
|
||||||
struct sockaddr_in oldsin;
|
struct sockaddr_in oldsin;
|
||||||
|
@ -3679,6 +3680,7 @@ static int parse_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_req
|
||||||
ast_sched_del(sched, p->expire);
|
ast_sched_del(sched, p->expire);
|
||||||
p->expire = -1;
|
p->expire = -1;
|
||||||
ast_db_del("SIP/Registry", p->name);
|
ast_db_del("SIP/Registry", p->name);
|
||||||
|
strcpy(p->useragent, "");
|
||||||
if (option_verbose > 2)
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Unregistered SIP '%s'\n", p->name);
|
ast_verbose(VERBOSE_PREFIX_3 "Unregistered SIP '%s'\n", p->name);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -3744,10 +3746,13 @@ static int parse_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_req
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save User agent */
|
/* Save User agent */
|
||||||
strncpy(p->useragent, get_header(req, "User-Agent"),sizeof(p->useragent));
|
useragent = get_header(req, "User-Agent");
|
||||||
if (option_verbose > 2)
|
if(useragent && strcasecmp(useragent, p->useragent)) {
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Saved useragent \"%s\" for peer %s\n",p->useragent,p->name);
|
strncpy(p->useragent, get_header(req, "User-Agent"),sizeof(p->useragent));
|
||||||
|
if (option_verbose > 2) {
|
||||||
|
ast_verbose(VERBOSE_PREFIX_3 "Saved useragent \"%s\" for peer %s\n",p->useragent,p->name);
|
||||||
|
}
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue