Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.872
diff -u -r1.872 chan_sip.c
--- channels/chan_sip.c	29 Sep 2005 17:41:00 -0000	1.872
+++ channels/chan_sip.c	2 Oct 2005 18:54:01 -0000
@@ -756,7 +756,6 @@
 	ast_group_t pickupgroup;	/* Pickup group */
 	struct ast_dnsmgr_entry *dnsmgr;/* DNS refresh manager for peer */
 	struct sockaddr_in addr;	/* IP address of peer */
-	struct in_addr mask;
 
 	/* Qualification */
 	struct sip_pvt *call;		/* Call pointer */
@@ -7325,8 +7324,8 @@
 	regex_t regexbuf;
 	int havepattern = 0;
 
-#define FORMAT2 "%-25.25s  %-15.15s %-3.3s %-3.3s %-3.3s %-15.15s  %-8s %-10s\n"
-#define FORMAT  "%-25.25s  %-15.15s %-3.3s %-3.3s %-3.3s %-15.15s  %-8d %-10s\n"
+#define FORMAT2 "%-25.25s  %-15.15s %-3.3s %-3.3s %-3.3s %-8s %-10s\n"
+#define FORMAT  "%-25.25s  %-15.15s %-3.3s %-3.3s %-3.3s %-8d %-10s\n"
 
 	char name[256];
 	char iabuf[INET_ADDRSTRLEN];
@@ -7357,11 +7356,10 @@
 	}
 
 	if (!s) { /* Normal list */
-		ast_cli(fd, FORMAT2, "Name/username", "Host", "Dyn", "Nat", "ACL", "Mask", "Port", "Status");
+		ast_cli(fd, FORMAT2, "Name/username", "Host", "Dyn", "Nat", "ACL", "Port", "Status");
 	} 
 	
 	ASTOBJ_CONTAINER_TRAVERSE(&peerl, 1, do {
-		char nm[20] = "";
 		char status[20] = "";
 		char srch[2000];
 		char pstatus;
@@ -7373,7 +7371,6 @@
 			continue;
 		}
 
-		ast_inet_ntoa(nm, sizeof(nm), iterator->mask);
 		if (!ast_strlen_zero(iterator->username) && !s)
 			snprintf(name, sizeof(name), "%s/%s", iterator->name, iterator->username);
 		else
@@ -7400,7 +7397,7 @@
 			ast_test_flag(iterator, SIP_DYNAMIC) ? " D " : "   ", 	/* Dynamic or not? */
 			(ast_test_flag(iterator, SIP_NAT) & SIP_NAT_ROUTE) ? " N " : "   ",	/* NAT=yes? */
 			iterator->ha ? " A " : "   ", 	/* permit/deny */
-			nm, ntohs(iterator->addr.sin_port), status);
+			ntohs(iterator->addr.sin_port), status);
 
 		if (!s)  {/* Normal CLI list */
 			ast_cli(fd, FORMAT, name, 
@@ -7408,7 +7405,7 @@
 			ast_test_flag(iterator, SIP_DYNAMIC) ? " D " : "   ",  /* Dynamic or not? */
 			(ast_test_flag(iterator, SIP_NAT) & SIP_NAT_ROUTE) ? " N " : "   ",	/* NAT=yes? */
 			iterator->ha ? " A " : "   ",       /* permit/deny */
-			nm,
+			
 			ntohs(iterator->addr.sin_port), status);
 		} else {	/* Manager format */
 			/* The names here need to be the same as other channels */
@@ -11740,7 +11737,6 @@
 {
 	struct sip_peer *peer = NULL;
 	struct ast_ha *oldha = NULL;
-	int maskfound=0;
 	int obproxyfound=0;
 	int found=0;
 	int format=0;		/* Ama flags */
@@ -11885,8 +11881,6 @@
 				else
 					ast_copy_string(peer->tohost, v->value, sizeof(peer->tohost));
 			}
-			if (!maskfound)
-				inet_aton("255.255.255.255", &peer->mask);
 		} else if (!strcasecmp(v->name, "defaultip")) {
 			if (ast_get_ip(&peer->defaddr, v->value)) {
 				ASTOBJ_UNREF(peer, sip_destroy_peer);
@@ -11894,9 +11888,6 @@
 			}
 		} else if (!strcasecmp(v->name, "permit") || !strcasecmp(v->name, "deny")) {
 			peer->ha = ast_append_ha(v->name, v->value, peer->ha);
-		} else if (!strcasecmp(v->name, "mask")) {
-			maskfound++;
-			inet_aton(v->value, &peer->mask);
 		} else if (!strcasecmp(v->name, "port")) {
 			if (!realtime && ast_test_flag(peer, SIP_DYNAMIC))
 				peer->defaddr.sin_port = htons(atoi(v->value));
Index: configs/sip.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/sip.conf.sample,v
retrieving revision 1.71
diff -u -r1.71 sip.conf.sample
--- configs/sip.conf.sample	27 Sep 2005 01:54:17 -0000	1.71
+++ configs/sip.conf.sample	2 Oct 2005 18:54:01 -0000
@@ -262,7 +262,6 @@
 ;                             regexten
 ;                             fromuser
 ;                             host
-;                             mask
 ;                             port
 ;                             qualify
 ;                             defaultip