test_server: add options for verbose output

* -v produce verbose output
* -T print the list of top players

Author: neuschaefer

test_server.c

@@ -29,9 +29,49 @@ static int port=DEFAULT_PORT;
 static struct sockaddr_in server;
 static char *name=NULL;
 static int ttime=1;
+static int verbose=0; /* whether to print a verbose message */
+static int toplist=0; /* whether to print the list of top players */
 int fd;
 
 
+/* print info based on the recieved packet */
+static void print_info (char * packet)
+{
+	int n_pl; /* number of players */
+
+	n_pl=get_int(packet+1);
+	if (verbose) {
+		if (n_pl)
+			printf ((n_pl>1)? "There are %d players on the server.\n"
+					: "There is %d player on the server.\n", n_pl);
+		else
+			printf ("This server is not being used.\n");
+	} else
+		printf("%d\n",n_pl);
+	if (toplist && n_pl) {
+		unsigned int n_tp=*(packet+5); /* number of players on top list */
+
+		if (!n_tp)
+			printf("The top list is empty.\n");
+		else {
+			unsigned int i; /* iterator */
+			/* pointer to the next set of player-specific info */
+			char * p = packet+6;
+
+			packet[256-1]='\0';
+			printf ("Players on top list (%d):\n", n_tp);
+			printf ("rank\tfrags\tdeaths\tcolor\tname\n");
+			for (i=0; i<n_tp; i++) {
+				printf ("#%d\t%d\t%d\t%d\t%s\n",
+						i+1, get_int(p), get_int(p+4),
+						*(p+8), p+9);
+				p+=10+strlen(p+9);
+			}
+		}
+	}
+}
+
+
 /* find server address from name and put it into server structure */
 static void find_server(void)
 {
@@ -58,7 +98,6 @@ static void init_socket(void)
 static int contact_server(void)
 {
         static char packet[256];
-        int a;
 
         fd_set fds;
         struct timeval tv;
@@ -80,8 +119,7 @@ static int contact_server(void)
         }
 
 	if ((*packet)!=P_INFO){fprintf(stderr,"Server error.\n");return 1;}
-	a=get_int(packet+1);
-	printf("%d\n",a);
+	print_info(packet);
 	return 0;
 }
 
@@ -92,7 +130,9 @@ static void print_help(void)
 {
 	printf(	"0verkill server testing program.\n"
 		"(c)2000 Brainsoft\n"
-		"Usage: test_server [-h] [-p <port number>] [-t <timeout>] -a <address>\n");
+		"Usage: test_server [-hvT] [-t <timeout>] [-p <port number>] -a <address>\n"
+		"    -v  produce verbose output\n"
+		"    -T  print the list of top players (implies -v)\n");
 }
 
 
@@ -117,10 +157,16 @@ static void parse_command_line(int argc,char **argv)
 {
         int a;
 
-        while((a=getopt(argc,argv,"hp:a:t:")) != -1)
+        while((a=getopt(argc,argv,"hvTp:a:t:")) != -1)
         {
                 switch(a)
                 {
+			case 'T':
+			toplist = 1;
+			case 'v':
+			verbose = 1;
+			break;
+
                         case 'a':
 			name=optarg;
                     	break;