[Pkg-privacy-commits] [onioncat] 201/241: manpage updated, Makefile changed to create 'gcat' symlink
Intrigeri
intrigeri at moszumanska.debian.org
Wed Aug 26 16:17:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
intrigeri pushed a commit to branch upstream-master
in repository onioncat.
commit 5e1ddba0455f32de49b75ae7cd2f48a02eec3d1e
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date: Sun Nov 15 20:02:31 2009 +0000
manpage updated, Makefile changed to create 'gcat' symlink
git-svn-id: https://www.cypherpunk.at/svn/onioncat/branches/garlicat@529 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
Makefile.in | 1 +
configure | 34 +++++++++++++++++++++++-----------
configure.ac | 1 +
man/Makefile.in | 1 +
man/ocat.1 | 37 +++++++++++++++++++++++++++----------
src/Makefile.am | 4 ++++
src/Makefile.in | 20 ++++++++++++++------
src/cygwin/Makefile.in | 1 +
src/ocat.c | 8 ++++----
src/ocatsetup.c | 11 +++++------
10 files changed, 81 insertions(+), 37 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0fb1db4..bc7aaf9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,6 +108,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
diff --git a/configure b/configure
index c2ed1c9..75ce879 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.r528.
+# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r529.
#
# 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.r528'
-PACKAGE_STRING='onioncat 0.2.0.r528'
+PACKAGE_VERSION='0.2.0.r529'
+PACKAGE_STRING='onioncat 0.2.0.r529'
PACKAGE_BUGREPORT='rahra at cypherpunk.at'
ac_subst_vars='SHELL
@@ -674,6 +674,7 @@ AMDEPBACKSLASH
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
+LN_S
build
build_cpu
build_vendor
@@ -1259,7 +1260,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.r528 to adapt to many kinds of systems.
+\`configure' configures onioncat 0.2.0.r529 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1329,7 +1330,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of onioncat 0.2.0.r528:";;
+ short | recursive ) echo "Configuration of onioncat 0.2.0.r529:";;
esac
cat <<\_ACEOF
@@ -1421,7 +1422,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-onioncat configure 0.2.0.r528
+onioncat configure 0.2.0.r529
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1435,7 +1436,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.r528, which was
+It was created by onioncat $as_me 0.2.0.r529, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2084,7 +2085,7 @@ fi
# Define the identity of the package.
PACKAGE='onioncat'
- VERSION='0.2.0.r528'
+ VERSION='0.2.0.r529'
cat >>confdefs.h <<_ACEOF
@@ -2235,7 +2236,7 @@ ac_config_headers="$ac_config_headers config.h"
cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "528"
+#define SVN_REVISION "529"
_ACEOF
@@ -3404,6 +3405,17 @@ fi
#AC_PROG_INSTALL
+{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
{ { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -5208,7 +5220,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.r528, which was
+This file was extended by onioncat $as_me 0.2.0.r529, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5261,7 +5273,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.r528
+onioncat config.status 0.2.0.r529
configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 57017a8..b948125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,6 +19,7 @@ AC_ARG_ENABLE([rtt], AS_HELP_STRING([--enable-rtt],[enable inband RTT measuremen
# Checks for programs.
AC_PROG_CC
#AC_PROG_INSTALL
+AC_PROG_LN_S
ACX_PTHREAD
# Checks for libraries.
diff --git a/man/Makefile.in b/man/Makefile.in
index 08b9e59..3e61695 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -78,6 +78,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
diff --git a/man/ocat.1 b/man/ocat.1
index 4118dad..2866223 100644
--- a/man/ocat.1
+++ b/man/ocat.1
@@ -14,9 +14,11 @@
.\" You should have received a copy of the GNU General Public License
.\" along with OnionCat. If not, see <http://www.gnu.org/licenses/>.
.\"
-.TH OCAT 1 2008-12-07 "ocat" "OnionCat User's Manual"
+.TH OCAT 1 2009-11-15 "ocat" "OnionCat User's Manual"
.SH NAME
ocat \- OnionCat creates a transparent IPv6 layer on top of Tor's hidden services.
+.br
+gcat \- GarliCat is like OnionCat but it works with I2P instead of Tor.
.SH SYNOPSIS
.B ocat
-i \fIonion_id (1st form)\fP
@@ -30,29 +32,38 @@ ocat \- OnionCat creates a transparent IPv6 layer on top of Tor's hidden service
.B ocat
-R [\fIOPTION\fP]\fI (4th form)\fP
.br
+.B gcat
+[\fIOPTION\fP] \fIi2p_id (5th form)\fP
+.br
.SH DESCRIPTION
-OnionCat creates a transparent IPv6 layer on top of Tor's hidden services. It
-transmits any kind of IP-based data transparently through the Tor network on a
-location hidden basis. You can think of it as a point-to-multipoint VPN
-between hidden services.
+OnionCat creates a transparent IPv6 layer on top of Tor's hidden services or
+I2P's tunnels. It transmits any kind of IP-based data transparently through the
+Tor/I2P network on a location hidden basis. You can think of it as a
+peer-to-peer VPN between hidden services.
OnionCat is a stand-alone application which runs in userland and is a connector
-between Tor and the local OS. Any protocol which is based on IP can be
+between Tor/I2P and the local OS. Any protocol which is based on IP can be
transmitted. Of course, UDP and TCP (and probably ICMP) are the most important
ones but all other protocols can also be forwarded through it.
OnionCat opens a TUN device and assigns an IPv6 address to it. All packets
forwarded to the TUN device by the kernel are forwarded by OnionCat to other
-OnionCats listening on Tor's hidden service ports. The IPv6 address depends on
-the \fIonion_id\fP of the locally configured hidden service (see \fBtor(8)\fP).
-Depending on the configuration of Tor the \fIonion_id\fP usually can be found
-at \fI/var/lib/tor/hidden_service/hostname\fP or similar location.
+OnionCats listening on Tor's hidden service ports or I2P's server tunnels. The
+IPv6 address depends on the \fIonion_id\fP or the i2p_id, respectively. The
+\fIonion_id\fP is the hostname of the locally configured hidden service (see
+\fBtor(8)\fP). Depending on the configuration of Tor the \fIonion_id\fP usually
+can be found at \fI/var/lib/tor/hidden_service/hostname\fP or similar location.
+The \fIi2p_id\fP is the 80 bit long Base32 encoded hostname of the I2P server
+tunnel.
.SS OPTIONS
.TP
\fB\-4\fP
Enable IPv4 forwarding. See http://www.cypherpunk.at/onioncat/wiki/IPv4 for further
information on IPv4.
+.br
+Native IPv4 forwarding is deprecated. The recommended solution for IPv4
+forwarding is to build a IPv4-through-IPv6 tunnel through OnionCat.
.TP
\fB\-a\fP
OnionCat creates a log file at $HOME/.ocat/connect_log. All incomming connects are
@@ -87,6 +98,10 @@ Display short usage message and shows options.
\fB\-i\fP
Convert \fIonion_id\fP to IPv6 address and exit.
.TP
+\fB\-I\fP
+Run OnionCat in GarliCat mode. Using this option is identical to running OnionCat
+with the command name \fBgcat\fP.
+.TP
\fB\-l\fP \fI[ip:]port\fP
Bind Onioncat to specific \fIip \fP and/or \fIport\fP number for incoming
connections. This defaults to 127.0.0.1:8060. This option could be set
@@ -163,6 +178,8 @@ OnionCat project page http://www.cypherpunk.at/onioncat/
Tor project homepage http://www.torproject.org/
+I2P project homepage http://www.i2p2.de/
+
.SH COPYRIGHT
Copyright 2008-2009 Bernhard R. Fischer.
diff --git a/src/Makefile.am b/src/Makefile.am
index 653800c..0c9737b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,3 +2,7 @@ bin_PROGRAMS = ocat
ocat_SOURCES = ocat.c ocatlog.c ocatroute.c ocatthread.c ocattun.c ocatv6conv.c ocatcompat.c ocatpeer.c ocatsetup.c ocatipv4route.c ocateth.c ocatsocks.c ocatlibe.c ocatctrl.c ocatipv6route.c ocaticmp.c ocat_wintuntap.c ocat_netdesc.c
include_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c
+install-exec-hook:
+ $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \
+ $(DESTDIR)$(bindir)/gcat$(EXEEXT)
+
diff --git a/src/Makefile.in b/src/Makefile.in
index 20f46fd..4e91f5b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
@@ -416,6 +417,8 @@ info-am:
install-data-am: install-includeHEADERS
install-exec-am: install-binPROGRAMS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-info: install-info-am
@@ -448,13 +451,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
distclean-generic distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binPROGRAMS \
install-data install-data-am install-exec install-exec-am \
- install-includeHEADERS install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-includeHEADERS uninstall-info-am
+ install-exec-hook install-includeHEADERS install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \
+ uninstall-info-am
+
+install-exec-hook:
+ $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \
+ $(DESTDIR)$(bindir)/gcat$(EXEEXT)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/src/cygwin/Makefile.in b/src/cygwin/Makefile.in
index 42ca137..a741444 100644
--- a/src/cygwin/Makefile.in
+++ b/src/cygwin/Makefile.in
@@ -87,6 +87,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
diff --git a/src/ocat.c b/src/ocat.c
index a1ac413..46c09db 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -240,9 +240,6 @@ int main(int argc, char *argv[])
init_setup();
- if (argc < 2)
- usage(argv[0]), exit(1);
-
while ((c = getopt(argc, argv, "abBCd:f:hrRiIopl:t:T:s:u:4L:P:")) != -1)
switch (c)
{
@@ -352,6 +349,10 @@ int main(int argc, char *argv[])
snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port));
post_init_setup();
+ // usage output must be after mode detection (Tor/I2P)
+ if (argc < 2)
+ usage(argv[0]), exit(1);
+
if (!CNF(rand_addr) && !argv[optind])
usage(argv[0]), exit(1);
@@ -412,7 +413,6 @@ int main(int argc, char *argv[])
}
log_msg(LOG_INFO, "%s", CNF(version));
- log_msg(LOG_INFO, "OC is running in %s mode", CNF(net_type) == NTYPE_I2P ? "GarliCat (I2P)" : "OnionCat (Tor)");
#if 0
if (CNF(config_file))
diff --git a/src/ocatsetup.c b/src/ocatsetup.c
index c1a6a9e..9bd74b2 100644
--- a/src/ocatsetup.c
+++ b/src/ocatsetup.c
@@ -130,12 +130,6 @@ void init_setup(void)
//setup_.logf = stderr;
setup_.uptime = time(NULL);
-
-#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
}
@@ -166,6 +160,11 @@ void post_init_setup(void)
#ifdef HAVE_SIN_LEN
ctrl_listen6_.sin6_len = sizeof(ctrl_listen6_);
#endif
+
+ snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s (%s mode)", PACKAGE_STRING, OCAT_AUTHOR, setup_.net_type == NTYPE_TOR ? "OnionCat" : setup_.net_type == NTYPE_I2P ? "GarliCat" : "unknown");
+#ifdef DEBUG
+ snprintf(&setup_.version[strlen(setup_.version)], VERSION_STRING_LEN - strlen(setup_.version), " -- compiled %s %s", __DATE__, __TIME__);
+#endif
}
--
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