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

Improve ssdp part

Browse Source 
Do not compile CreateClientRequestPacketUlaGua if IPv6 is disable.
Cast DestAddr->sa_family from sa_family_t into int when calling
CreateServicePacket as this function has been set back to accept int in
a692e591de.
Use switch instead of if with AF_INET and AF_INET6.
Add missing casts from AF_INET and AF_INET6 into sa_family_t when using
them to set sin_family and sin6_family.
Add missing explicit casts into size_t or lu when using integer
constants with strlen or unsigned long indexes.
Set SSDP_PAUSE to be unsigned as it is used with usleep.
This commit is contained in:
Fabrice Fontaine
2012-03-14 20:35:34 +01:00
parent d48d73720b
commit 850e6b4849
5 changed files with 100 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
upnp/src/ssdp/ssdp_ctrlpt.c
View File

@@ -330,13 +330,16 @@ static int CreateClientRequestPacket(
return UPNP_E_INTERNAL_ERROR;
strcpy(RqstBuf, command);
if (AddressFamily == AF_INET) {
switch (AddressFamily) {
case AF_INET:
rc = snprintf(TempBuf, sizeof(TempBuf), "HOST: %s:%d\r\n", SSDP_IP,
SSDP_PORT);
} else if (AddressFamily == AF_INET6) {
break;
case AF_INET6:
rc = snprintf(TempBuf, sizeof(TempBuf), "HOST: [%s]:%d\r\n",
SSDP_IPV6_LINKLOCAL, SSDP_PORT);
} else {
break;
default:
return UPNP_E_INVALID_ARGUMENT;
}
if (rc < 0 || (unsigned int) rc >= sizeof(TempBuf))
@@ -377,6 +380,7 @@ static int CreateClientRequestPacket(
/*!
* \brief
*/
#ifdef UPNP_ENABLE_IPV6
static int CreateClientRequestPacketUlaGua(
/*! [in,out] . */
char *RqstBuf,
@@ -398,13 +402,16 @@ static int CreateClientRequestPacketUlaGua(
if (RqstBufSize <= strlen(command))
return UPNP_E_INTERNAL_ERROR;
strcpy(RqstBuf, command);
if (AddressFamily == AF_INET) {
switch (AddressFamily) {
case AF_INET:
rc = snprintf(TempBuf, sizeof(TempBuf), "HOST: %s:%d\r\n", SSDP_IP,
SSDP_PORT);
} else if (AddressFamily == AF_INET6) {
break;
case AF_INET6:
rc = snprintf(TempBuf, sizeof(TempBuf), "HOST: [%s]:%d\r\n",
SSDP_IPV6_SITELOCAL, SSDP_PORT);
} else {
break;
default:
return UPNP_E_INVALID_ARGUMENT;
}
if (rc < 0 || (unsigned int) rc >= sizeof(TempBuf))
@@ -440,6 +447,7 @@ static int CreateClientRequestPacketUlaGua(
return UPNP_E_SUCCESS;
}
#endif /* UPNP_ENABLE_IPV6 */
/*!
* \brief
@@ -547,13 +555,13 @@ int SearchByTarget(int Mx, char *St, void *Cookie)
#endif
memset(&__ss_v4, 0, sizeof(__ss_v4));
destAddr4->sin_family = AF_INET;
destAddr4->sin_family = (sa_family_t)AF_INET;
inet_pton(AF_INET, SSDP_IP, &destAddr4->sin_addr);
destAddr4->sin_port = htons(SSDP_PORT);
#ifdef UPNP_ENABLE_IPV6
memset(&__ss_v6, 0, sizeof(__ss_v6));
destAddr6->sin6_family = AF_INET6;
destAddr6->sin6_family = (sa_family_t)AF_INET6;
inet_pton(AF_INET6, SSDP_IPV6_SITELOCAL, &destAddr6->sin6_addr);
destAddr6->sin6_port = htons(SSDP_PORT);
destAddr6->sin6_scope_id = gIF_INDEX;