From 36d6a34f5d04e5832759f170c5210c2ef282c94c Mon Sep 17 00:00:00 2001
From: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
Date: Sun, 22 Aug 2010 02:11:44 +0000
Subject: [PATCH] Forward port of svn rev. 580: The last part of Ronan Menard's
 patch.

git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/trunk@582 119443c7-1b9e-41f8-b6fc-b9c35fce742c
---
 ChangeLog                   |  3 +++
 upnp/src/ssdp/ssdp_server.c | 19 -------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49ec6d7..dd0f3c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -211,6 +211,9 @@ Version 1.8.0
 Version 1.6.7
 *******************************************************************************
 
+2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
+	* The last part of Ronan Menard's patch.
+
 2010-08-21 Marcelo Jimenez <mroberto(at)users.sourceforge.net>
 	* upnp/src/ssdp/ssdp_device.c: Fix for IPV6 ULA/GUA issues.
 	* upnp/src/ssdp/ssdp_ctrlpt.c: Fix for IPV6 ULA/GUA issues.
diff --git a/upnp/src/ssdp/ssdp_server.c b/upnp/src/ssdp/ssdp_server.c
index f15bf1d..f3a01d2 100644
--- a/upnp/src/ssdp/ssdp_server.c
+++ b/upnp/src/ssdp/ssdp_server.c
@@ -261,9 +261,6 @@ int AdvertiseAndReply(
 			}
 			case SSDP_DEVICETYPE: {
 				if (!strncasecmp(DeviceType, devType, strlen(DeviceType))) {
-					/* (char *) support for atoi */
-					/* TODO: Patch pending. */
-#if 0
 					if (atoi(&DeviceType[strlen(DeviceType)-1]) <= atoi(&devType[strlen(devType)-1])) {
 						/* the requested version is lower than the device version
 						 * must reply with the lower version number */
@@ -277,12 +274,6 @@ int AdvertiseAndReply(
 							" DID NOT MATCH\n",
 							devType, DeviceType);
 					}
-#else
-					UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__,
-						"DeviceType=%s and search devType=%s MATCH\n",
-						devType, DeviceType);
-					SendReply(DestAddr, devType, 0, UDNstr, SInfo->DescURL, defaultExp, 1);
-#endif
 				} else {
 					UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__,
 						"DeviceType=%s and search devType=%s DID NOT MATCH\n",
@@ -363,10 +354,7 @@ int AdvertiseAndReply(
 					break;
 				case SSDP_SERVICE:
 					if (ServiceType) {
-						/* TODO: Patch pending. */
-#if 0
 						if (!strncasecmp(ServiceType, servType, strlen(ServiceType) - 2)) {
-							/*ServiceReply(DestAddr, servType, UDNstr, SInfo->DescURL, defaultExp);*/
 							if (atoi(&ServiceType[strlen(ServiceType)-1]) <= atoi(&servType[strlen(servType)-1])) {
 								/* the requested version is lower than the service version
 								 * must reply with the lower version number */
@@ -379,13 +367,6 @@ int AdvertiseAndReply(
 									"ServiceType=%s and search servType=%s DID NOT MATCH\n",
 									ServiceType, servType);
 							}
-#else
-						if (!strncasecmp(ServiceType, servType, strlen(ServiceType))) {
-							UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__,
-								"ServiceType=%s and search servType=%s MATCH\n",
-								ServiceType, servType);
-							ServiceReply(DestAddr, servType, UDNstr, SInfo->DescURL, defaultExp);
-#endif
 						} else {
 							UpnpPrintf(UPNP_INFO, API, __FILE__, __LINE__,
 								"ServiceType=%s and search servType=%s DID NOT MATCH\n",