Add fce simple test listener, use getopt in main in fce_api

[netatalk.git] / etc / afpd / fce_api.c

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 37f06732c76a83fd8a4366169ae782560883f25b..601f02e215262e1bda24b93d09307636f2e903f2 100755 (executable)
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -46,6 +46,7 @@
 #include <atalk/util.h>\r
 #include <atalk/cnid.h>\r
 #include <atalk/unix.h>\r
+#include <atalk/fce_api.h>\r
 \r
 #include "fork.h"\r
 #include "file.h"\r
@@ -54,8 +55,6 @@
 #include "desktop.h"\r
 #include "volume.h"\r
 \r
-#include "fce_api.h"\r
-\r
 // ONLY USED IN THIS FILE\r
 #include "fce_api_internal.h"\r
 \r
@@ -458,64 +457,49 @@ void shortsleep( unsigned int us )
 }\r
 int main( int argc, char*argv[] )\r
 {\r
-    int port  = 11250;\r
-    char *host = NULL;\r
+    int c,ret;\r
+\r
+    char *port = FCE_DEFAULT_PORT_STRING;\r
+    char *host = "localhost";\r
     int delay_between_events = 1000;\r
     int event_code = FCE_FILE_MODIFY;\r
     char pathbuff[1024];\r
     int duration_in_seconds = 0; // TILL ETERNITY\r
-\r
+    char target[256];\r
     char *path = getcwd( pathbuff, sizeof(pathbuff) );\r
 \r
     // FULLSPEED TEST IS "-s 1001" -> delay is 0 -> send packets without pause\r
 \r
-    if (argc == 1)\r
-    {\r
-        fprintf( stdout, "%s: -p Port -h Listener1 [ -h Listener2 ...] -P path -s Delay_between_events_in_us -e event_code -d Duration \n", argv[0]);\r
-        exit( 1 );\r
-    }\r
-    int ret = AFP_OK;\r
-\r
-    for (int i = 1; i < argc; i++)\r
-    {\r
-        char *p = argv[i];\r
-        if (*p == '-' && p[1])\r
-        {\r
-            char *arg = argv[i + 1];\r
-            switch (p[1])\r
-            {\r
-                case 'p': if (arg) port = atoi( arg ), i++; break;\r
-                case 'P': if (arg) path =  arg, i++; break;\r
-                case 's': if (arg) delay_between_events = atoi( arg ), i++; break;\r
-                case 'e': if (arg) event_code = atoi( arg ), i++; break;\r
-                case 'd': if (arg) duration_in_seconds = atoi( arg ), i++; break;\r
-                case 'h':\r
-                {\r
-                    if (arg)\r
-                    {\r
-                        host = arg;\r
-                                               char target[256];\r
-                                               sprintf( target, "%s:%d", host, port );\r
-                        ret += fce_add_udp_socket( target );\r
-                        i++;\r
-                    }\r
-                    break;\r
-                }               \r
-            }\r
+    while ((c = getopt(argc, argv, "d:e:h:p:P:s:")) != -1) {\r
+        switch(c) {\r
+        case '?':\r
+            fprintf(stdout, "%s: [ -p Port -h Listener1 [ -h Listener2 ...] -P path -s Delay_between_events_in_us -e event_code -d Duration ]\n", argv[0]);\r
+            exit(1);\r
+            break;\r
+        case 'd':\r
+            duration_in_seconds = atoi(optarg);\r
+            break;\r
+        case 'e':\r
+            event_code = atoi(optarg);\r
+            break;\r
+        case 'h':\r
+            host = strdup(optarg);\r
+            break;\r
+        case 'p':\r
+            port = strdup(optarg);\r
+            break;\r
+        case 'P':\r
+            path = strdup(optarg);\r
+            break;\r
+        case 's':\r
+            delay_between_events = atoi(optarg);\r
+            break;\r
         }\r
     }\r
-       \r
-\r
-    if (host == NULL)\r
-       {\r
-               char target[256];\r
-               sprintf( target, "127.0.0.1:%d", port );\r
-               ret += fce_add_udp_socket( target );\r
-       }\r
-\r
-    if (ret)\r
-        return ret;\r
 \r
+    sprintf(target, "%s:%s", host, port);\r
+    if (fce_add_udp_socket(target) != 0)\r
+        return 1;\r
 \r
     int ev_cnt = 0;\r
     time_t start_time = time(NULL);\r