Changeset 551

Timestamp:

01/07/11 09:20:01 (17 months ago)

Author:

eagle

Message:

inet_ntop error message fixed

Location:

trunk

Files:

• configure (modified) (10 diffs)
• man/ocat.1 (modified) (2 diffs)
• src/ocatsocks.c (modified) (2 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.2.r550.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.2.r551.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 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@cypherpunk.at'
 
@@ -1263 +1263 @@
   # 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]...
@@ -1333 +1333 @@
 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
@@ -1426 +1426 @@
 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
 
@@ -1440 +1440 @@
 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
 
@@ -2089 +2089 @@
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.2.2.r550'
+ VERSION='0.2.2.r551'
 
 
@@ -2240 +2240 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "550"
+#define SVN_REVISION "551"
 _ACEOF
 
@@ -5948 +5948 @@
 # 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
 
@@ -6001 +6001 @@
 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'`\\"

trunk/man/ocat.1

@@ -170 +170 @@
 
 .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@abenteuerland.at>. Package maintenance and additional support by Ferdinand
+Haselbacher, Daniel Haslinger <creo-ocat@blackmesa.at>, and Wim Gaethofs.
 
 .SH "SEE ALSO"
@@ -197 +197 @@
 You should have received a copy of the GNU General Public License
 along with OnionCat. If not, see <http://www.gnu.org/licenses/>.
+

trunk/src/ocatsocks.c

@@ -33 +33 @@
 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)
 
 
@@ -59 +60 @@
    }
 
+   log_debug("SOCKS_BUFLEN = %d, NI_MAXHOST = %d", SOCKS_BUFLEN, NI_MAXHOST);
    if (inet_ntop(AF_INET6, &sq->addr, buf, sizeof(buf)) == NULL)
    {