[Asterisk-cvs] asterisk/channels chan_sip.c,1.639,1.640

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Fix reload on sip peers (bug #3432)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.639
retrieving revision 1.640
diff -u -d -r1.639 -r1.640
--- chan_sip.c	26 Jan 2005 00:11:38 -0000	1.639
+++ chan_sip.c	27 Jan 2005 04:46:31 -0000	1.640
@@ -8829,15 +8829,27 @@
 		if (!found) {
 			if (name)
 				strncpy(peer->name, name, sizeof(peer->name)-1);
-			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);
 			peer->addr.sin_port = htons(DEFAULT_SIP_PORT);
 			peer->addr.sin_family = AF_INET;
 			peer->defaddr.sin_family = AF_INET;
 			peer->expiry = expiry;
-			ast_copy_flags(peer, &global_flags, SIP_USEREQPHONE);
 		}
+		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);
+		ast_copy_flags(peer, &global_flags, SIP_USEREQPHONE);
+		peer->secret[0] = '\0';
+		peer->md5secret[0] = '\0';
+		peer->cid_num[0] = '\0';
+		peer->cid_name[0] = '\0';
+		peer->fromdomain[0] = '\0';
+		peer->fromuser[0] = '\0';
+		peer->regexten[0] = '\0';
+		peer->mailbox[0] = '\0';
+		peer->callgroup = 0;
+		peer->pickupgroup = 0;
+		peer->rtpkeepalive = global_rtpkeepalive;
+		peer->maxms = 0;
 		peer->prefs = prefs;
 		oldha = peer->ha;
 		peer->ha = NULL;