Changeset 510

Timestamp:

07/29/09 09:31:11 (3 years ago)

Author:

eagle

Message:

• base development environment changed to OpenBSD 4.5
• some type conversions fixed
• fd 0,1,2 now reconnected to /dev/null

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (10 diffs)
• src/ocat.c (modified) (1 diff)
• src/ocatctrl.c (modified) (5 diffs)
• src/ocateth.c (modified) (1 diff)

trunk/ChangeLog

@@ -4 +4 @@
  - updated hosts.onioncat
  - pid file creation optional
+ - base development environment changed to OpenBSD 4.5
+ - some type conversions fixed
+ - fd 0,1,2 now reconnected to /dev/null
 
 * version 0.1.13

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.r507.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r509.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.2.0.r507'
-PACKAGE_STRING='onioncat 0.2.0.r507'
+PACKAGE_VERSION='0.2.0.r509'
+PACKAGE_STRING='onioncat 0.2.0.r509'
 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.r507 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r509 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.r507:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.0.r509:";;
    esac
   cat <<\_ACEOF
@@ -1422 +1422 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.0.r507
+onioncat configure 0.2.0.r509
 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.r507, which was
+It was created by onioncat $as_me 0.2.0.r509, 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.r507'
+ VERSION='0.2.0.r509'
 
 
@@ -2236 +2236 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "507"
+#define SVN_REVISION "509"
 _ACEOF
 
@@ -5209 +5209 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.2.0.r507, which was
+This file was extended by onioncat $as_me 0.2.0.r509, 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.r507
+onioncat config.status 0.2.0.r509
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

trunk/src/ocat.c

@@ -468 +468 @@
 
    // reconnect stdio if logfile ok and daemonized
-   if (CNF(logf) && CNF(daemon))
+   if (CNF(daemon))
    {
       if ((nullfd = open("/dev/null", O_RDWR)) != -1)

trunk/src/ocatctrl.c

@@ -35 +35 @@
 void *ctrl_handler(void *p)
 {
-   int fd, c, i;
+   int fd, c;
    FILE *ff, *fo;
    char buf[FRAME_SIZE], addrstr[INET6_ADDRSTRLEN], onionstr[ONION_NAME_SIZE], timestr[32], *s, *tokbuf;
@@ -49 +49 @@
       log_msg(LOG_EMERG, "couldn't create pipe: \"%s\"", strerror(errno)), exit(1);
 
-   fd = (int) p;
+   fd = (long) p;
    if (CNF(config_read))
    {
@@ -148 +148 @@
                      inet_ntop(AF_INET6, &peer->addr, addrstr, INET6_ADDRSTRLEN),
                      peer->dir == PEER_INCOMING ? "IN" : "OUT", peer->dir,
-                     time(NULL) - peer->time, peer->in, peer->out, peer->sdelay, timestr,
+                     (long) (time(NULL) - peer->time), peer->in, peer->out, (long) peer->sdelay, timestr,
                      peer->perm ? "PERMANENT" : "TEMPORARY", peer->perm
                      );
@@ -244 +244 @@
       else if (!strcmp(buf, "queue"))
       {
-         print_socks_queue((FILE*) pfd[1]);
+         print_socks_queue((FILE*) (long) pfd[1]);
          for (;;)
          {
@@ -308 +308 @@
 int run_ctrl_handler(int fd)
 {
-   return (int) run_ocat_thread("ctrl_handler", ctrl_handler, (void*) fd);
+   return (int) run_ocat_thread("ctrl_handler", ctrl_handler, (void*) (long) fd);
 }
 

trunk/src/ocateth.c

@@ -501 +501 @@
 
    pthread_mutex_lock(&ether_ntoa_mutex_);
-   strlcpy(buf, ether_ntoa(addr), 18);
+   strlcpy(buf, ether_ntoa((struct ether_addr*) addr), 18);
    pthread_mutex_unlock(&ether_ntoa_mutex_);
    return buf;