Ticket #1684: netstat.cpp.diff

netstat.cpp

@@ -22 +22 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <getopt.h>
 
 
 extern const char* __progname;
 const char* kProgramName = __progname;
 
+static int resolve_names = 1;
 
 struct address_family {
     int         family;
@@ -59 +61 @@
         return;
     }
 
-    hostent* host = gethostbyaddr((const char*)_address, sizeof(sockaddr_in), AF_INET);
-    servent* service = getservbyport(ntohs(address.sin_port), NULL);
+    hostent* host = NULL;
+    servent* service = NULL;
+    if (resolve_names) {
+        host = gethostbyaddr((const char*)_address, sizeof(sockaddr_in), AF_INET);
+        service = getservbyport(ntohs(address.sin_port), NULL);
+    }
 
     const char *hostName;
     if (host != NULL)
@@ -93 +99 @@
 void
 usage(int status)
 {
-    printf("usage: %s\n", kProgramName);
+    printf("usage: %s [options]\n", kProgramName);
+    printf("options:\n");
+    printf("    -n  don't resolve names\n");
+    printf("    -h  this help\n");
 
     exit(status);
 }
@@ -140 +149 @@
 int
 main(int argc, char** argv)
 {
-    if (argc > 1 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h")))
-        usage(0);
+    int option_index = 0;
+    int c;
+    static struct option long_options[] = 
+    {
+        {"help", no_argument, 0, 'h'},
+        {"numeric", no_argument, 0, 'n'}
+    };
 
+    while ((c = getopt_long(argc, argv, "hn", long_options, &option_index)) != -1) {
+        if (c == 'n') {
+            resolve_names = 0;
+        } else if (c == 'h' || c == '?') {
+            usage(0);
+        }
+    }
+
     int stack = open(NET_STACK_DRIVER_PATH, O_RDWR);
     if (stack < 0) {
         fprintf(stderr, "%s: The networking stack doesn't seem to be available.\n",