[asterisk-commits] wedhorn: trunk r340032 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Asterisk project]

Author: wedhorn
Date: Sun Oct  9 17:21:42 2011
New Revision: 340032

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340032
Log:
Merged revisions 340031 via svnmerge from 
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.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=340032&r1=340031&r2=340032
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Sun Oct  9 17:21:42 2011
@@ -6607,6 +6607,8 @@
 			transmit_capabilitiesreq(s->device);
 		} else {
 			transmit_registerrej(s);
+			ast_free(req);
+			return -1;
 		}
 	case IP_PORT_MESSAGE:
 		res = handle_ip_port_message(req, s);
@@ -6926,6 +6928,7 @@
 			res = handle_message(req, s);
 			if (res < 0) {
 				destroy_session(s);
+				ast_verb(3, "Ending Skinny session from %s\n", ast_inet_ntoa(s->sin.sin_addr));
 				return NULL;
 			}
 		}