commit cb9637c86924807534297fc93aac94a38591d261
author Brian Silverman <brians> Sat Apr 13 22:19:43 2013 -0700
committer Brian Silverman <brians> Tue Apr 23 17:08:19 2013 -0700
tree 9faefdfa2e5006a24b217df5141bcd29022353ba
parent e1514fc2e80e81ab321cbf1db70fa0188efe21d4

cleaned up some netconsole stuff

aos/atom_code/starter/netconsole.cc

diff --git a/aos/atom_code/starter/netconsole.cc b/aos/atom_code/starter/netconsole.cc
index 94758b3..83089d7 100644
--- a/aos/atom_code/starter/netconsole.cc
+++ b/aos/atom_code/starter/netconsole.cc
@@ -97,9 +97,9 @@
 int NetconsoleMain(int argc, char **argv) {
   logging::Init();
 
-  int output;
+  int input, output;
   if (argc > 1) {
-    output = open(argv[1], O_APPEND | O_CREAT | O_WRONLY | O_TRUNC, 0644);
+    output = open(argv[1], O_APPEND | O_CREAT | O_WRONLY | O_TRUNC, 0666);
     if (output == -1) {
       if (errno == EACCES || errno == ELOOP || errno == ENOSPC ||
           errno == ENOTDIR || errno == EROFS || errno == ETXTBSY) {
@@ -111,13 +111,15 @@
           errno, strerror(errno));
     }
     fprintf(stderr, "Writing output to '%s'.\n", argv[1]);
+    input = -1;
+    fprintf(stderr, "Not taking any input.\n");
   } else {
     output = STDOUT_FILENO;
     fprintf(stderr, "Writing output to stdout.\n");
+    input = STDIN_FILENO;
+    fprintf(stderr, "Reading stdin.\n");
   }
 
-  const int input = STDIN_FILENO;
-
   int on = 1;
 
   int from_crio = socket(AF_INET, SOCK_DGRAM, 0);
@@ -149,26 +151,35 @@
         from_crio, &address.addr, sizeof(address), errno, strerror(errno));
   }
 
-  int to_crio = socket(AF_INET, SOCK_DGRAM, 0);
-  if (to_crio == -1) {
-    LOG(FATAL, "socket(AF_INET, SOCK_DGRAM, 0) failed with %d: %s\n",
-        errno, strerror(errno));
-  }
-  if (setsockopt(to_crio, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
-    LOG(FATAL, "SOL_SOCKET::SO_REUSEADDR=%d(%d) failed with %d: %s\n",
-      on, to_crio, errno, strerror(errno));
-  }
-  address.in.sin_port = htons(6668);
-  if (inet_aton(
+  pthread_t input_thread, output_thread;
+
+  if (input != -1) {
+    int to_crio = socket(AF_INET, SOCK_DGRAM, 0);
+    if (to_crio == -1) {
+      LOG(FATAL, "socket(AF_INET, SOCK_DGRAM, 0) failed with %d: %s\n",
+          errno, strerror(errno));
+    }
+    if (setsockopt(to_crio, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) {
+      LOG(FATAL, "SOL_SOCKET::SO_REUSEADDR=%d(%d) failed with %d: %s\n",
+          on, to_crio, errno, strerror(errno));
+    }
+    address.in.sin_port = htons(6668);
+    if (inet_aton(
+            configuration::GetIPAddress(configuration::NetworkDevice::kCRIO),
+            &address.in.sin_addr) == 0) {
+      LOG(FATAL, "inet_aton(%s, %p) failed with %d: %s\n",
           configuration::GetIPAddress(configuration::NetworkDevice::kCRIO),
-          &address.in.sin_addr) == 0) {
-    LOG(FATAL, "inet_aton(%s, %p) failed with %d: %s\n",
-        configuration::GetIPAddress(configuration::NetworkDevice::kCRIO),
-        &address.in.sin_addr, errno, strerror(errno));
-  }
-  if (connect(to_crio, &address.addr, sizeof(address)) == -1) {
-    LOG(FATAL, "connect(%d, %p, %zu) failed with %d: %s\n",
-        to_crio, &address.addr, sizeof(address), errno, strerror(errno));
+          &address.in.sin_addr, errno, strerror(errno));
+    }
+    if (connect(to_crio, &address.addr, sizeof(address)) == -1) {
+      LOG(FATAL, "connect(%d, %p, %zu) failed with %d: %s\n",
+          to_crio, &address.addr, sizeof(address), errno, strerror(errno));
+    }
+    FDsToCopy input_fds{input, to_crio, NULL};
+    if (pthread_create(&input_thread, NULL, FDCopyThread, &input_fds) == -1) {
+      LOG(FATAL, "pthread_create(%p, NULL, %p, %p) failed with %d: %s\n",
+          &input_thread, FDCopyThread, &input_fds, errno, strerror(errno));
+    }
   }
 
   fprintf(stderr, "Using cRIO IP %s.\n",
@@ -182,21 +193,14 @@
         &address.in.sin_addr, errno, strerror(errno));
   }
   FDsToCopy output_fds{from_crio, output, &address.in};
-  pthread_t output_thread;
   if (pthread_create(&output_thread, NULL, FDCopyThread, &output_fds) == -1) {
     LOG(FATAL, "pthread_create(%p, NULL, %p, %p) failed with %d: %s\n",
         &output_thread, FDCopyThread, &output_fds, errno, strerror(errno));
   }
-  FDsToCopy input_fds{input, to_crio, NULL};
-  pthread_t input_thread;
-  if (pthread_create(&input_thread, NULL, FDCopyThread, &input_fds) == -1) {
-    LOG(FATAL, "pthread_create(%p, NULL, %p, %p) failed with %d: %s\n",
-        &input_thread, FDCopyThread, &input_fds, errno, strerror(errno));
-  }
 
   // input_thread will finish when stdin gets an EOF
-  if (pthread_join(input_thread, NULL) == -1) {
-    LOG(FATAL, "pthread_join(input_thread, NULL) failed with %d: %s\n",
+  if (pthread_join((input == -1) ? output_thread : input_thread, NULL) == -1) {
+    LOG(FATAL, "pthread_join(a_thread, NULL) failed with %d: %s\n",
         errno, strerror(errno));
   }
   exit(EXIT_SUCCESS);