[Asterisk-cvs] asterisk/channels Makefile,1.41,1.42 chan_sip.c,1.315,1.316

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv8398/channels

Modified Files:
	Makefile chan_sip.c 
Log Message:
Minor SIP cleanups for valgrind, finally close the coffin on IAX1 and take it ou
t of the normal build process.


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- Makefile	21 Mar 2004 21:24:40 -0000	1.41
+++ Makefile	23 Mar 2004 05:06:50 -0000	1.42
@@ -16,13 +16,19 @@
 USE_MYSQL_FRIENDS=0
 USE_SIP_MYSQL_FRIENDS=0
 
-CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
+CHANNEL_LIBS=chan_modem.so chan_sip.so \
 	     chan_modem_aopen.so \
              chan_modem_bestdata.so chan_modem_i4l.so \
              chan_agent.so chan_mgcp.so chan_iax2.so \
 	     chan_local.so chan_skinny.so
 
 #
+# If you really want IAX1 uncomment the following, but it is
+# unmaintained
+#
+#CHANNEL_LIBS+=chan_iax.so
+
+#
 # If you really want VoFR you can have it :-P
 #
 #CHANNEL_LIBS+=chan_vofr
@@ -160,6 +166,7 @@
 
 install: all
 	for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi
 
 depend: .depend
 

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- chan_sip.c	21 Mar 2004 21:24:40 -0000	1.315
+++ chan_sip.c	23 Mar 2004 05:06:50 -0000	1.316
@@ -2625,7 +2625,7 @@
 	char a2[1024] = "";
 	int x;
 	struct sockaddr_in dest;
-	struct sockaddr_in vdest;
+	struct sockaddr_in vdest = { 0, };
 	/* XXX We break with the "recommendation" and send our IP, in order that our
 	       peer doesn't have to gethostbyname() us XXX */
 	len = 0;
@@ -3696,7 +3696,7 @@
 		char a1_hash[256];
 		char a2_hash[256];
 		char resp[256];
-		char resp_hash[256];
+		char resp_hash[256]="";
 		char tmp[256] = "";
 		char *c;
 		char *z;