[svn-commits] mvanbaak: branch group/appdocsxml r128280 - in /team/group/appdocsxml: ./ cha...

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Jul  5 16:26:31 2008
New Revision: 128280

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128280
Log:
Merged revisions 128254,128274 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r128254 | mvanbaak | 2008-07-05 23:20:09 +0200 (Sat, 05 Jul 2008) | 2 lines

fix compiling of chan_sip.c

........
r128274 | oej | 2008-07-05 23:25:04 +0200 (Sat, 05 Jul 2008) | 2 lines

Set tls setting to default in reload_config.

........

Modified:
    team/group/appdocsxml/   (props changed)
    team/group/appdocsxml/channels/chan_sip.c

Propchange: team/group/appdocsxml/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Jul  5 16:26:31 2008
@@ -1,1 +1,1 @@
-/trunk:1-128252
+/trunk:1-128275

Modified: team/group/appdocsxml/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/channels/chan_sip.c?view=diff&rev=128280&r1=128279&r2=128280
==============================================================================
--- team/group/appdocsxml/channels/chan_sip.c (original)
+++ team/group/appdocsxml/channels/chan_sip.c Sat Jul  5 16:26:31 2008
@@ -315,7 +315,7 @@
        \note Should be aligned to above table as index */
 static const struct invstate2stringtable {
 	const enum invitestates state;
-	const char const *desc;
+	const char *desc;
 } invitestate2string[] = {
 	{INV_NONE,              "None"  },
 	{INV_CALLING,           "Calling (Trying)"},
@@ -21006,6 +21006,7 @@
 	memset(&sip_tls_desc.sin, 0, sizeof(sip_tls_desc.sin));
 
 	sip_tcp_desc.sin.sin_family = AF_INET;
+	default_tls_cfg.enabled = FALSE;
 
 	sip_tcp_desc.sin.sin_port = htons(STANDARD_SIP_PORT);
 	sip_tls_desc.sin.sin_port = htons(STANDARD_TLS_PORT);