Changeset 513

Timestamp:

09/17/09 14:55:32 (3 years ago)

Author:

eagle

Message:

OC should now detach properly from console

Location:

trunk

Files:

• configure (modified) (10 diffs)
• src/ocat.c (modified) (3 diffs)

trunk/configure

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

trunk/src/ocat.c

@@ -126 +126 @@
       case 0:
          log_msg(LOG_INFO, "process backgrounded by parent %d, new pid = %d", ppid, getpid());
+         (void) umask(0);
+         if (setsid() == -1)
+            log_msg(LOG_ERR, "could not set process group ID: \"%s\"", strerror(errno));
+         if (chdir("/") == -1)
+            log_msg(LOG_ERR, "could not change directory to /: \"%s\"", strerror(errno));
+         // redirect standard files to /dev/null
+         if (!freopen( "/dev/null", "r", stdin))
+            log_msg(LOG_ERR, "could not reconnect stdin to /dev/null: \"%s\"", strerror(errno));
+         if (!freopen( "/dev/null", "w", stdout))
+            log_msg(LOG_ERR, "could not reconnect stdout to /dev/null: \"%s\"", strerror(errno));
+         if (!freopen( "/dev/null", "w", stderr))
+            log_msg(LOG_ERR, "could not reconnect stderr to /dev/null: \"%s\"", strerror(errno));
          return;
 
@@ -224 +236 @@
    struct passwd *pwd, pwdm;
    int urlconv = 0;
-   int nullfd;
 
    snprintf(def, 100, "127.0.0.1:%d", OCAT_LISTEN_PORT);
@@ -467 +478 @@
       open_connect_log(pwd->pw_dir);
 
-   // reconnect stdio if logfile ok and daemonized
-   if (CNF(daemon))
-   {
-      if ((nullfd = open("/dev/null", O_RDWR)) != -1)
-      {
-         oe_close(0);
-         dup(nullfd);
-         oe_close(1);
-         dup(nullfd);
-         oe_close(2);
-         dup(nullfd);
-      }
-      else
-         log_msg(LOG_ERR, "could not reconnect stdio to /dev/null: \"%s\"", strerror(errno));
-   }
-
    // create socks connector thread and communication queue
    if (pipe(CNF(socksfd)) == -1)