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

Putting ssdpReqSocks under compilation flag.

Browse Source 
Putting all access to ssdpReqSock4 and ssdpReqSock6 under
INCLUDE_CLIENT_APIS compilation flag to be able to compile when
client part of library is disable.
(cherry picked from commit 0996d23318)
This commit is contained in:
Fabrice Fontaine 2011-03-15 10:48:32 +01:00 committed by Marcelo Roberto Jimenez
parent daec6a0321
commit babfc0ac60
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -255,6 +255,14 @@ Version 1.8.0
Version 1.6.13 Version 1.6.13
******************************************************************************* *******************************************************************************
2011-03-15 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
Putting ssdpReqSocks under compilation flag.
Putting all access to ssdpReqSock4 and ssdpReqSock6 under
INCLUDE_CLIENT_APIS compilation flag to be able to compile when
client part of library is disable.
2011-03-15 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com> 2011-03-15 Fabrice Fontaine <fabrice.fontaine(at)orange-ftgroup.com>
New UpnpRegisterRootDevice4 for legacy CPs. New UpnpRegisterRootDevice4 for legacy CPs.

12
upnp/src/genlib/miniserver/miniserver.c
View File

@ -381,8 +381,10 @@ static void RunMiniServer(
maxMiniSock = max(maxMiniSock, miniSock->ssdpSock4); maxMiniSock = max(maxMiniSock, miniSock->ssdpSock4);
maxMiniSock = max(maxMiniSock, miniSock->ssdpSock6); maxMiniSock = max(maxMiniSock, miniSock->ssdpSock6);
maxMiniSock = max(maxMiniSock, miniSock->ssdpSock6UlaGua); maxMiniSock = max(maxMiniSock, miniSock->ssdpSock6UlaGua);
#ifdef INCLUDE_CLIENT_APIS
maxMiniSock = max(maxMiniSock, miniSock->ssdpReqSock4); maxMiniSock = max(maxMiniSock, miniSock->ssdpReqSock4);
maxMiniSock = max(maxMiniSock, miniSock->ssdpReqSock6); maxMiniSock = max(maxMiniSock, miniSock->ssdpReqSock6);
#endif /* INCLUDE_CLIENT_APIS */
++maxMiniSock; ++maxMiniSock;
gMServState = MSERV_RUNNING; gMServState = MSERV_RUNNING;
@ -397,8 +399,10 @@ static void RunMiniServer(
fdset_if_valid(miniSock->ssdpSock4, &rdSet); fdset_if_valid(miniSock->ssdpSock4, &rdSet);
fdset_if_valid(miniSock->ssdpSock6, &rdSet); fdset_if_valid(miniSock->ssdpSock6, &rdSet);
fdset_if_valid(miniSock->ssdpSock6UlaGua, &rdSet); fdset_if_valid(miniSock->ssdpSock6UlaGua, &rdSet);
#ifdef INCLUDE_CLIENT_APIS
fdset_if_valid(miniSock->ssdpReqSock4, &rdSet); fdset_if_valid(miniSock->ssdpReqSock4, &rdSet);
fdset_if_valid(miniSock->ssdpReqSock6, &rdSet); fdset_if_valid(miniSock->ssdpReqSock6, &rdSet);
#endif /* INCLUDE_CLIENT_APIS */
/* select() */ /* select() */
ret = select((int) maxMiniSock, &rdSet, NULL, &expSet, NULL); ret = select((int) maxMiniSock, &rdSet, NULL, &expSet, NULL);
if (ret == SOCKET_ERROR && errno == EINTR) { if (ret == SOCKET_ERROR && errno == EINTR) {
@ -430,8 +434,10 @@ static void RunMiniServer(
sock_close(miniSock->ssdpSock4); sock_close(miniSock->ssdpSock4);
sock_close(miniSock->ssdpSock6); sock_close(miniSock->ssdpSock6);
sock_close(miniSock->ssdpSock6UlaGua); sock_close(miniSock->ssdpSock6UlaGua);
#ifdef INCLUDE_CLIENT_APIS
sock_close(miniSock->ssdpReqSock4); sock_close(miniSock->ssdpReqSock4);
sock_close(miniSock->ssdpReqSock6); sock_close(miniSock->ssdpReqSock6);
#endif /* INCLUDE_CLIENT_APIS */
/* Free minisock. */ /* Free minisock. */
free(miniSock); free(miniSock);
gMServState = MSERV_IDLE; gMServState = MSERV_IDLE;
@ -805,8 +811,10 @@ static UPNP_INLINE void InitMiniServerSockArray(MiniServerSockArray *miniSocket)
miniSocket->stopPort = 0; miniSocket->stopPort = 0;
miniSocket->miniServerPort4 = 0; miniSocket->miniServerPort4 = 0;
miniSocket->miniServerPort6 = 0; miniSocket->miniServerPort6 = 0;
#ifdef INCLUDE_CLIENT_APIS
miniSocket->ssdpReqSock4 = INVALID_SOCKET; miniSocket->ssdpReqSock4 = INVALID_SOCKET;
miniSocket->ssdpReqSock6 = INVALID_SOCKET; miniSocket->ssdpReqSock6 = INVALID_SOCKET;
#endif /* INCLUDE_CLIENT_APIS */
} }
int StartMiniServer( int StartMiniServer(
@ -870,8 +878,10 @@ int StartMiniServer(
sock_close(miniSocket->ssdpSock4); sock_close(miniSocket->ssdpSock4);
sock_close(miniSocket->ssdpSock6); sock_close(miniSocket->ssdpSock6);
sock_close(miniSocket->ssdpSock6UlaGua); sock_close(miniSocket->ssdpSock6UlaGua);
#ifdef INCLUDE_CLIENT_APIS
sock_close(miniSocket->ssdpReqSock4); sock_close(miniSocket->ssdpReqSock4);
sock_close(miniSocket->ssdpReqSock6); sock_close(miniSocket->ssdpReqSock6);
#endif /* INCLUDE_CLIENT_APIS */
return UPNP_E_OUTOF_MEMORY; return UPNP_E_OUTOF_MEMORY;
} }
/* Wait for miniserver to start. */ /* Wait for miniserver to start. */
@ -889,8 +899,10 @@ int StartMiniServer(
sock_close(miniSocket->ssdpSock4); sock_close(miniSocket->ssdpSock4);
sock_close(miniSocket->ssdpSock6); sock_close(miniSocket->ssdpSock6);
sock_close(miniSocket->ssdpSock6UlaGua); sock_close(miniSocket->ssdpSock6UlaGua);
#ifdef INCLUDE_CLIENT_APIS
sock_close(miniSocket->ssdpReqSock4); sock_close(miniSocket->ssdpReqSock4);
sock_close(miniSocket->ssdpReqSock6); sock_close(miniSocket->ssdpReqSock6);
#endif /* INCLUDE_CLIENT_APIS */
return UPNP_E_INTERNAL_ERROR; return UPNP_E_INTERNAL_ERROR;
} }
#ifdef INTERNAL_WEB_SERVER #ifdef INTERNAL_WEB_SERVER

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

@ -833,7 +833,7 @@ static int create_ssdp_sock_v4(
return UPNP_E_SUCCESS; return UPNP_E_SUCCESS;
} }
#if INCLUDE_CLIENT_APIS #ifdef INCLUDE_CLIENT_APIS
/*! /*!
* \brief Creates the SSDP IPv4 socket to be used by the control point. * \brief Creates the SSDP IPv4 socket to be used by the control point.
* *
@ -1099,9 +1099,9 @@ int get_ssdp_sockets(MiniServerSockArray * out)
{ {
int retVal; int retVal;
#ifdef INCLUDE_CLIENT_APIS
out->ssdpReqSock4 = INVALID_SOCKET; out->ssdpReqSock4 = INVALID_SOCKET;
out->ssdpReqSock6 = INVALID_SOCKET; out->ssdpReqSock6 = INVALID_SOCKET;
#if INCLUDE_CLIENT_APIS
/* Create the IPv4 socket for SSDP REQUESTS */ /* Create the IPv4 socket for SSDP REQUESTS */
if (strlen(gIF_IPV4) > 0) { if (strlen(gIF_IPV4) > 0) {
retVal = create_ssdp_sock_reqv4(&out->ssdpReqSock4); retVal = create_ssdp_sock_reqv4(&out->ssdpReqSock4);