Changeset 538 for trunk/src/ocatctrl.c

Timestamp:

01/24/10 19:55:24 (2 years ago)

Author:

eagle

Message:

• options are parsed sequentially (-f and -I first)
• config file is always read from SYSCONFDIR (usually /etc or /usr/local/etc)
• changed Makefile.am to not install header files

File:

• trunk/src/ocatctrl.c (modified) (8 diffs)

trunk/src/ocatctrl.c

@@ -38 +38 @@
    int fd, c;
    FILE *ff, *fo;
-   char buf[FRAME_SIZE], addrstr[INET6_ADDRSTRLEN], onionstr[NDESC(name_size)], timestr[32], *s, *tokbuf;
+   char buf[FRAME_SIZE], addrstr[INET6_ADDRSTRLEN], onionstr[NDESC(name_size)], timestr[32], *s, *tokbuf, *bufp;
    int rlen, cfd;
    struct tm *tm;
@@ -72 +72 @@
       }
       log_debug("fd %d fdopen'ed \"r\"", fd);
-      fo = CNF(logf);
+      fo = CNF(logf) ? CNF(logf) : stderr;
       //CNF(config_read) = 1;
    }
@@ -133 +133 @@
          continue;
 
-      if (!strtok_r(buf, " \t\r\n", &tokbuf))
+      if (!(bufp = strtok_r(buf, " \t\r\n", &tokbuf)))
          continue;
 
       // "exit"/"quit" => terminate thread
-      if (!strncmp(buf, "exit", 4) || !strncmp(buf, "quit", 4))
+      if (!strncmp(bufp, "exit", 4) || !strncmp(bufp, "quit", 4))
          break;
       // "status"
-      else if (!strcmp(buf, "status"))
+      else if (!strcmp(bufp, "status"))
       {
          lock_peers();
@@ -159 +159 @@
          unlock_peers();
       }
-      else if (!strcmp(buf, "close"))
-      {
-         cfd = atoi(&buf[6]);
+      else if (!strcmp(bufp, "close"))
+      {
+         cfd = atoi(bufp +6);
          lock_peers();
          for (peer = get_first_peer(); peer; peer = peer->next)
@@ -178 +178 @@
          unlock_peers();
       }
-      else if (!strcmp(buf, "threads"))
+      else if (!strcmp(bufp, "threads"))
       {
          print_threads(ff);
       }
-      else if (!strcmp(buf, "terminate"))
+      else if (!strcmp(bufp, "terminate"))
       {
          log_msg(LOG_INFO, "terminate request from control port");
          kill(getpid(), SIGINT);
       }
-      else if (!strcmp(buf, "route"))
+      else if (!strcmp(bufp, "route"))
       {
          if (rlen > 6)
          {
-            if ((c = parse_route(&buf[6])) == E_RT_SYNTAX)
-               if ((c = ipv6_parse_route(&buf[6])) > 0)
+            if ((c = parse_route(bufp + 6)) == E_RT_SYNTAX)
+               if ((c = ipv6_parse_route(bufp + 6)) > 0)
                   c = 0;
             switch (c)
@@ -224 +224 @@
          }
       }
-      else if (!strcmp(buf, "connect"))
+      else if (!strcmp(bufp, "connect"))
       {
          if ((s = strtok_r(NULL, " \t\r\n", &tokbuf)))
          {
             if ((strlen(s) != 16) || (oniontipv6(s, &in6) == -1))
-               fprintf(ff, "ERR \"%s\" not valid .onion-URL\n", &buf[8]);
+               fprintf(ff, "ERR \"%s\" not valid .onion-URL\n", bufp + 8);
             else
             {
@@ -243 +243 @@
             fprintf(ff, "ERR missing args\n");
       }
-      else if (!strcmp(buf, "macs"))
+      else if (!strcmp(bufp, "macs"))
       {
          print_mac_tbl(ff);
       }
-      else if (!strcmp(buf, "queue"))
+      else if (!strcmp(bufp, "queue"))
       {
          print_socks_queue((FILE*) (long) pfd[1]);
@@ -258 +258 @@
          }
       }
-      else if (!strcmp(buf, "setup"))
+      else if (!strcmp(bufp, "setup"))
       {
          print_setup_struct(ff);
       }
-      else if (!strcmp(buf, "version"))
+      else if (!strcmp(bufp, "version"))
       {
          fprintf(ff, "%s\n", CNF(version));
       }
-      else if (!strcmp(buf, "help") || !strcmp(buf, "?"))
+      else if (!strcmp(bufp, "help") || !strcmp(bufp, "?"))
       {
          fprintf(fo,