generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The last part of Ronan Menard's patch.

Browse Source 
git-svn-id: https://pupnp.svn.sourceforge.net/svnroot/pupnp/branches/branch-1.6.x@580 119443c7-1b9e-41f8-b6fc-b9c35fce742c
This commit is contained in:
Marcelo Roberto Jimenez 2010-08-22 02:05:34 +00:00
parent 5a2cc884c1
commit e386dd0d68
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
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.

19
upnp/src/ssdp/ssdp_server.c
View File

@ -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",