add test command for proxy feature to fetch for connNames whether

there are messages pending for them.  Not handled yet on relay.

xwords4/relay/rq.c

@@ -38,6 +38,8 @@
 # define DEFAULT_HOST "localhost"
 #endif
 
+#define MAX_CONN_NAMES 32
+
 /* 
  * Query:
  * list of all public games by language and number of players
@@ -52,10 +54,11 @@ usage( const char * const argv0 )
     fprintf( stderr, "usage: %s \\\n", argv0 );
     fprintf( stderr, "\t[-p <port>]     # (default %d)\\\n", DEFAULT_PORT );
     fprintf( stderr, "\t[-a <host>]     # (default: %s)\\\n", DEFAULT_HOST );
-    fprintf( stderr, "\t-r              # list open public rooms\\\n" );
+    fprintf( stderr, "\t -r             # list open public rooms\\\n" );
     fprintf( stderr, "\t[-l <n>]        # language for rooms "
              "(1=English default)\\\n" );
-    fprintf( stderr, "\t[-n <n>]        # number of players (1 default)\\\n" );
+    fprintf( stderr, "\t[-n <n>]        # number of players (2 default)\\\n" );
+    fprintf( stderr, "\t[-m <connName:devid>    # list msg count\\\n" );
     exit( 1 );
 }
 
@@ -63,7 +66,7 @@ static void
 do_rooms( int sockfd, int lang, int nPlayers )
 {
     unsigned char msg[] = { 0,      /* protocol */
-                            PRX_PUBROOMS,
+                            PRX_PUB_ROOMS,
                             lang,
                             nPlayers };
     unsigned short len = htons( sizeof(msg) );
@@ -94,17 +97,42 @@ do_rooms( int sockfd, int lang, int nPlayers )
     }
 }
 
+static void
+do_msgs( int sockfd, const char** connNames, int nConnNames )
+{
+    unsigned short len, netlen;
+    int ii;
+    for ( len = 0, ii = 0; ii < nConnNames; ++ii ) {
+        len += 1 + strlen( connNames[ii] );
+    }
+
+    unsigned char hdr[] = { 0, PRX_HAS_MSGS };
+    unsigned short netNConnNames = htons( nConnNames );
+    netlen = sizeof(hdr) + sizeof( netNConnNames ) + len;
+    netlen = htons( netlen );
+    write( sockfd, &netlen, sizeof(netlen) );
+    write( sockfd, &hdr, sizeof(hdr) );
+    write( sockfd, &netNConnNames, sizeof(netNConnNames) );
+    for ( len = 0, ii = 0; ii < nConnNames; ++ii ) {
+        write( sockfd, connNames[ii], strlen(connNames[ii]) );
+        write( sockfd, "\n", 1 );
+    }
+} /* do_msgs */
+
 int
 main( int argc, char * const argv[] )
 {
     int port = DEFAULT_PORT;
     int lang = 1;
-    int nPlayers = 1;
+    int nPlayers = 2;
     bool doRooms = false;
+    bool doMgs = false;
     const char* host = DEFAULT_HOST;
+    char const* connNames[MAX_CONN_NAMES];
+    int nConnNames = 0;
 
     for ( ; ; ) {
-        int opt = getopt( argc, argv, "a:p:rl:n:" );
+        int opt = getopt( argc, argv, "a:p:rl:n:m:" );
         if ( opt < 0 ) {
             break;
         }
@@ -115,6 +143,11 @@ main( int argc, char * const argv[] )
         case 'l':
             lang = atoi(optarg);
             break;
+        case 'm':
+            assert( nConnNames < MAX_CONN_NAMES - 1 );
+            connNames[nConnNames++] = optarg;
+            doMgs = true;
+            break;
         case 'n':
             nPlayers = atoi(optarg);
             break;
@@ -151,8 +184,9 @@ main( int argc, char * const argv[] )
 
     if ( doRooms ) {
         do_rooms( sockfd, lang, nPlayers );
-    } else {
-        usage( argv[0] );
+    }
+    if ( doMgs ) {
+        do_msgs( sockfd, connNames, nConnNames );
     }
 
     close( sockfd );

xwords4/relay/xwrelay.cpp

@@ -679,7 +679,7 @@ handle_proxy_tproc( void* closure )
             switch( cmd ) {
             case PRX_NONE:
                 break;
-            case PRX_PUBROOMS:
+            case PRX_PUB_ROOMS:
                 if ( len >= 4 ) {
                     int lang = *bufp++;
                     int nPlayers = *bufp++;
@@ -694,6 +694,8 @@ handle_proxy_tproc( void* closure )
                     write( sock, names.c_str(), names.size() );
                 }
                 break;
+            case PRX_HAS_MSGS:
+                break;
             }
         }
     }

xwords4/relay/xwrelay.h

@@ -147,7 +147,8 @@ XWREASON
 typedef
 #endif
 enum { PRX_NONE             /* 0 is an illegal value */
-       ,PRX_PUBROOMS
+       ,PRX_PUB_ROOMS       /* list all public rooms for lang/nPlayers */
+       ,PRX_HAS_MSGS        /* return message counts for connName/devid array */
 }
 #ifndef CANT_DO_TYPEDEF
 XWPRXYCMD