Tools/NetTest - Seed RNG, tcpclient logging

[tpg/acess2.git] / Tools / NetTest / main.c

diff --git a/Tools/NetTest/main.c b/Tools/NetTest/main.c
index 4f3e9f5..95e70ab 100644 (file)
--- a/Tools/NetTest/main.c
+++ b/Tools/NetTest/main.c
@@ -9,7 +9,10 @@
 #include <acess_logging.h>
 #include <nettest.h>
 #include <string.h>
+#include <stdlib.h>
+#include <time.h>
 
+extern int     VFS_Init(void);
 extern int     IPStack_Install(char **Args);
 
 // === CODE ===
@@ -18,45 +21,90 @@ void PrintUsage(const char *ProgramName)
        fprintf(stderr, "Usage: %s <commands...>\n", ProgramName);
        fprintf(stderr, "\n");
        fprintf(stderr,
-               "-dev <tapdev>:<mac>\n"
-               "-ip <dev>,<addr>,<mask>\n"
+               "Options:\n"
+               "-dev <mac>:<tapdev>\n"
+               "-ip <dev>,<addr>/<mask>\n"
                "-route <net>,<mask>,<nexthop>\n"
+               "\n"
+               "Suites:\n"
+               "netcat <addr> <port>\n"
                );
 }
 
 int main(int argc, char *argv[])
 {
+        int    rv;
+       
        if( argc <= 1 ) {
                PrintUsage(argv[0]);
                return 1;
        }
-       
+
+       srand(time(NULL));      
+
        // Startup
+       VFS_Init();
        {
                char    *ipstack_args[] = {NULL};
                IPStack_Install( ipstack_args );
        }
        
-       for( int i = 0; i < argc; i ++ )
+       for( int i = 1; i < argc; i ++ )
        {
-               if( argv[i][0] != '-' ) {
-               }
-               else if( strcmp(argv[i], "-dev") == 0 )
+               if( argv[i][0] != '-' )
                {
-                       if( ++i == argc ) { PrintUsage(argv[0]); return 1; }
-                       NativeNic_AddDev(argv[i]);
+                       if( strcmp(argv[i], "netcat") == 0 )
+                       {
+                               if( argc-i != 3 ) {
+                                       Log_Error("NetTest", "'netcat' <addr> <port>");
+                                       PrintUsage(argv[0]);
+                                       return -1;
+                               }
+
+                               NetTest_Suite_Netcat(argv[i+1], strtol(argv[i+2], NULL, 0));
+                               i += 2;
+                       }
+                       else
+                       {
+                               Log_Error("NetTest", "Unknown suite name '%s'", argv[i]);
+                               PrintUsage(argv[0]);
+                       }
                }
-               else if( strcmp(argv[i], "-ip") == 0 )
+               else
                {
-                       if( ++i == argc ) { PrintUsage(argv[0]); return 1; }
-                       // TODO: parse argument and poke ipstack
+                       if( strcmp(argv[i], "-dev") == 0 )
+                       {
+                               if( ++i == argc ) { PrintUsage(argv[0]); return 1; }
+                               rv = NativeNic_AddDev(argv[i]);
+                               if( rv ) {
+                                       Log_Error("NetTest", "Failed to add device %s", argv[i]);
+                                       return -1;
+                               }
+                       }
+                       else if( strcmp(argv[i], "-ip") == 0 )
+                       {
+                               if( ++i == argc ) { PrintUsage(argv[0]); return 1; }
+                               // TODO: parse argument and poke ipstack
+                               if( NetTest_AddAddress(argv[i]) ) {
+                                       return -1;
+                               }
+                       }
+                       else
+                       {
+                               Log_Error("NetTest", "Unknown argument '%s'", argv[i]);
+                               PrintUsage(argv[0]);
+                               return -1;
+                       }
                }
        }
 
-       // Run suite
-       
-
        // Teardown
-
+       Log_Log("NetTest", "Shutting down");
+       fflush(stdout);
        return 0;
 }
+
+size_t NetTest_WriteStdout(const void *Data, size_t Size)
+{
+       return fwrite(Data, 1, Size, stdout);
+}