[Pkg-privacy-commits] [onioncat] 189/340: - base development environment changed to OpenBSD 4.5 - some type conversions fixed - fd 0, 1, 2 now reconnected to /dev/null

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 13:04:38 UTC 2015 

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository onioncat.

commit 5e663ae7c7507a8627724e30d563b554640467f6
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Wed Jul 29 07:31:11 2009 +0000

     - base development environment changed to OpenBSD 4.5
     - some type conversions fixed
     - fd 0,1,2 now reconnected to /dev/null
    
    
    
    git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@510 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 ChangeLog      |  3 +++
 configure      | 22 +++++++++++-----------
 src/ocat.c     |  2 +-
 src/ocatctrl.c | 10 +++++-----
 src/ocateth.c  |  2 +-
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8565e5..fe211fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
  - fixed some compiler warnings
  - 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
  - released 2009/06/09, Bernhard R. Fischer
diff --git a/configure b/configure
index 0d101df..37d9770 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /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 at cypherpunk.at>.
 #
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 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 at cypherpunk.at'
 
 ac_subst_vars='SHELL
@@ -1259,7 +1259,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # 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]...
 
@@ -1329,7 +1329,7 @@ fi
 
 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
 
@@ -1421,7 +1421,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 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
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1435,7 +1435,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 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
 
   $ $0 $@
@@ -2084,7 +2084,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.0.r507'
+ VERSION='0.2.0.r509'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2235,7 +2235,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "507"
+#define SVN_REVISION "509"
 _ACEOF
 
 
@@ -5208,7 +5208,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # 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
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5261,7 +5261,7 @@ Report bugs to <bug-autoconf at gnu.org>."
 _ACEOF
 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'`\\"
 
diff --git a/src/ocat.c b/src/ocat.c
index b3f972f..a8c8c85 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
       open_connect_log(pwd->pw_dir);
 
    // reconnect stdio if logfile ok and daemonized
-   if (CNF(logf) && CNF(daemon))
+   if (CNF(daemon))
    {
       if ((nullfd = open("/dev/null", O_RDWR)) != -1)
       {
diff --git a/src/ocatctrl.c b/src/ocatctrl.c
index 74cc759..c83e088 100644
--- a/src/ocatctrl.c
+++ b/src/ocatctrl.c
@@ -34,7 +34,7 @@
  */
 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;
    int rlen, cfd;
@@ -48,7 +48,7 @@ void *ctrl_handler(void *p)
    if (pipe(pfd) == -1)
       log_msg(LOG_EMERG, "couldn't create pipe: \"%s\"", strerror(errno)), exit(1);
 
-   fd = (int) p;
+   fd = (long) p;
    if (CNF(config_read))
    {
       if (!(ff = fdopen(fd, "r+")))
@@ -147,7 +147,7 @@ void *ctrl_handler(void *p)
                      IN6_IS_ADDR_UNSPECIFIED(&peer->addr) ? "--unidentified--" : ipv6tonion(&peer->addr, onionstr), peer->tcpfd,
                      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
                      );
             }
@@ -243,7 +243,7 @@ void *ctrl_handler(void *p)
       }
       else if (!strcmp(buf, "queue"))
       {
-         print_socks_queue((FILE*) pfd[1]);
+         print_socks_queue((FILE*) (long) pfd[1]);
          for (;;)
          {
             read(pfd[0], buf, 1);
@@ -307,7 +307,7 @@ void *ctrl_handler(void *p)
 
 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);
 }
 
 
diff --git a/src/ocateth.c b/src/ocateth.c
index ed6f8dd..8198ec3 100644
--- a/src/ocateth.c
+++ b/src/ocateth.c
@@ -500,7 +500,7 @@ char *ether_ntoa_r(const struct ether_addr *addr, char *buf)
       return NULL;
 
    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;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git

More information about the Pkg-privacy-commits mailing list