From: Brian West <brian@freeswitch.org>
Date: Mon, 27 Jul 2009 14:31:47 +0000 (+0000)
Subject:  FSCORE-405
X-Git-Tag: v1.0.4~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b26db6e55460bed123f9d1742796c8f2867a266;p=thirdparty%2Ffreeswitch.git

 FSCORE-405

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14373 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/switch_nat.c b/src/switch_nat.c
index 7ab6e07f10..d88aed5cd0 100644
--- a/src/switch_nat.c
+++ b/src/switch_nat.c
@@ -231,6 +231,7 @@ static void *SWITCH_THREAD_FUNC switch_nat_multicast_runtime(switch_thread_t *th
 {
 	char *buf = NULL;
 	char newip[16];
+	char *pos;
 	switch_event_t *event = NULL;
 	
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NAT thread started\n");
@@ -259,17 +260,23 @@ static void *SWITCH_THREAD_FUNC switch_nat_multicast_runtime(switch_thread_t *th
 		if (nat_globals.nat_type == SWITCH_NAT_TYPE_UPNP) {
 			/* look for our desc URL and servicetype in the packet */
 			if (strstr(buf, nat_globals.descURL) && (buf == NULL || strstr(buf, nat_globals.data.servicetype))) {
-				if (strstr(buf, "NTS: ssdp:alive")) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got UPnP keep alive packet: \n%s\n", buf);
-					/* did pub ip change */
-					if (get_upnp_pubaddr(newip) != SWITCH_STATUS_SUCCESS) {
-						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unable to get current pubaddr after receiving UPnP keep alive packet.\n");
+				if ((pos = strstr(buf, "NTS:"))) {
+					pos = pos + 4;
+					while(*pos && *pos == ' ') {
+						pos++;
+					}
+					if (!strncmp(pos, "ssdp:alive", 10)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got UPnP keep alive packet: \n%s\n", buf);
+						/* did pub ip change */
+						if (get_upnp_pubaddr(newip) != SWITCH_STATUS_SUCCESS) {
+							switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unable to get current pubaddr after receiving UPnP keep alive packet.\n");
+						}
+					} else if (!strncmp(pos, "ssdp:byebye", 11)) {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "got UPnP signoff packet.  Your NAT gateway is probably going offline.\n");
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got UPnP signoff packet: \n%s\n", buf);
+					} else {
+						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got UNKNOWN UPnP keep alive packet: \n%s\n", buf);
 					}
-				} else if (strstr(buf, "NTS: ssdp:byebye")) {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "got UPnP signoff packet.  Your NAT gateway is probably going offline.\n");
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got UPnP signoff packet: \n%s\n", buf);
-				} else {
-					switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got UNKNOWN UPnP keep alive packet: \n%s\n", buf);
 				}
 			}
 		} else {