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

Removing implicit casts in miniserver.c

Browse Source 
Removing implicit integer or enum casts in miniserver.c.
This commit is contained in:
Fabrice Fontaine 2012-03-29 17:05:23 +02:00
parent 9a33782ab5
commit df27ba505f
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -2,6 +2,12 @@
Version 1.6.17 Version 1.6.17
******************************************************************************* *******************************************************************************
2012-03-29 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
Removing implicit casts in miniserver.c
Removing implicit integer or enum casts in miniserver.c.
2012-03-29 Fabrice Fontaine <fabrice.fontaine(at)orange.com> 2012-03-29 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
SF Bug Tracker id 3512833 - Miniserver is wrongly disabled SF Bug Tracker id 3512833 - Miniserver is wrongly disabled

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

@ -91,10 +91,11 @@ uint16_t miniStopSockPort;
/*! /*!
* module vars * module vars
*/ */
static MiniServerState gMServState = MSERV_IDLE;
#ifdef INTERNAL_WEB_SERVER
static MiniServerCallback gGetCallback = NULL; static MiniServerCallback gGetCallback = NULL;
static MiniServerCallback gSoapCallback = NULL; static MiniServerCallback gSoapCallback = NULL;
static MiniServerCallback gGenaCallback = NULL; static MiniServerCallback gGenaCallback = NULL;
static MiniServerState gMServState = MSERV_IDLE;
void SetHTTPGetCallback(MiniServerCallback callback) void SetHTTPGetCallback(MiniServerCallback callback)
{ {
@ -113,7 +114,6 @@ void SetGenaCallback(MiniServerCallback callback)
gGenaCallback = callback; gGenaCallback = callback;
} }
#ifdef INTERNAL_WEB_SERVER
/*! /*!
* \brief Based on the type pf message, appropriate callback is issued. * \brief Based on the type pf message, appropriate callback is issued.
* *
@ -340,7 +340,7 @@ static int receive_from_stopSock(SOCKET ssock, fd_set *set)
clientLen = sizeof(clientAddr); clientLen = sizeof(clientAddr);
memset((char *)&clientAddr, 0, sizeof(clientAddr)); memset((char *)&clientAddr, 0, sizeof(clientAddr));
byteReceived = recvfrom(ssock, requestBuf, byteReceived = recvfrom(ssock, requestBuf,
25, 0, (struct sockaddr *)&clientAddr, &clientLen); (size_t)25, 0, (struct sockaddr *)&clientAddr, &clientLen);
if (byteReceived > 0) { if (byteReceived > 0) {
requestBuf[byteReceived] = '\0'; requestBuf[byteReceived] = '\0';
inet_ntop(AF_INET, inet_ntop(AF_INET,
@ -476,7 +476,7 @@ static int get_port(
*port = ntohs(((struct sockaddr_in6*)&sockinfo)->sin6_port); *port = ntohs(((struct sockaddr_in6*)&sockinfo)->sin6_port);
} }
UpnpPrintf(UPNP_INFO, MSERV, __FILE__, __LINE__, UpnpPrintf(UPNP_INFO, MSERV, __FILE__, __LINE__,
"sockfd = %d, .... port = %u\n", sockfd, *port); "sockfd = %d, .... port = %d\n", sockfd, (int)*port);
return 0; return 0;
} }
@ -511,12 +511,12 @@ static int get_miniserver_sockets(
struct sockaddr_storage __ss_v4; struct sockaddr_storage __ss_v4;
struct sockaddr_in* serverAddr4 = (struct sockaddr_in*)&__ss_v4; struct sockaddr_in* serverAddr4 = (struct sockaddr_in*)&__ss_v4;
SOCKET listenfd4; SOCKET listenfd4;
uint16_t actual_port4; uint16_t actual_port4 = 0u;
#ifdef UPNP_ENABLE_IPV6 #ifdef UPNP_ENABLE_IPV6
struct sockaddr_storage __ss_v6; struct sockaddr_storage __ss_v6;
struct sockaddr_in6* serverAddr6 = (struct sockaddr_in6*)&__ss_v6; struct sockaddr_in6* serverAddr6 = (struct sockaddr_in6*)&__ss_v6;
SOCKET listenfd6; SOCKET listenfd6;
uint16_t actual_port6; uint16_t actual_port6 = 0u;
int onOff; int onOff;
#endif #endif
int ret_code; int ret_code;
@ -548,19 +548,19 @@ static int get_miniserver_sockets(
/* As per the IANA specifications for the use of ports by applications /* As per the IANA specifications for the use of ports by applications
* override the listen port passed in with the first available. */ * override the listen port passed in with the first available. */
if (listen_port4 < APPLICATION_LISTENING_PORT) { if (listen_port4 < APPLICATION_LISTENING_PORT) {
listen_port4 = APPLICATION_LISTENING_PORT; listen_port4 = (uint16_t)APPLICATION_LISTENING_PORT;
} }
#ifdef UPNP_ENABLE_IPV6 #ifdef UPNP_ENABLE_IPV6
if (listen_port6 < APPLICATION_LISTENING_PORT) { if (listen_port6 < APPLICATION_LISTENING_PORT) {
listen_port6 = APPLICATION_LISTENING_PORT; listen_port6 = (uint16_t)APPLICATION_LISTENING_PORT;
} }
#endif #endif
memset(&__ss_v4, 0, sizeof (__ss_v4)); memset(&__ss_v4, 0, sizeof (__ss_v4));
serverAddr4->sin_family = AF_INET; serverAddr4->sin_family = (sa_family_t)AF_INET;
serverAddr4->sin_addr.s_addr = htonl(INADDR_ANY); serverAddr4->sin_addr.s_addr = htonl(INADDR_ANY);
#ifdef UPNP_ENABLE_IPV6 #ifdef UPNP_ENABLE_IPV6
memset(&__ss_v6, 0, sizeof (__ss_v6)); memset(&__ss_v6, 0, sizeof (__ss_v6));
serverAddr6->sin6_family = AF_INET6; serverAddr6->sin6_family = (sa_family_t)AF_INET6;
serverAddr6->sin6_addr = in6addr_any; serverAddr6->sin6_addr = in6addr_any;
#endif #endif
/* Getting away with implementation of re-using address:port and /* Getting away with implementation of re-using address:port and
@ -763,7 +763,7 @@ static int get_miniserver_sockets(
#else #else
/* Silence compiler warning message: /* Silence compiler warning message:
* warning: unused parameter ‘listen_port6’ */ * warning: unused parameter ‘listen_port6’ */
listen_port6 = 0; listen_port6 = 0u;
#endif #endif
return UPNP_E_SUCCESS; return UPNP_E_SUCCESS;
} }
@ -797,7 +797,7 @@ static int get_miniserver_stopsock(
} }
/* Bind to local socket. */ /* Bind to local socket. */
memset(&stop_sockaddr, 0, sizeof (stop_sockaddr)); memset(&stop_sockaddr, 0, sizeof (stop_sockaddr));
stop_sockaddr.sin_family = AF_INET; stop_sockaddr.sin_family = (sa_family_t)AF_INET;
stop_sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1"); stop_sockaddr.sin_addr.s_addr = inet_addr("127.0.0.1");
ret = bind(miniServerStopSock, (struct sockaddr *)&stop_sockaddr, ret = bind(miniServerStopSock, (struct sockaddr *)&stop_sockaddr,
sizeof(stop_sockaddr)); sizeof(stop_sockaddr));
@ -827,9 +827,9 @@ static UPNP_INLINE void InitMiniServerSockArray(MiniServerSockArray *miniSocket)
miniSocket->ssdpSock4 = INVALID_SOCKET; miniSocket->ssdpSock4 = INVALID_SOCKET;
miniSocket->ssdpSock6 = INVALID_SOCKET; miniSocket->ssdpSock6 = INVALID_SOCKET;
miniSocket->ssdpSock6UlaGua = INVALID_SOCKET; miniSocket->ssdpSock6UlaGua = INVALID_SOCKET;
miniSocket->stopPort = 0; miniSocket->stopPort = 0u;
miniSocket->miniServerPort4 = 0; miniSocket->miniServerPort4 = 0u;
miniSocket->miniServerPort6 = 0; miniSocket->miniServerPort6 = 0u;
#ifdef INCLUDE_CLIENT_APIS #ifdef INCLUDE_CLIENT_APIS
miniSocket->ssdpReqSock4 = INVALID_SOCKET; miniSocket->ssdpReqSock4 = INVALID_SOCKET;
miniSocket->ssdpReqSock6 = INVALID_SOCKET; miniSocket->ssdpReqSock6 = INVALID_SOCKET;
@ -852,7 +852,10 @@ int StartMiniServer(
memset(&job, 0, sizeof(job)); memset(&job, 0, sizeof(job));
if (gMServState != MSERV_IDLE) { switch (gMServState) {
case MSERV_IDLE:
break;
default:
/* miniserver running. */ /* miniserver running. */
return UPNP_E_INTERNAL_ERROR; return UPNP_E_INTERNAL_ERROR;
} }
@ -907,9 +910,9 @@ int StartMiniServer(
} }
/* Wait for miniserver to start. */ /* Wait for miniserver to start. */
count = 0; count = 0;
while (gMServState != MSERV_RUNNING && count < max_count) { while (gMServState != (MiniServerState)MSERV_RUNNING && count < max_count) {
/* 0.05s */ /* 0.05s */
usleep(50 * 1000); usleep(50u * 1000u);
count++; count++;
} }
if (count >= max_count) { if (count >= max_count) {
@ -943,9 +946,11 @@ int StopMiniServer()
char buf[256] = "ShutDown"; char buf[256] = "ShutDown";
size_t bufLen = strlen(buf); size_t bufLen = strlen(buf);
if(gMServState == MSERV_RUNNING) { switch(gMServState) {
case MSERV_RUNNING:
gMServState = MSERV_STOPPING; gMServState = MSERV_STOPPING;
} else { break;
default:
return 0; return 0;
} }
sock = socket(AF_INET, SOCK_DGRAM, 0); sock = socket(AF_INET, SOCK_DGRAM, 0);
@ -956,17 +961,17 @@ int StopMiniServer()
errorBuffer); errorBuffer);
return 0; return 0;
} }
while(gMServState != MSERV_IDLE) { while(gMServState != (MiniServerState)MSERV_IDLE) {
ssdpAddr.sin_family = AF_INET; ssdpAddr.sin_family = (sa_family_t)AF_INET;
ssdpAddr.sin_addr.s_addr = inet_addr("127.0.0.1"); ssdpAddr.sin_addr.s_addr = inet_addr("127.0.0.1");
ssdpAddr.sin_port = htons(miniStopSockPort); ssdpAddr.sin_port = htons(miniStopSockPort);
sendto(sock, buf, bufLen, 0, sendto(sock, buf, bufLen, 0,
(struct sockaddr *)&ssdpAddr, socklen); (struct sockaddr *)&ssdpAddr, socklen);
usleep(1000); usleep(1000u);
if (gMServState == MSERV_IDLE) { if (gMServState == (MiniServerState)MSERV_IDLE) {
break; break;
} }
isleep(1); isleep(1u);
} }
sock_close(sock); sock_close(sock);