add logging functionality to vanilla pipe

Author: itsmattkc

pipe/linux/main.c

@@ -13,7 +13,7 @@ int main(int argc, const char **argv)
         return 1;
     }
 
-    if (argc != 3) {
+    if (argc < 3) {
         nlprint("vanilla-pipe - brokers a connection between Vanilla and the Wii U");
         nlprint("--------------------------------------------------------------------------------");
         nlprint("");
@@ -37,19 +37,31 @@ int main(int argc, const char **argv)
         nlprint("sockets by a compatible frontend. By choosing '-local' or '-udp', you can");
         nlprint("choose what type of socket to use to best suit the environment.");
         nlprint("");
+        nlprint("External logging can be enabled with '-log <log-file>'.");
+        nlprint("");
 
         return 1;
     }
 
     int udp_mode = 0;
     int local_mode = 0;
     const char *wireless_interface = 0;
+    const char *log_file = 0;
 
     for (int i = 1; i < argc; i++) {
         if (!strcmp(argv[i], "-udp")) {
             udp_mode = 1;
         } else if (!strcmp(argv[i], "-local")) {
             local_mode = 1;
+        } else if (!strcmp(argv[i], "-log")) {
+            // Increment index
+            i++;
+            if (i < argc) {
+                log_file = argv[i];
+            } else {
+                nlprint("-log requires an argument");
+                return 1;
+            }
         } else {
             wireless_interface = argv[i];
         }
@@ -65,7 +77,7 @@ int main(int argc, const char **argv)
         return 1;
     }
 
-    pipe_listen(local_mode, wireless_interface);
+    pipe_listen(local_mode, wireless_interface, log_file);
 
     return 0;
 }

pipe/linux/wpa.c

@@ -79,6 +79,7 @@ struct relay_info {
 
 #define THREADRESULT(x) ((void *) (uintptr_t) (x))
 
+static const char *ext_logfile = 0;
 void nlprint(const char *fmt, ...)
 {
     va_list args;
@@ -87,6 +88,15 @@ void nlprint(const char *fmt, ...)
     vfprintf(stderr, fmt, args);
     fprintf(stderr, "\n");
 
+    if (ext_logfile) {
+        FILE *f = fopen(ext_logfile, "a");
+        if (f) {
+            vfprintf(f, fmt, args);
+            fprintf(f, "\n");
+            fclose(f);
+        }
+    }
+
     va_end(args);
 }
 
@@ -944,8 +954,11 @@ void *vanilla_connect_to_console(void *data)
     return wpa_setup_environment(args);
 }
 
-void pipe_listen(int local, const char *wireless_interface)
+void pipe_listen(int local, const char *wireless_interface, const char *log_file)
 {
+    // Store reference to log file
+    ext_logfile = log_file;
+
     // Ensure local domain sockets can be written to by everyone
     umask(0000);
 

pipe/linux/wpa.h

@@ -17,6 +17,6 @@ int enable_networkmanager_on_device(const char *wireless_interface);
 
 void nlprint(const char *fmt, ...);
 
-void pipe_listen(int local, const char *wireless_interface);
+void pipe_listen(int local, const char *wireless_interface, const char *log_file);
 
 #endif // VANILLA_WPA_H