Re: [pupnp-devel] [pupnp-commits] SF.net SVN: pupnp: [241] trunk/upnp/src/genlib/miniserver/miniserver.c

[Nektarios K. P. <npa...@in...>]

Hi Marcelo,

I think you missed some lines in the replacement (in the second chunk @@ 
-390,18 +392,14 @@). Is it intetional ?

see below...


mro...@us... wrote:
> Revision: 241
>           http://pupnp.svn.sourceforge.net/pupnp/?rev=241&view=rev
> Author:   mroberto
> Date:     2007-11-09 02:34:12 -0800 (Fri, 09 Nov 2007)
> 
> Log Message:
> -----------
> Removing the macro CLIENTONLY() from miniserver.c. It breaks syntax highlight,
> not to mention it is awful.
> 
> Modified Paths:
> --------------
>     trunk/upnp/src/genlib/miniserver/miniserver.c
> 
> Modified: trunk/upnp/src/genlib/miniserver/miniserver.c
> ===================================================================
> --- trunk/upnp/src/genlib/miniserver/miniserver.c	2007-11-09 09:49:54 UTC (rev 240)
> +++ trunk/upnp/src/genlib/miniserver/miniserver.c	2007-11-09 10:34:12 UTC (rev 241)
> @@ -378,11 +378,13 @@
>  {
>      struct sockaddr_in clientAddr;
>      socklen_t clientLen;
> -    SOCKET miniServSock;
>      SOCKET connectHnd;
> -    SOCKET miniServStopSock;
> -    SOCKET ssdpSock;
> -    CLIENTONLY( SOCKET ssdpReqSock; )
> +    SOCKET miniServSock = miniSock->miniServerSock;
> +    SOCKET miniServStopSock =  miniSock->miniServerStopSock;
> +    SOCKET ssdpSock = miniSock->ssdpSock;
> +#ifdef INCLUDE_CLIENT_APIS
> +    SOCKET ssdpReqSock = miniSock->ssdpReqSock;
> +#endif
>  
>      fd_set expSet;
>      fd_set rdSet;
> @@ -390,18 +392,14 @@
>      int byteReceived;
>      char requestBuf[256];
>  
> -    miniServSock = miniSock->miniServerSock;
> -    miniServStopSock = miniSock->miniServerStopSock;
> -    ssdpSock = miniSock->ssdpSock;
> -    CLIENTONLY( ssdpReqSock = miniSock->ssdpReqSock; );

you remove the above lines completely!

> +    maxMiniSock = max( miniServSock, miniServStopSock) ;
> +    maxMiniSock = max( maxMiniSock, (SOCKET)(ssdpSock) );
> +#ifdef INCLUDE_CLIENT_APIS
> +    maxMiniSock = max( maxMiniSock, (SOCKET)(ssdpReqSock) );
> +#endif
> +    ++maxMiniSock;
>  
>      gMServState = MSERV_RUNNING;
> -    maxMiniSock = max( miniServSock, miniServStopSock );
> -    maxMiniSock = max( maxMiniSock, ( SOCKET ) ( ssdpSock ) );
> -    CLIENTONLY( maxMiniSock =
> -                max( maxMiniSock, ( SOCKET ) ( ssdpReqSock ) ) );
> -
> -    ++maxMiniSock;
>      while( TRUE ) {
>          FD_ZERO( &rdSet );
>          FD_ZERO( &expSet );
> @@ -410,33 +408,33 @@
>          FD_SET( miniServSock, &rdSet );
>          FD_SET( miniServStopSock, &rdSet );
>          FD_SET( ssdpSock, &rdSet );
> -        CLIENTONLY( FD_SET( ssdpReqSock, &rdSet ) );
> +#ifdef INCLUDE_CLIENT_APIS
> +        FD_SET( ssdpReqSock, &rdSet );
> +#endif
>  
>          if( select( maxMiniSock, &rdSet, NULL, &expSet, NULL ) ==
>              UPNP_SOCKETERROR ) {
>              UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
> -                "Error in select call !!!\n" );
> +                "Error in select call!\n" );
>              continue;
>          } else {
>              if( FD_ISSET( miniServSock, &rdSet ) ) {
>                  clientLen = sizeof( struct sockaddr_in );
>                  connectHnd = accept( miniServSock,
> -                                     ( struct sockaddr * )&clientAddr,
> -                                     &clientLen );
> +                    ( struct sockaddr * )&clientAddr, &clientLen );
>                  if( connectHnd == UPNP_INVALID_SOCKET ) {
>                      UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
> -                        "miniserver: Error"
> -                        " in accepting connection\n" );
> +                        "miniserver: Error in accepting connection\n" );
>                      continue;
>                  }
>                  schedule_request_job( connectHnd, &clientAddr );
>              }
> -            //ssdp
> -            CLIENTONLY(
> -                if( FD_ISSET( ssdpReqSock, &rdSet ) ) {
> -                    readFromSSDPSocket( ssdpReqSock );
> -		}
> -            )
> +#ifdef INCLUDE_CLIENT_APIS
> +            // ssdp
> +            if( FD_ISSET( ssdpReqSock, &rdSet ) ) {
> +                readFromSSDPSocket( ssdpReqSock );
> +            }
> +#endif
>              if( FD_ISSET( ssdpSock, &rdSet ) ) {
>                      readFromSSDPSocket( ssdpSock );
>              }
> @@ -470,11 +468,12 @@
>      UpnpCloseSocket( miniServStopSock );
>      shutdown( ssdpSock, SD_BOTH );
>      UpnpCloseSocket( ssdpSock );
> -    CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ) );
> -    CLIENTONLY( UpnpCloseSocket( ssdpReqSock ) );
> +#ifdef INCLUDE_CLIENT_APIS
> +    shutdown( ssdpReqSock, SD_BOTH );
> +    UpnpCloseSocket( ssdpReqSock );
> +#endif
>  
>      free( miniSock );
> -
>      gMServState = MSERV_IDLE;
>  
>      return;
> @@ -666,8 +665,8 @@
>      miniStopSockPort = get_port( miniServerStopSock );
>      if( miniStopSockPort <= 0 ) {
>          shutdown( miniServerStopSock, SD_BOTH );
> -        shutdown( listenfd, SD_BOTH );
>          UpnpCloseSocket( miniServerStopSock );
> +        shutdown( listenfd, SD_BOTH );
>          UpnpCloseSocket( listenfd );
>          return UPNP_E_INTERNAL_ERROR;
>      }
> @@ -704,9 +703,7 @@
>  int
>  StartMiniServer( unsigned short listen_port )
>  {
> -
>      int success;
> -
>      int count;
>      int max_count = 10000;
>  
> @@ -729,12 +726,10 @@
>      }
>  
>      if( ( success = get_ssdp_sockets( miniSocket ) ) != UPNP_E_SUCCESS ) {
> -
>          shutdown( miniSocket->miniServerSock, SD_BOTH );
>          UpnpCloseSocket( miniSocket->miniServerSock );
>          shutdown( miniSocket->miniServerStopSock, SD_BOTH );
>          UpnpCloseSocket( miniSocket->miniServerStopSock );
> -
>          free( miniSocket );
>  
>          return success;
> @@ -750,15 +745,16 @@
>  
>      if( success < 0 ) {
>          shutdown( miniSocket->miniServerSock, SD_BOTH );
> -        shutdown( miniSocket->miniServerStopSock, SD_BOTH );
> -        shutdown( miniSocket->ssdpSock, SD_BOTH );
> -        CLIENTONLY( shutdown( miniSocket->ssdpReqSock, SD_BOTH ) );
>          UpnpCloseSocket( miniSocket->miniServerSock );
> +        shutdown( miniSocket->miniServerStopSock, SD_BOTH );
>          UpnpCloseSocket( miniSocket->miniServerStopSock );
> +        shutdown( miniSocket->ssdpSock, SD_BOTH );
>          UpnpCloseSocket( miniSocket->ssdpSock );
> +#ifdef INCLUDE_CLIENT_APIS
> +        shutdown( miniSocket->ssdpReqSock, SD_BOTH );
> +        UpnpCloseSocket( miniSocket->ssdpReqSock );
> +#endif
>  
> -        CLIENTONLY( UpnpCloseSocket( miniSocket->ssdpReqSock ) );
> -
>          return UPNP_E_OUTOF_MEMORY;
>      }
>      // wait for miniserver to start
> @@ -770,16 +766,16 @@
>  
>      // taking too long to start that thread
>      if( count >= max_count ) {
> -
>          shutdown( miniSocket->miniServerSock, SD_BOTH );
> -        shutdown( miniSocket->miniServerStopSock, SD_BOTH );
> -        shutdown( miniSocket->ssdpSock, SD_BOTH );
> -        CLIENTONLY( shutdown( miniSocket->ssdpReqSock, SD_BOTH ) );
> -
>          UpnpCloseSocket( miniSocket->miniServerSock );
> +        shutdown( miniSocket->miniServerStopSock, SD_BOTH );
>          UpnpCloseSocket( miniSocket->miniServerStopSock );
> +        shutdown( miniSocket->ssdpSock, SD_BOTH );
>          UpnpCloseSocket( miniSocket->ssdpSock );
> -        CLIENTONLY( UpnpCloseSocket( miniSocket->ssdpReqSock ) );
> +#ifdef INCLUDE_CLIENT_APIS
> +        shutdown( miniSocket->ssdpReqSock, SD_BOTH );
> +        UpnpCloseSocket( miniSocket->ssdpReqSock );
> +#endif
>  
>          return UPNP_E_INTERNAL_ERROR;
>      }
> @@ -804,16 +800,17 @@
>  StopMiniServer( void )
>  {
>  
> -    int socklen = sizeof( struct sockaddr_in ),
> -      sock;
> +    int socklen = sizeof( struct sockaddr_in );
> +    int sock;
>      struct sockaddr_in ssdpAddr;
>      char buf[256] = "ShutDown";
>      int bufLen = strlen( buf );
>  
> -    if( gMServState == MSERV_RUNNING )
> +    if( gMServState == MSERV_RUNNING ) {
>          gMServState = MSERV_STOPPING;
> -    else
> +    } else {
>          return 0;
> +    }
>  
>      sock = socket( AF_INET, SOCK_DGRAM, 0 );
>      if( sock == UPNP_INVALID_SOCKET ) {
> 
> 
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
> 
> -------------------------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc.
> Still grepping through log files to find problems?  Stop.
> Now Search log events and configuration files using AJAX and a browser.
> Download your FREE copy of Splunk now >> http://get.splunk.com/
> _______________________________________________
> pupnp-commits mailing list
> pup...@li...
> https://lists.sourceforge.net/lists/listinfo/pupnp-commits
> 

-- 
______________________________________________________________
Nektarios K. Papadopoulos
Senior Engineer
Home Automation Group
inAccess Networks
______________________________________________________________