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

SF Bug Tracker id 3510693 - build fail with --disable-device

Browse Source 
GetDeviceHandleInfo just fail without using undefined member DeviceAf
if UPNP_HAVE_DEVICE is not defined.
Move ContentTypeHeader definition to soap_common.c, since it is
also used in soap_ctrlpt.c.
(cherry picked from commit 679ebeec48)
This commit is contained in:
Yoichi NAKAYAMA 2012-03-24 13:11:23 +09:00 committed by Marcelo Roberto Jimenez
parent ad617d7c9c
commit 664176c8d6
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -332,6 +332,14 @@ Version 1.8.0
Version 1.6.17
*******************************************************************************
2012-03-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
SF Bug Tracker id 3510693 - build fail with --disable-device
GetDeviceHandleInfo just fail without using undefined member DeviceAf
if UPNP_HAVE_DEVICE is not defined.
Move ContentTypeHeader definition to soap_common.c, since it is
also used in soap_ctrlpt.c.
*******************************************************************************
Version 1.6.16

2
upnp/src/api/upnpapi.c
View File

@ -3831,6 +3831,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
UpnpDevice_Handle *device_handle_out,
struct Handle_Info **HndInfo)
{
#ifdef UPNP_HAVE_DEVICE
/* Check if we've got a registered device of the address family specified. */
if ((AddressFamily == AF_INET && UpnpSdkDeviceRegisteredV4 == 0) ||
(AddressFamily == AF_INET6 && UpnpSdkDeviceregisteredV6 == 0)) {
@ -3850,6 +3851,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
break;
}
}
#endif /* UPNP_HAVE_DEVICE */
*device_handle_out = -1;
return HND_INVALID;

3
upnp/src/soap/soap_common.c
View File

@ -6,5 +6,8 @@
#include "sock.h"
#include "soaplib.h"
const char *ContentTypeHeader =
"CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
#endif /* EXCLUDE_SOAP */

3
upnp/src/soap/soap_device.c
View File

@ -74,9 +74,6 @@ static const char *Soap_Invalid_Action = "Invalid Action";
static const char *Soap_Action_Failed = "Action Failed";
static const char *Soap_Invalid_Var = "Invalid Var";
const char *ContentTypeHeader =
"CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
/*!
* \brief This function retrives the name of the SOAP action.
*