Changeset 507

Timestamp:

07/01/09 16:05:12 (3 years ago)

Author:

eagle

Message:

pid file is created optionally,
OC stays in foreground in Cygwin by default.

Location:

trunk

Files:

• AUTHORS (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• configure (modified) (10 diffs)
• src/ocat.c (modified) (6 diffs)
• src/ocat.h (modified) (1 diff)
• src/ocatctrl.c (modified) (1 diff)
• src/ocatsetup.c (modified) (2 diffs)

trunk/AUTHORS

@@ -4 +4 @@
   - Debian package
   - Ubuntu package
+* Basic conceptual ideas, Mac OSX Testing: Daniel Haslinger <creo _at_ cypherpunk.at>
 

trunk/ChangeLog

@@ -1 +1 @@
 * version 0.2.0
+ - syslog messages contain name and PID
 
 * version 0.1.13

trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for onioncat 0.2.0.r504.
+# Generated by GNU Autoconf 2.61 for onioncat 0.2.0.r506.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -575 +575 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.0.r504'
-PACKAGE_STRING='onioncat 0.2.0.r504'
+PACKAGE_VERSION='0.2.0.r506'
+PACKAGE_STRING='onioncat 0.2.0.r506'
 PACKAGE_BUGREPORT='rahra@cypherpunk.at'
 
@@ -1179 +1179 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onioncat 0.2.0.r504 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r506 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1249 +1249 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.2.0.r504:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.0.r506:";;
    esac
   cat <<\_ACEOF
@@ -1338 +1338 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.0.r504
+onioncat configure 0.2.0.r506
 generated by GNU Autoconf 2.61
 
@@ -1352 +1352 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onioncat $as_me 0.2.0.r504, which was
+It was created by onioncat $as_me 0.2.0.r506, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
@@ -2042 +2042 @@
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.0.r504'
+ VERSION='0.2.0.r506'
 
 
@@ -2193 +2193 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "504"
+#define SVN_REVISION "506"
 _ACEOF
 
@@ -4941 +4941 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.0.r504, which was
+This file was extended by onioncat $as_me 0.2.0.r506, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
@@ -4994 +4994 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-onioncat config.status 0.2.0.r504
+onioncat config.status 0.2.0.r506
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

trunk/src/ocat.c

@@ -89 +89 @@
 
 
-int mk_pid_file(void)
+int mk_pid_file(uid_t uid)
 {
    FILE *f;
@@ -102 +102 @@
    fclose(f);
    log_debug("pid_file %s created, pid = %d", CNF(pid_file), getpid());
+
+   if (chown(CNF(pid_file), uid, 0) == -1)
+      log_msg(LOG_ERR, "could not change owner of pid_file \"%s\" to %d: %s", CNF(pid_file), uid, strerror(errno));
 
    return 0;
@@ -208 +211 @@
 
    delete_listeners(CNF(oc_listen), CNF(oc_listen_fd), CNF(oc_listen_cnt));
+
+   if (CNF(create_pid_file) && (unlink(CNF(pid_file)) == -1))
+      log_msg(LOG_ERR, "could not remove pid file \"%s\": %s", CNF(pid_file), strerror(errno));
 }
 
@@ -275 +281 @@
 
          case 'P':
-            CNF(pid_file) = optarg;
+            CNF(create_pid_file) = 1;
+            if (optarg[0] == '-')
+               optind--;
+            else
+               CNF(pid_file) = optarg;
             break;
 
@@ -326 +336 @@
       CNF(logf) = stderr;
  
-   (void) open_logfile();
+   if ((open_logfile() == -1) && !CNF(logf))
+      openlog(PACKAGE_NAME, LOG_NDELAY | LOG_PID, LOG_DAEMON);
 
    // init main thread
@@ -439 +450 @@
 
    // create pid_file
-   mk_pid_file();
+   if (CNF(create_pid_file))
+      mk_pid_file(pwd->pw_uid);
 
    if (!runasroot && !getuid())

trunk/src/ocat.h

@@ -277 +277 @@
    uint8_t ocat_hwaddr[ETHER_ADDR_LEN];
    char *pid_file;
+   int create_pid_file;
    char *logfn;
    FILE *logf;

trunk/src/ocatctrl.c

@@ -161 +161 @@
             if (peer->tcpfd == cfd)
             {
-               log_msg(LOG_INFO | LOG_FCONN, "close request for %d", cfd);
                oe_close(cfd);
                delete_peer(peer);
+               log_msg(LOG_INFO | LOG_FCONN, "%d was successfully closed up on user request", cfd);
                break;
             }

trunk/src/ocatsetup.c

@@ -61 +61 @@
 #endif
    {0x00, 0x00, 0x6c, 0x00, 0x00, 0x00},   // ocat_hwaddr (OnionCat MAC address)
-   PID_FILE,
+   PID_FILE,                               // pid_file
+   0,                                      // create_pid_file
    NULL, NULL,                             // logfile
+#ifdef __CYGWIN__
+   0,
+#else
    1,                                      // daemon
+#endif
    {
       /*
@@ -232 +237 @@
          setup_.daemon,
          t / (3600 * 24), t / 3600 % 24, t / 60 % 60,
-         strlen(setup_.version), VERSION_STRING_LEN, setup_.version,
+         (int) strlen(setup_.version), VERSION_STRING_LEN, setup_.version,
          setup_.sizeof_setup,
          setup_.term_req