Changeset 529


Ignore:
Timestamp:
11/15/09 21:02:31 (3 years ago)
Author:
eagle
Message:

manpage updated, Makefile changed to create 'gcat' symlink

Location:
branches/garlicat
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/garlicat/Makefile.in

    r508 r529  
    109109LIBOBJS = @LIBOBJS@ 
    110110LIBS = @LIBS@ 
     111LN_S = @LN_S@ 
    111112LTLIBOBJS = @LTLIBOBJS@ 
    112113MAKEINFO = @MAKEINFO@ 

  • branches/garlicat/configure

    r528 r529  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r528. 
     3# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r529. 
    44# 
    55# Report bugs to <rahra@cypherpunk.at>. 
    … …  
    597597PACKAGE_NAME='onioncat' 
    598598PACKAGE_TARNAME='onioncat' 
    599 PACKAGE_VERSION='0.2.0.r528' 
    600 PACKAGE_STRING='onioncat 0.2.0.r528' 
     599PACKAGE_VERSION='0.2.0.r529' 
     600PACKAGE_STRING='onioncat 0.2.0.r529' 
    601601PACKAGE_BUGREPORT='rahra@cypherpunk.at' 
    602602 
    … …  
    675675am__fastdepCC_TRUE 
    676676am__fastdepCC_FALSE 
     677LN_S 
    677678build 
    678679build_cpu 
    … …  
    12601261  # This message is too long to be a string in the A/UX 3.1 sh. 
    12611262  cat <<_ACEOF 
    1262 \`configure' configures onioncat 0.2.0.r528 to adapt to many kinds of systems. 
     1263\`configure' configures onioncat 0.2.0.r529 to adapt to many kinds of systems. 
    12631264 
    12641265Usage: $0 [OPTION]... [VAR=VALUE]... 
    … …  
    13301331if test -n "$ac_init_help"; then 
    13311332  case $ac_init_help in 
    1332      short | recursive ) echo "Configuration of onioncat 0.2.0.r528:";; 
     1333     short | recursive ) echo "Configuration of onioncat 0.2.0.r529:";; 
    13331334   esac 
    13341335  cat <<\_ACEOF 
    … …  
    14221423if $ac_init_version; then 
    14231424  cat <<\_ACEOF 
    1424 onioncat configure 0.2.0.r528 
     1425onioncat configure 0.2.0.r529 
    14251426generated by GNU Autoconf 2.62 
    14261427 
    … …  
    14361437running configure, to aid debugging if configure makes a mistake. 
    14371438 
    1438 It was created by onioncat $as_me 0.2.0.r528, which was 
     1439It was created by onioncat $as_me 0.2.0.r529, which was 
    14391440generated by GNU Autoconf 2.62.  Invocation command line was 
    14401441 
    … …  
    20852086# Define the identity of the package. 
    20862087 PACKAGE='onioncat' 
    2087  VERSION='0.2.0.r528' 
     2088 VERSION='0.2.0.r529' 
    20882089 
    20892090 
    … …  
    22362237 
    22372238cat >>confdefs.h <<\_ACEOF 
    2238 #define SVN_REVISION "528" 
     2239#define SVN_REVISION "529" 
    22392240_ACEOF 
    22402241 
    … …  
    34053406 
    34063407#AC_PROG_INSTALL 
     3408{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 
     3409$as_echo_n "checking whether ln -s works... " >&6; } 
     3410LN_S=$as_ln_s 
     3411if test "$LN_S" = "ln -s"; then 
     3412  { $as_echo "$as_me:$LINENO: result: yes" >&5 
     3413$as_echo "yes" >&6; } 
     3414else 
     3415  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 
     3416$as_echo "no, using $LN_S" >&6; } 
     3417fi 
     3418 
    34073419# Make sure we can run config.sub. 
    34083420$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 
    … …  
    52095221# values after options handling. 
    52105222ac_log=" 
    5211 This file was extended by onioncat $as_me 0.2.0.r528, which was 
     5223This file was extended by onioncat $as_me 0.2.0.r529, which was 
    52125224generated by GNU Autoconf 2.62.  Invocation command line was 
    52135225 
    … …  
    52625274cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    52635275ac_cs_version="\\ 
    5264 onioncat config.status 0.2.0.r528 
     5276onioncat config.status 0.2.0.r529 
    52655277configured by $0, generated by GNU Autoconf 2.62, 
    52665278  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 

  • branches/garlicat/configure.ac

    r511 r529  
    2020AC_PROG_CC 
    2121#AC_PROG_INSTALL 
     22AC_PROG_LN_S 
    2223ACX_PTHREAD 
    2324 

  • branches/garlicat/man/Makefile.in

    r508 r529  
    7979LIBOBJS = @LIBOBJS@ 
    8080LIBS = @LIBS@ 
     81LN_S = @LN_S@ 
    8182LTLIBOBJS = @LTLIBOBJS@ 
    8283MAKEINFO = @MAKEINFO@ 

  • branches/garlicat/man/ocat.1

    r514 r529  
    1515.\" along with OnionCat. If not, see <http://www.gnu.org/licenses/>. 
    1616.\" 
    17 .TH OCAT 1 2008-12-07 "ocat" "OnionCat User's Manual" 
     17.TH OCAT 1 2009-11-15 "ocat" "OnionCat User's Manual" 
    1818.SH NAME 
    1919ocat \- OnionCat creates a transparent IPv6 layer on top of Tor's hidden services. 
     20.br 
     21gcat \- GarliCat is like OnionCat but it works with I2P instead of Tor. 
    2022.SH SYNOPSIS 
    2123.B ocat 
    … …  
    3133-R [\fIOPTION\fP]\fI                      (4th form)\fP 
    3234.br 
     35.B gcat 
     36[\fIOPTION\fP] \fIi2p_id                  (5th form)\fP 
     37.br 
    3338.SH DESCRIPTION 
    34 OnionCat creates a transparent IPv6 layer on top of Tor's hidden services. It 
    35 transmits any kind of IP-based data transparently through the Tor network on a 
    36 location hidden basis. You can think of it as a point-to-multipoint VPN 
    37 between hidden services. 
     39OnionCat creates a transparent IPv6 layer on top of Tor's hidden services or 
     40I2P's tunnels. It transmits any kind of IP-based data transparently through the 
     41Tor/I2P network on a location hidden basis. You can think of it as a 
     42peer-to-peer VPN between hidden services. 
    3843 
    3944OnionCat is a stand-alone application which runs in userland and is a connector 
    40 between Tor and the local OS. Any protocol which is based on IP can be 
     45between Tor/I2P and the local OS. Any protocol which is based on IP can be 
    4146transmitted. Of course, UDP and TCP (and probably ICMP) are the most important 
    4247ones but all other protocols can also be forwarded through it. 
    … …  
    4449OnionCat opens a TUN device and assigns an IPv6 address to it. All packets 
    4550forwarded to the TUN device by the kernel are forwarded by OnionCat to other 
    46 OnionCats listening on Tor's hidden service ports.  The IPv6 address depends on 
    47 the \fIonion_id\fP of the locally configured hidden service (see \fBtor(8)\fP). 
    48 Depending on the configuration of Tor the \fIonion_id\fP usually can be found 
    49 at \fI/var/lib/tor/hidden_service/hostname\fP or similar location. 
     51OnionCats listening on Tor's hidden service ports or I2P's server tunnels. The 
     52IPv6 address depends on the \fIonion_id\fP or the i2p_id, respectively. The 
     53\fIonion_id\fP is the hostname of the locally configured hidden service (see 
     54\fBtor(8)\fP). Depending on the configuration of Tor the \fIonion_id\fP usually 
     55can be found at \fI/var/lib/tor/hidden_service/hostname\fP or similar location. 
     56The \fIi2p_id\fP is the 80 bit long Base32 encoded hostname of the I2P server 
     57tunnel. 
    5058 
    5159.SS OPTIONS 
    … …  
    5462Enable IPv4 forwarding. See http://www.cypherpunk.at/onioncat/wiki/IPv4 for further 
    5563information on IPv4. 
     64.br 
     65Native IPv4 forwarding is deprecated. The recommended solution for IPv4 
     66forwarding is to build a IPv4-through-IPv6 tunnel through OnionCat. 
    5667.TP 
    5768\fB\-a\fP 
    … …  
    8798\fB\-i\fP 
    8899Convert \fIonion_id\fP to IPv6 address and exit. 
     100.TP 
     101\fB\-I\fP 
     102Run OnionCat in GarliCat mode. Using this option is identical to running OnionCat 
     103with the command name \fBgcat\fP. 
    89104.TP 
    90105\fB\-l\fP \fI[ip:]port\fP 
    … …  
    164179Tor project homepage http://www.torproject.org/ 
    165180 
     181I2P project homepage http://www.i2p2.de/ 
     182 
    166183.SH COPYRIGHT 
    167184Copyright 2008-2009 Bernhard R. Fischer. 

  • branches/garlicat/src/Makefile.am

    r525 r529  
    33include_HEADERS = ocat.h ocat_netdesc.h strlcpy.c strlcat.c 
    44 
     5install-exec-hook: 
     6        $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \ 
     7        $(DESTDIR)$(bindir)/gcat$(EXEEXT) 
     8 

  • branches/garlicat/src/Makefile.in

    r525 r529  
    108108LIBOBJS = @LIBOBJS@ 
    109109LIBS = @LIBS@ 
     110LN_S = @LN_S@ 
    110111LTLIBOBJS = @LTLIBOBJS@ 
    111112MAKEINFO = @MAKEINFO@ 
    … …  
    417418 
    418419install-exec-am: install-binPROGRAMS 
     420        @$(NORMAL_INSTALL) 
     421        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook 
    419422 
    420423install-info: install-info-am 
    … …  
    449452        html-am info info-am install install-am install-binPROGRAMS \ 
    450453        install-data install-data-am install-exec install-exec-am \ 
    451         install-includeHEADERS install-info install-info-am \ 
    452         install-man install-strip installcheck installcheck-am \ 
    453         installdirs maintainer-clean maintainer-clean-generic \ 
    454         mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ 
    455         ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ 
    456         uninstall-includeHEADERS uninstall-info-am 
    457  
     454        install-exec-hook install-includeHEADERS install-info \ 
     455        install-info-am install-man install-strip installcheck \ 
     456        installcheck-am installdirs maintainer-clean \ 
     457        maintainer-clean-generic mostlyclean mostlyclean-compile \ 
     458        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ 
     459        uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \ 
     460        uninstall-info-am 
     461 
     462 
     463install-exec-hook: 
     464        $(LN_S) -f $(DESTDIR)$(bindir)/ocat$(EXEEXT) \ 
     465        $(DESTDIR)$(bindir)/gcat$(EXEEXT) 
    458466# Tell versions [3.59,3.63) of GNU make to not export all variables. 
    459467# Otherwise a system limit (for SysV at least) may be exceeded. 

  • branches/garlicat/src/cygwin/Makefile.in

    r508 r529  
    8888LIBOBJS = @LIBOBJS@ 
    8989LIBS = @LIBS@ 
     90LN_S = @LN_S@ 
    9091LTLIBOBJS = @LTLIBOBJS@ 
    9192MAKEINFO = @MAKEINFO@ 

  • branches/garlicat/src/ocat.c

    r528 r529  
    241241   init_setup(); 
    242242 
    243    if (argc < 2) 
    244       usage(argv[0]), exit(1); 
    245  
    246243   while ((c = getopt(argc, argv, "abBCd:f:hrRiIopl:t:T:s:u:4L:P:")) != -1) 
    247244      switch (c) 
    … …  
    352349   snprintf(def, 100, "127.0.0.1:%d", NDESC(listen_port)); 
    353350   post_init_setup(); 
     351 
     352   // usage output must be after mode detection (Tor/I2P) 
     353   if (argc < 2) 
     354      usage(argv[0]), exit(1); 
    354355 
    355356   if (!CNF(rand_addr) && !argv[optind]) 
    … …  
    413414 
    414415   log_msg(LOG_INFO, "%s", CNF(version)); 
    415    log_msg(LOG_INFO, "OC is running in %s mode", CNF(net_type) == NTYPE_I2P ? "GarliCat (I2P)" : "OnionCat (Tor)"); 
    416416 
    417417#if 0 

  • branches/garlicat/src/ocatsetup.c

    r528 r529  
    131131   //setup_.logf = stderr; 
    132132   setup_.uptime = time(NULL); 
    133  
    134 #ifdef DEBUG 
    135    snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s -- compiled %s %s", PACKAGE_STRING, OCAT_AUTHOR, __DATE__, __TIME__); 
    136 #else 
    137    snprintf(setup_.version, VERSION_STRING_LEN, "%s (c) %s", PACKAGE_STRING, OCAT_AUTHOR); 
    138 #endif 
    139133} 
    140134 
    … …  
    166160#ifdef HAVE_SIN_LEN 
    167161   ctrl_listen6_.sin6_len = sizeof(ctrl_listen6_); 
     162#endif 
     163 
     164   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"); 
     165#ifdef DEBUG 
     166   snprintf(&setup_.version[strlen(setup_.version)], VERSION_STRING_LEN - strlen(setup_.version), " -- compiled %s %s", __DATE__, __TIME__); 
    168167#endif 
    169168} 
Note: See TracChangeset for help on using the changeset viewer.