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

Merged revisions 340031 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r340031 | wedhorn | 2011-10-10 09:18:27 +1100 (Mon, 10 Oct 2011) | 8 lines
  
  Return -1 to skinny_session if register rejected.
  
  If device registration is rejected, return -1 so that the session is
  destroyed immediately. Previously, a segfault would occur on a 
  graceful shutdown if a register is rejected and the skinny_session
  has not yet timed out.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Damien Wedhorn
2011-10-09 22:21:42 +00:00
parent b90964eda5
commit 0ac40dc255
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
channels/chan_skinny.c
View File

@@ -6607,6 +6607,8 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
transmit_capabilitiesreq(s->device); transmit_capabilitiesreq(s->device);
} else { } else {
transmit_registerrej(s); transmit_registerrej(s);
ast_free(req);
return -1;
} }
case IP_PORT_MESSAGE: case IP_PORT_MESSAGE:
res = handle_ip_port_message(req, s); res = handle_ip_port_message(req, s);
@@ -6926,6 +6928,7 @@ static void *skinny_session(void *data)
res = handle_message(req, s); res = handle_message(req, s);
if (res < 0) { if (res < 0) {
destroy_session(s); destroy_session(s);
ast_verb(3, "Ending Skinny session from %s\n", ast_inet_ntoa(s->sin.sin_addr));
return NULL; return NULL;
} }
} }