[Pkg-privacy-commits] [onioncat] 222/340: inet_ntop error message fixed

[Ximin Luo]

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

infinity0 pushed a commit to branch debian
in repository onioncat.

commit 7884e0802b3c110bca4fdce559b2eea1b1248f2c
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Fri Jan 7 08:20:01 2011 +0000

    inet_ntop error message fixed
    
    git-svn-id: http://www.cypherpunk.at/svn/onioncat/trunk@551 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 configure       | 22 +++++++++++-----------
 man/ocat.1      |  7 ++++---
 src/ocatsocks.c |  4 +++-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index 9317dee..243e415 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.2.r550.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r551.
 #
 # 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.2.r550'
-PACKAGE_STRING='onioncat 0.2.2.r550'
+PACKAGE_VERSION='0.2.2.r551'
+PACKAGE_STRING='onioncat 0.2.2.r551'
 PACKAGE_BUGREPORT='rahra at cypherpunk.at'
 
 ac_subst_vars='SHELL
@@ -1262,7 +1262,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.2.r550 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.2.r551 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1332,7 +1332,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.2.2.r550:";;
+     short | recursive ) echo "Configuration of onioncat 0.2.2.r551:";;
    esac
   cat <<\_ACEOF
 
@@ -1425,7 +1425,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.2.2.r550
+onioncat configure 0.2.2.r551
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1439,7 +1439,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.2.r550, which was
+It was created by onioncat $as_me 0.2.2.r551, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2088,7 +2088,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.2.r550'
+ VERSION='0.2.2.r551'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2239,7 +2239,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "550"
+#define SVN_REVISION "551"
 _ACEOF
 
 
@@ -5947,7 +5947,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.2.r550, which was
+This file was extended by onioncat $as_me 0.2.2.r551, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6000,7 +6000,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.2.r550
+onioncat config.status 0.2.2.r551
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/man/ocat.1 b/man/ocat.1
index 2866223..0a11105 100644
--- a/man/ocat.1
+++ b/man/ocat.1
@@ -169,9 +169,9 @@ This man page is still not finished...
 $HOME/.ocat/connect_log
 
 .SH AUTHOR
-Concepts, software, and man page written by Bernhard R. Fischer.
-Package maintenance and additional support by Ferdinand Haselbacher,
-Daniel Haslinger, and Wim Gaethofs.
+Concepts, software, and man page written by Bernhard R. Fischer
+<bf at abenteuerland.at>. Package maintenance and additional support by Ferdinand
+Haselbacher, Daniel Haslinger <creo-ocat at blackmesa.at>, and Wim Gaethofs.
 
 .SH "SEE ALSO"
 OnionCat project page http://www.cypherpunk.at/onioncat/
@@ -196,3 +196,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with OnionCat. If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/src/ocatsocks.c b/src/ocatsocks.c
index 1ff0fc9..448064f 100644
--- a/src/ocatsocks.c
+++ b/src/ocatsocks.c
@@ -32,7 +32,8 @@
 // SOCKS connector queue vars
 static SocksQueue_t *socks_queue_ = NULL;
 
-#define SOCKS_BUFLEN (sizeof(SocksHdr_t) + NDESC(name_size) + strlen(CNF(usrname)) + 2)
+#define SOCKS_MIN_BUFLEN (sizeof(SocksHdr_t) + NDESC(name_size) + strlen(CNF(usrname)) + 2)
+#define SOCKS_BUFLEN (SOCKS_MIN_BUFLEN < INET6_ADDRSTRLEN ? INET6_ADDRSTRLEN : SOCKS_MIN_BUFLEN)
 
 
 int socks_send_request(const SocksQueue_t *sq)
@@ -58,6 +59,7 @@ int socks_send_request(const SocksQueue_t *sq)
       strlcat(onion, NDESC(domain), sizeof(onion));
    }
 
+   log_debug("SOCKS_BUFLEN = %d, NI_MAXHOST = %d", SOCKS_BUFLEN, NI_MAXHOST);
    if (inet_ntop(AF_INET6, &sq->addr, buf, sizeof(buf)) == NULL)
    {
       log_msg(LOG_WARNING, "inet_ntop failed: \"%s\"", strerror(errno));

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