[Asterisk-cvs] asterisk/channels chan_sip.c,1.658,1.659

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Remove a couple of peerification bbugs (bug #3576)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.658
retrieving revision 1.659
diff -u -d -r1.658 -r1.659
--- chan_sip.c	13 Feb 2005 18:40:50 -0000	1.658
+++ chan_sip.c	13 Feb 2005 22:40:41 -0000	1.659
@@ -6172,7 +6172,7 @@
 static void  print_group(int fd, unsigned int group) 
 {
 	char buf[256];
-	ast_cli(fd, ast_print_group(buf, sizeof(buf), group) );
+	ast_cli(fd, "%s\n", ast_print_group(buf, sizeof(buf), group) );
 }
 
 /*--- dtmfmode2str: Convert DTMF mode to printable string ---*/
@@ -9177,6 +9177,11 @@
 			peer->defaddr.sin_family = AF_INET;
 			peer->expiry = expiry;
 		}
+		/* If we have channel variables, remove them (reload) */
+		if(peer->chanvars) {
+			ast_variables_destroy(peer->chanvars);
+			peer->chanvars = NULL;
+		}
 		strncpy(peer->context, default_context, sizeof(peer->context)-1);
 		strncpy(peer->language, default_language, sizeof(peer->language)-1);
 		strncpy(peer->musicclass, global_musicclass, sizeof(peer->musicclass)-1);