Changeset 511

Timestamp:

08/27/09 10:59:29 (3 years ago)

Author:

eagle

Message:

version string improved

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure (modified) (10 diffs)
• configure.ac (modified) (1 diff)
• src/ocat.c (modified) (1 diff)
• src/ocatsetup.c (modified) (1 diff)
• src/ocattun.c (modified) (1 diff)

trunk/ChangeLog

@@ -1 +1 @@
 * version 0.2.0
+ - version string improved
  - syslog messages contain name and PID
  - fixed some compiler warnings

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

trunk/configure.ac

@@ -1 +1 @@
 
 AC_PREREQ(2.62)
-define([svnversion], esyscmd([sh -c "svnversion | tr -d 'M\n'"]))dnl
+define([svnversion], esyscmd([sh -c "echo -n $(( `svnversion | tr -d 'M'` + 1 ))"]))dnl
 AC_INIT([onioncat],[[0.2.0.r]svnversion],[rahra@cypherpunk.at])
 AM_INIT_AUTOMAKE([-Wall -Werror])

trunk/src/ocat.c

@@ -386 +386 @@
    }
 
-   log_msg(LOG_INFO | LOG_FERR, "%s (c) %s -- compiled %s %s", OCAT_AUTHOR, PACKAGE_STRING, __DATE__, __TIME__);
+   log_msg(LOG_INFO, "%s", CNF(version));
 
 #if 0

trunk/src/ocatsetup.c

@@ -131 +131 @@
 #endif
 
+#ifdef DEBUG
    snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s -- compiled %s %s", PACKAGE_STRING, OCAT_AUTHOR, __DATE__, __TIME__);
+#else
+   snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s", PACKAGE_STRING, OCAT_AUTHOR);
+#endif
 
    ctrl_listen_.sin_family = AF_INET;

trunk/src/ocattun.c

@@ -35 +35 @@
 int tun_alloc(char *dev, int dev_s, struct in6_addr addr)
 {
+#ifdef __linux__
    struct ifreq ifr;
+#endif
    int fd;
    char astr[INET6_ADDRSTRLEN];