[svn-commits] bbryant: branch 1.6.0 r132469 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Mon Jul 21 12:43:29 2008
New Revision: 132469

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132469
Log:
Merged revisions 132468 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r132468 | bbryant | 2008-07-21 12:42:45 -0500 (Mon, 21 Jul 2008) | 5 lines

Fix bug where ast_parse_arg would inadvertantly enable sip tcp when parsing a tcpbindaddr if it was disabled.

(closes issue #13117)
Reported by: pj

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=132469&r1=132468&r2=132469
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Mon Jul 21 12:43:29 2008
@@ -20537,8 +20537,10 @@
 			sip_tcp_desc.sin.sin_family = ast_false(v->value) ? 0 : AF_INET;
 			ast_debug(2, "Enabling TCP socket for listening\n");
 		} else if (!strcasecmp(v->name, "tcpbindaddr")) {
+			int family = sip_tcp_desc.sin.sin_family;
 			if (ast_parse_arg(v->value, PARSE_INADDR, &sip_tcp_desc.sin))
 				ast_log(LOG_WARNING, "Invalid %s '%s' at line %d of %s\n", v->name, v->value, v->lineno, config);
+			sip_tcp_desc.sin.sin_family = family;
 			ast_debug(2, "Setting TCP socket address to %s\n", v->value);
 		} else if (!strcasecmp(v->name, "tlsenable")) {
 			default_tls_cfg.enabled = ast_true(v->value) ? TRUE : FALSE;