--- asterisk/channels/tmp/chan_sip.c_orginal	Mon Jan 19 15:04:33 2004
+++ asterisk/channels/chan_sip.c	Sun Jan 25 03:13:51 2004
@@ -79,6 +79,9 @@
 #define DEFAULT_RETRANS		1000			/* How frequently to retransmit */
 #define MAX_RETRANS			5				/* Try only 5 times for retransmissions */
 
+#define DEBUG_READ		0			/* Direction of data for sipdebug */
+#define DEBUG_SEND		1			/* Direction of data for sipdebug */
+
 static char *desc = "Session Initiation Protocol (SIP)";
 static char *type = "SIP";
 static char *tdesc = "Session Initiation Protocol (SIP)";
@@ -344,6 +347,11 @@
 	struct sip_peer *next;
 };
 
+struct sip_debug_filter {
+	struct sockaddr_in addr;
+	struct sip_debug_filter *next;
+};
+
 static struct ast_user_list {
 	struct sip_user *users;
 	ast_mutex_t lock;
@@ -354,6 +362,9 @@
 	ast_mutex_t lock;
 } peerl = { NULL, AST_MUTEX_INITIALIZER };
 
+static struct ast_debug_filter {
+	struct sip_debug_filter *filters;
+} debfilterl = { NULL };
 
 #define REG_STATE_UNREGISTERED 0
 #define REG_STATE_REGSENT	   1
@@ -420,13 +431,75 @@
 static int find_user(struct sip_pvt *fup, int event);
 static void prune_peers(void);
 
+static void filter_sip_debug(int direction, char *data, int len, struct sockaddr_in *addr) 
+{
+#define FORMAT "\r%s %-80s %-10s %-15s %d\n"
+#define FORMAT2 "    %s\n"
+	static struct sip_debug_filter *filter;
+	static struct sip_peer *peer;
+	static char row[SIP_MAX_PACKET];
+	int i, j, rowno;
+	int pass = 0;
+	if (sipdebug == 0) return;
+	/* See if we pass debug IP filter */
+	if (debfilterl.filters) {
+		for (filter = debfilterl.filters; filter; filter = filter->next)
+			if (((ntohs(filter->addr.sin_port) == 0) &&
+			     (filter->addr.sin_addr.s_addr == addr->sin_addr.s_addr)) ||
+			    ((filter->addr.sin_port == addr->sin_port) &&
+			     (filter->addr.sin_addr.s_addr == addr->sin_addr.s_addr))) {
+				pass = 1;
+				break;
+			}
+		if (!pass) return;
+	}
+	/* Find extension with same IP and port     */
+	/* If the peerl is locked, skip this lookup */
+	peer = NULL;
+	if (!ast_mutex_trylock(&peerl.lock)) {
+		for (peer = peerl.peers;peer;peer = peer->next)
+			if ((peer->addr.sin_addr.s_addr == addr->sin_addr.s_addr) &&
+			    (peer->addr.sin_port == addr->sin_port))
+				break;
+		ast_mutex_unlock(&peerl.lock);
+	}
+	/* Find a line in data. May be delimeted by newline or null */
+	j = 0;
+	rowno = 1;
+	for (i = 0; i<len; i++) {
+		if ((data[i] == '\0' ) ||
+		    (data[i] == '\n' )) {
+			row[j] = '\0';
+			if (rowno == 1) {
+				ast_verbose(FORMAT, 
+					    (direction==DEBUG_READ ? "<--" : "-->"), 
+					    row, 
+					    (peer?peer->name:"?"),
+					    inet_ntoa(addr->sin_addr), 
+					    ntohs(addr->sin_port));
+				if (sipdebug == 1)
+					return;
+			} else 
+				ast_verbose(FORMAT2, row);
+			rowno++;
+			j = 0;
+		} else if (data[i] != '\r' )
+			row[j++] = data[i];
+	}
+#undef FORMAT2
+#undef FORMAT
+}
+
 static int __sip_xmit(struct sip_pvt *p, char *data, int len)
 {
 	int res;
-	if (p->nat)
-	    res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->recv, sizeof(struct sockaddr_in));
-	else
-	    res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->sa, sizeof(struct sockaddr_in));
+	if (p->nat) {
+		filter_sip_debug(DEBUG_SEND, data, len, &p->recv);
+		res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->recv, sizeof(struct sockaddr_in));
+	} else {
+		filter_sip_debug(DEBUG_SEND, data, len, &p->sa);
+		res=sendto(sipsock, data, len, 0, (struct sockaddr *)&p->sa, sizeof(struct sockaddr_in));
+	}
 	if (res != len) {
 		ast_log(LOG_WARNING, "sip_xmit of %p (len %d) to %s returned %d: %s\n", data, len, inet_ntoa(p->sa.sin_addr), res, strerror(errno));
 	}
@@ -459,11 +532,11 @@
 	ast_mutex_lock(&pkt->owner->lock);
 	if (pkt->retrans < MAX_RETRANS) {
 		pkt->retrans++;
-		if (sipdebug) {
+		if (sipdebug == 3) {
 			if (pkt->owner->nat)
-				ast_verbose("Retransmitting #%d (NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, inet_ntoa(pkt->owner->recv.sin_addr), ntohs(pkt->owner->recv.sin_port));
+				ast_verbose("Retransmitting (NAT):\n");
 			else
-				ast_verbose("Retransmitting #%d (no NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, inet_ntoa(pkt->owner->sa.sin_addr), ntohs(pkt->owner->sa.sin_port));
+				ast_verbose("Retransmitting (no NAT):\n");
 		}
 		__sip_xmit(pkt->owner, pkt->data, pkt->packetlen);
 		res = 1;
@@ -598,11 +671,11 @@
 static int send_response(struct sip_pvt *p, struct sip_request *req, int reliable, int seqno)
 {
 	int res;
-	if (sipdebug) {
+	if (sipdebug == 3) {
 		if (p->nat)
-			ast_verbose("%sTransmitting (NAT):\n%s\n to %s:%d\n", reliable ? "Reliably " : "", req->data, inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port));
+			ast_verbose("%sTransmitting (NAT) to %s:%d\n", reliable ? "Reliably " : "", inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port));
 		else
-			ast_verbose("%sTransmitting (no NAT):\n%s\n to %s:%d\n", reliable ? "Reliably " : "", req->data, inet_ntoa(p->sa.sin_addr), ntohs(p->sa.sin_port));
+			ast_verbose("%sTransmitting (no NAT) to %s:%d\n", reliable ? "Reliably " : "", inet_ntoa(p->sa.sin_addr), ntohs(p->sa.sin_port));
 	}
 	if (reliable)
 		res = __sip_reliable_xmit(p, seqno, 1, req->data, req->len);
@@ -616,11 +689,11 @@
 static int send_request(struct sip_pvt *p, struct sip_request *req, int reliable, int seqno)
 {
 	int res;
-	if (sipdebug) {
+	if (sipdebug == 3) {
 		if (p->nat)
-			ast_verbose("%sTransmitting:\n%s (NAT) to %s:%d\n", reliable ? "Reliably " : "", req->data, inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port));
+			ast_verbose("%sTransmitting (NAT):\n", reliable ? "Reliably " : "");
 		else
-			ast_verbose("%sTransmitting:\n%s (no NAT) to %s:%d\n", reliable ? "Reliably " : "", req->data, inet_ntoa(p->sa.sin_addr), ntohs(p->sa.sin_port));
+			ast_verbose("%sTransmitting (no NAT):\n", reliable ? "Reliably " : "");
 	}
 	if (reliable)
 		res = __sip_reliable_xmit(p, seqno, 0, req->data, req->len);
@@ -649,13 +722,13 @@
 static int sip_sendtext(struct ast_channel *ast, char *text)
 {
 	struct sip_pvt *p = ast->pvt->pvt;
-	if (sipdebug) 
+	if (sipdebug == 3) 
 		ast_verbose("Sending text %s on %s\n", text, ast->name);
 	if (!p)
 		return -1;
 	if (!text || !strlen(text))
 		return 0;
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("Really sending text %s on %s\n", text, ast->name);
 	transmit_message_with_text(p, text);
 	return 0;	
@@ -898,7 +971,7 @@
 {
 	struct sip_pvt *cur, *prev = NULL;
 	struct sip_pkt *cp;
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_log(LOG_DEBUG, "Destorying call '%s'\n", p->callid);
 	if (p->stateid > -1)
 		ast_extension_state_del(p->stateid, NULL);
@@ -1828,7 +1901,7 @@
 	if (strlen(req->line[f])) 
 		f++;
 	req->lines = f;
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("%d headers, %d lines\n", req->headers, req->lines);
 	if (*c) 
 		ast_log(LOG_WARNING, "Odd content, extra stuff left over ('%s')\n", c);
@@ -1886,7 +1959,7 @@
 					ast_log(LOG_WARNING, "Error in codec string '%s'\n", codecs);
 					return -1;
 				}
-				if (sipdebug)
+				if (sipdebug == 3)
 					ast_verbose("Found audio format %s\n", ast_getformatname(codec));
 				ast_rtp_set_m_type(p->rtp, codec);
 				codecs += len;
@@ -1904,7 +1977,7 @@
 					ast_log(LOG_WARNING, "Error in codec string '%s'\n", codecs);
 					return -1;
 				}
-				if (sipdebug)
+				if (sipdebug == 3)
 					ast_verbose("Found video format %s\n", ast_getformatname(codec));
 				ast_rtp_set_m_type(p->vrtp, codec);
 				codecs += len;
@@ -1939,7 +2012,7 @@
 	  	sendonly=0;
 	  }
 	  if (sscanf(a, "rtpmap: %u %[^/]/", &codec, mimeSubtype) != 2) continue;
-	  if (sipdebug)
+	  if (sipdebug == 3)
 		ast_verbose("Found description format %s\n", mimeSubtype);
 	  // Note: should really look at the 'freq' and '#chans' params too
 	  ast_rtp_set_rtpmap_type(p->rtp, codec, "audio", mimeSubtype);
@@ -1956,7 +2029,7 @@
 	p->jointcapability = p->capability & (peercapability | vpeercapability);
 	p->noncodeccapability = noncodeccapability & (peernoncodeccapability | vpeernoncodeccapability);
 	
-	if (sipdebug) {
+	if (sipdebug == 3) {
 		ast_verbose("Capabilities: us - %d, them - %d/%d, combined - %d\n",
 			    p->capability, peercapability, vpeercapability, p->jointcapability);
 		ast_verbose("Non-codec capabilities: us - %d, them - %d, combined - %d\n",
@@ -2154,7 +2227,7 @@
 	/* Parse uri to h (host) and port - uri is already just the part inside the <> */
 	/* general form we are expecting is sip[s]:username[:password]@host[:port][;...] */
 
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("set_destination: Parsing <%s> for address/port to send to\n", uri);
 
 	/* Find and parse hostname */
@@ -2199,7 +2272,7 @@
 	p->sa.sin_family = AF_INET;
 	memcpy(&p->sa.sin_addr, hp->h_addr, sizeof(p->sa.sin_addr));
 	p->sa.sin_port = htons(port);
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("set_destination: set destination to %s, port %d\n", inet_ntoa(p->sa.sin_addr), port);
 }
 
@@ -2513,9 +2586,9 @@
 			vdest.sin_port = vsin.sin_port;
 		}
 	}
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("We're at %s port %d\n", inet_ntoa(p->ourip), ntohs(sin.sin_port));	
-	if (sipdebug && p->vrtp)
+	if ((sipdebug == 3) && p->vrtp)
 		ast_verbose("Video is at %s port %d\n", inet_ntoa(p->ourip), ntohs(vsin.sin_port));	
 	snprintf(v, sizeof(v), "v=0\r\n");
 	snprintf(o, sizeof(o), "o=root %d %d IN IP4 %s\r\n", p->sessionid, p->sessionversion, inet_ntoa(dest.sin_addr));
@@ -2528,7 +2601,7 @@
 	cur = prefs;
 	while(cur) {
 		if (p->jointcapability & cur->codec) {
-			if (sipdebug)
+			if (sipdebug == 3)
 				ast_verbose("Answering with preferred capability %d\n", cur->codec);
 			codec = ast_rtp_lookup_code(p->rtp, 1, cur->codec);
 			if (codec > -1) {
@@ -2550,7 +2623,7 @@
 	/* Now send any other common codecs, and non-codec formats: */
 	for (x = 1; x <= AST_FORMAT_MAX_AUDIO; x <<= 1) {
 		if ((p->jointcapability & x) && !(alreadysent & x)) {
-			if (sipdebug)
+			if (sipdebug == 3)
 				ast_verbose("Answering with capability %d\n", x);	
 			codec = ast_rtp_lookup_code(p->rtp, 1, x);
 			if (codec > -1) {
@@ -2569,7 +2642,7 @@
 	}
 	for (x = 1; x <= AST_RTP_MAX; x <<= 1) {
 		if (p->noncodeccapability & x) {
-			if (sipdebug)
+			if (sipdebug == 3)
 				ast_verbose("Answering with non-codec capability %d\n", x);
 			codec = ast_rtp_lookup_code(p->rtp, 0, x);
 			if (codec > -1) {
@@ -3471,7 +3544,7 @@
 	p->route = head;
 
 	/* For debugging dump what we ended up with */
-	if (sipdebug)
+	if (sipdebug == 3)
 		list_route(p->route);
 }
 
@@ -3699,7 +3772,7 @@
 	if ((a = strchr(c, '@')) || (a = strchr(c, ';'))) {
 		*a = '\0';
 	}
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("RDNIS is %s\n", c);
 	strncpy(p->rdnis, c, sizeof(p->rdnis) - 1);
 
@@ -3745,7 +3818,7 @@
 	if ((a = strchr(fr, '@')) || (a = strchr(fr, ';'))) {
 		*a = '\0';
 	}
-	if (sipdebug)
+	if (sipdebug == 3)
 		ast_verbose("Looking for %s in %s\n", c, p->context);
 	if (ast_exists_extension(NULL, p->context, c, 1, fr) ||
 		!strcmp(c, ast_pickup_ext())) {
@@ -3839,7 +3912,7 @@
 		*a2 = '\0';
 	
 	
-	if (sipdebug) {
+	if (sipdebug == 3) {
 		ast_verbose("Looking for %s in %s\n", c, p->context);
 		ast_verbose("Looking for %s in %s\n", c2, p->context);
 	}
@@ -3911,7 +3984,7 @@
 	if ((a = strchr(c, ';'))) 
 		*a = '\0';
 	
-	if (sipdebug) {
+	if (sipdebug == 3) {
 		ast_verbose("Looking for %s in %s\n", c, p->context);
 	}
 	if (ast_exists_extension(NULL, p->context, c, 1, NULL)) {
@@ -3965,7 +4038,7 @@
 		p->sa.sin_family = AF_INET;
 		memcpy(&p->sa.sin_addr, hp->h_addr, sizeof(p->sa.sin_addr));
 		p->sa.sin_port = htons(pt ? atoi(pt) : DEFAULT_SIP_PORT);
-		if (sipdebug) {
+		if (sipdebug == 3) {
 			if (p->nat)
 				ast_verbose("Sending to %s : %d (NAT)\n", inet_ntoa(p->sa.sin_addr), ntohs(p->sa.sin_port));
 			else
@@ -4162,7 +4235,7 @@
 		return;
 	}
 	if (p->owner) {
-		if (sipdebug)
+		if (sipdebug == 3)
 			ast_verbose("Message received: '%s'\n", buf);
 		  memset(&f, 0, sizeof(f));
 		  f.frametype = AST_FRAME_TEXT;
@@ -4265,6 +4338,136 @@
 #undef FORMAT2
 }
 
+static int sip_show_peer(int fd, int argc, char *argv[])
+{
+	struct sip_peer *peer;
+	if (argc != 4)
+		return RESULT_SHOWUSAGE;
+	ast_mutex_lock(&peerl.lock);
+	for (peer = peerl.peers;peer;peer = peer->next) {
+		if (!strncasecmp(peer->name, argv[3],strlen(argv[3]))) {
+			ast_cli(fd, "Name         : \"%s\"\n", peer->name);
+			ast_cli(fd, "Context      : \"%s\"\n", peer->context);
+			ast_cli(fd, "Methods      : \"%s\"\n", peer->methods);
+			ast_cli(fd, "Username     : \"%s\"\n", peer->username);
+			ast_cli(fd, "ToHost       : \"%s\"\n", peer->tohost);
+			ast_cli(fd, "FromUser     : \"%s\"\n", peer->fromuser);
+			ast_cli(fd, "FromDomain   : \"%s\"\n", peer->fromdomain);
+			ast_cli(fd, "Mailbox      : \"%s\"\n", peer->mailbox);
+			ast_cli(fd, "LastMsgsSent : %d\n", peer->lastmsgssent);
+			ast_cli(fd, "Dynamic      : %s\n", (peer->dynamic?"Yes":"No"));
+			ast_cli(fd, "Expire       : %d\n", peer->expire);
+			ast_cli(fd, "Expiry       : %d\n", peer->expiry);
+			ast_cli(fd, "Insecure     : %s\n", (peer->insecure?"Yes":"No"));
+			ast_cli(fd, "Nat          : %s\n", (peer->nat?"Yes":"No"));
+			ast_cli(fd, "CanReinvite  : %s\n", (peer->canreinvite?"Yes":"No"));
+			ast_cli(fd, "DTMFmode     : %d\n", peer->dtmfmode);
+			ast_cli(fd, "LastMsg      : %d\n", peer->lastmsg);
+			ast_cli(fd, "Addr->IP     : %s\n", inet_ntoa(peer->addr.sin_addr));
+			ast_cli(fd, "Addr->Port   : %d\n", ntohs(peer->addr.sin_port));
+			ast_cli(fd, "Defaddr->IP  : %s\n", inet_ntoa(peer->defaddr.sin_addr));
+			ast_cli(fd, "Defaddr->Port: %d\n", ntohs(peer->defaddr.sin_port));
+		}
+	}
+	ast_mutex_unlock(&peerl.lock);
+	return RESULT_SUCCESS;
+}
+
+static int sip_show_debug_filter(int fd, int argc, char *argv[])
+{
+#define FORMAT2 "%-15.15s %-8s\n"
+#define FORMAT "%-15.15s %-8d\n"
+	struct sip_debug_filter *filter;
+	if (argc != 3)
+		return RESULT_SHOWUSAGE;
+	ast_cli(fd, FORMAT2, "IP", "Port");
+	for (filter = debfilterl.filters;filter;filter = filter->next) {
+		if (ntohs(filter->addr.sin_port) == 0)
+			ast_cli(fd, FORMAT2, 
+				inet_ntoa(filter->addr.sin_addr) ,
+				"<Any>");
+		else
+			ast_cli(fd, FORMAT, 
+				inet_ntoa(filter->addr.sin_addr) ,
+				ntohs(filter->addr.sin_port));
+	}
+	return RESULT_SUCCESS;
+#undef FORMAT
+#undef FORMAT2
+}
+
+static int sip_clear_filter(int fd, int argc, char *argv[])
+{
+	struct sip_debug_filter *filter;
+	struct sip_debug_filter *filter2;
+	if (argc != 3)
+		return RESULT_SHOWUSAGE;
+	for (filter = debfilterl.filters;filter;) {
+		filter2 = filter->next;
+		free(filter);
+		filter = filter2;
+	}
+	debfilterl.filters = NULL;
+	return RESULT_SUCCESS;
+}
+
+static int sip_filter_add_ip(int fd, int argc, char *argv[])
+{
+	struct sip_debug_filter *filter;
+	struct hostent *hp;
+	int port = 0;
+	char *p, *arg;
+	if (argc != 5)
+		return RESULT_SHOWUSAGE;
+	arg = argv[4];
+	p = strstr(arg, ":");
+	if (p) {
+		*p = '\0';
+		p++;
+		port = atoi(p);
+	}
+	hp = gethostbyname(arg);
+	if (hp == NULL)  {
+		return RESULT_SHOWUSAGE;
+	}
+	filter = (struct sip_debug_filter *)malloc(sizeof(struct sip_debug_filter));
+	if (filter) {
+		filter->next = debfilterl.filters;
+		filter->addr.sin_family = AF_INET;
+		memcpy(&filter->addr.sin_addr, hp->h_addr, sizeof(filter->addr.sin_addr));
+		filter->addr.sin_port = htons(port);
+		debfilterl.filters = filter;
+	}
+	return RESULT_SUCCESS;
+}
+
+static int sip_filter_add_peer(int fd, int argc, char *argv[])
+{
+	struct sip_debug_filter *filter;
+	struct sip_peer *peer;
+	if (argc != 5)
+		return RESULT_SHOWUSAGE;
+	ast_mutex_lock(&peerl.lock);
+	for (peer = peerl.peers;peer;peer = peer->next)
+		if (!strcmp(peer->name, argv[4])) 
+			break;
+	ast_mutex_unlock(&peerl.lock);
+	if (peer) {
+		filter = (struct sip_debug_filter *)malloc(sizeof(struct sip_debug_filter));
+		if (filter) {
+			filter->next = debfilterl.filters;
+			filter->addr.sin_family = AF_INET;
+			memcpy(&filter->addr.sin_addr, &peer->addr.sin_addr, sizeof(filter->addr.sin_addr));
+			filter->addr.sin_port = peer->addr.sin_port;
+			debfilterl.filters = filter;
+		}
+	} else
+		ast_cli(fd, "No such peer '%s'\n", argv[4]);
+	return RESULT_SUCCESS;
+}
+
+
+
 static char *regstate2str(int regstate)
 {
 	switch(regstate) {
@@ -4417,7 +4620,7 @@
 	
 	if (p->owner) {
 		if (strlen(buf)) {
-			if (sipdebug)
+			if (sipdebug == 3)
 				ast_verbose("DTMF received: '%c'\n", buf[0]);
 			if (buf[0] == '*')
 				event = 10;
@@ -4447,10 +4650,14 @@
 
 static int sip_do_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 2)
+	int tmp;
+	if (argc != 3) 
 		return RESULT_SHOWUSAGE;
-	sipdebug = 1;
-	ast_cli(fd, "SIP Debugging Enabled\n");
+	tmp = atoi(argv[2]);
+	if (tmp < 1 || tmp > 3) 
+		return RESULT_SHOWUSAGE;
+	sipdebug = tmp;
+	ast_cli(fd, "SIP Debug level %d Enabled\n", sipdebug);
 	return RESULT_SUCCESS;
 }
 
@@ -4609,13 +4816,36 @@
 "Usage: sip show peers\n"
 "       Lists all known SIP peers.\n";
 
+static char show_peer_usage[] = 
+"Usage: sip show peer <name>\n"
+"       Provides detailed status on a given SIP peer.\n";
+
+static char show_filter_usage[] = 
+"Usage: sip show filter\n"
+"       Lists IP-adresses and ports used for SIP debug output filtering.\n";
+
+static char show_filter_add_ip_usage[] = 
+"Usage: sip filter add ip <host[:PORT]>\n"
+"       Adds an IP to filter for filtering SIP debug output.\n";
+
+static char show_filter_clear[] = 
+"Usage: sip filter clear\n"
+"       Clears filtering list for SIP debug output.\n";
+
+static char show_filter_add_peer_usage[] = 
+"Usage: sip filter add peer <peername>\n"
+"       Adds an IP to filter for filtering SIP debug output.\n";
+
 static char show_reg_usage[] =
 "Usage: sip show registry\n"
 "       Lists all registration requests and status.\n";
 
 static char debug_usage[] = 
-"Usage: sip debug\n"
-"       Enables dumping of SIP packets for debugging purposes\n";
+"Usage: sip debug <level>\n"
+"       Enables dumping of SIP packets for debugging purposes\n"
+"       Level 1: Dumping IP, Port and SIP-headers\n"
+"       Level 2: Dumping IP, Port and full SIP-packets\n"
+"       Level 3: Dumping IP, Port, full SIP-packets and detailed comments\n";
 
 static char no_debug_usage[] = 
 "Usage: sip no debug\n"
@@ -4627,6 +4857,16 @@
 	{ { "sip", "show", "channels", NULL }, sip_show_channels, "Show active SIP channels", show_channels_usage};
 static struct ast_cli_entry  cli_show_channel =
 	{ { "sip", "show", "channel", NULL }, sip_show_channel, "Show detailed SIP channel info", show_channel_usage, complete_sipch  };
+static struct ast_cli_entry  cli_show_debug_filter =
+	{ { "sip", "show", "filter", NULL }, sip_show_debug_filter, "Show SIP debug filter", show_filter_usage };
+static struct ast_cli_entry  cli_filter_add_ip =
+	{ { "sip", "filter", "add", "ip", NULL }, sip_filter_add_ip, "Add IP to SIP debug filter", show_filter_add_ip_usage };
+static struct ast_cli_entry  cli_clear_filter =
+	{ { "sip", "filter", "clear", NULL }, sip_clear_filter, "Clear SIP debug filter", show_filter_clear };
+static struct ast_cli_entry  cli_filter_add_peer =
+	{ { "sip", "filter", "add", "peer", NULL }, sip_filter_add_peer, "Add IP by peer to SIP debug filter", show_filter_add_peer_usage };
+static struct ast_cli_entry  cli_show_peer =
+	{ { "sip", "show", "peer", NULL }, sip_show_peer, "Show detailed SIP peer info", show_peer_usage };
 static struct ast_cli_entry  cli_show_peers =
 	{ { "sip", "show", "peers", NULL }, sip_show_peers, "Show defined SIP peers", show_peers_usage };
 static struct ast_cli_entry  cli_inuse_show =
@@ -4931,7 +5171,7 @@
 				ast_log(LOG_NOTICE, "Dunno anything about a %d %s response from %s\n", resp, rest, p->owner ? p->owner->name : inet_ntoa(p->sa.sin_addr));
 		}
 	} else {
-		if (sipdebug)
+		if (sipdebug == 3)
 			ast_verbose("Message is %s\n", msg);
 		switch(resp) {
 		case 200:
@@ -5099,7 +5339,7 @@
 		/* Process the SDP portion */
 		if (!ignore) {
 			/* Use this as the basis */
-			if (sipdebug)
+			if (sipdebug == 3)
 				ast_verbose("Using latest request as basis request\n");
 			/* This call is no longer outgoing if it ever was */
 			p->outgoing = 0;
@@ -5115,7 +5355,7 @@
 			/* Queue NULL frame to prod ast_rtp_bridge if appropriate */
 			if (p->owner)
 				ast_queue_frame(p->owner, &af, 0);
-		} else if (sipdebug)
+		} else if (sipdebug == 3)
 			ast_verbose("Ignoring this request\n");
 		if (!p->lastinvite) {
 			/* Handle authentication if this is our first invite */
@@ -5321,20 +5561,20 @@
 			p->needdestroy = 1;
 		transmit_response(p, "200 OK", req);
 	} else if (!strcasecmp(cmd, "MESSAGE")) {
-		if (sipdebug)
+		if (sipdebug == 3)
 			ast_verbose("Receiving message!\n");
 		receive_message(p, req);
 		transmit_response(p, "200 OK", req);
 	} else if (!strcasecmp(cmd, "SUBSCRIBE")) {
 		if (!ignore) {
 			/* Use this as the basis */
-			if (sipdebug)
+			if (sipdebug == 3)
 				ast_verbose("Using latest SUBSCRIBE request as basis request\n");
 			/* This call is no longer outgoing if it ever was */
 			p->outgoing = 0;
 			copy_request(&p->initreq, req);
 			check_via(p, req);
-		} else if (sipdebug)
+		} else if (sipdebug == 3)
 			ast_verbose("Ignoring this request\n");
 
 		if (!p->lastinvite) {
@@ -5391,13 +5631,13 @@
 		    transmit_state_notify(p, ast_extension_state(NULL, p->context, p->exten),1);
 		}
 	} else if (!strcasecmp(cmd, "INFO")) {
-		if (sipdebug)
+		if (sipdebug == 3)
 			ast_verbose("Receiving DTMF!\n");
 		receive_info(p, req);
 		transmit_response(p, "200 OK", req);
 	} else if (!strcasecmp(cmd, "REGISTER")) {
 		/* Use this as the basis */
-		if (sipdebug)
+		if (sipdebug == 3)
 			ast_verbose("Using latest request as basis request\n");
 		copy_request(&p->initreq, req);
 		check_via(p, req);
@@ -5454,8 +5694,7 @@
 	}
 	req.data[res] = '\0';
 	req.len = res;
-	if (sipdebug)
-		ast_verbose("\n\nSip read: \n%s\n", req.data);
+	filter_sip_debug(DEBUG_READ, req.data, res, &sin);
 	parse(&req);
 	if (req.headers < 2) {
 		/* Must have at least two headers */
@@ -6465,6 +6704,11 @@
 		ast_cli_register(&cli_show_users);
 		ast_cli_register(&cli_show_channels);
 		ast_cli_register(&cli_show_channel);
+		ast_cli_register(&cli_show_debug_filter);
+		ast_cli_register(&cli_filter_add_ip);
+		ast_cli_register(&cli_clear_filter);
+		ast_cli_register(&cli_filter_add_peer);
+		ast_cli_register(&cli_show_peer);
 		ast_cli_register(&cli_show_peers);
 		ast_cli_register(&cli_show_registry);
 		ast_cli_register(&cli_debug);
@@ -6577,6 +6821,11 @@
 	ast_cli_unregister(&cli_show_users);
 	ast_cli_unregister(&cli_show_channels);
 	ast_cli_unregister(&cli_show_channel);
+	ast_cli_unregister(&cli_show_debug_filter);
+	ast_cli_unregister(&cli_filter_add_ip);
+	ast_cli_unregister(&cli_clear_filter);
+	ast_cli_unregister(&cli_filter_add_peer);
+	ast_cli_unregister(&cli_show_peer);
 	ast_cli_unregister(&cli_show_peers);
 	ast_cli_unregister(&cli_show_registry);
 	ast_cli_unregister(&cli_debug);