[Pkg-privacy-commits] [onioncat] 127/241: OnionCat daemonizes by default now
Intrigeri
intrigeri at moszumanska.debian.org
Wed Aug 26 16:16:49 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 865b15450fd8d0ea7a3a389f96f2c8791b0ae916
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date: Thu Feb 19 13:19:18 2009 +0000
OnionCat daemonizes by default now
git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@439 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
ChangeLog | 1 +
configure | 22 +++++++++++-----------
src/ocat.c | 13 ++++++++++---
src/ocatsetup.c | 2 +-
4 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fe40805..103ddcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
* version 0.1.10
+ - OnionCat daemonizes by default now
- fragment buffer resynchronization enhanced
- disabled connect log if unprivileged user -2 is used
- getpwnam() replaced by getpwnam_r() because valgrind reported an error
diff --git a/configure b/configure
index efb1b87..227646d 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.61 for onioncat 0.1.10-434M.
+# Generated by GNU Autoconf 2.61 for onioncat 0.1.10-438M.
#
# Report bugs to <rahra at cypherpunk.at>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='onioncat'
PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.1.10-434M'
-PACKAGE_STRING='onioncat 0.1.10-434M'
+PACKAGE_VERSION='0.1.10-438M'
+PACKAGE_STRING='onioncat 0.1.10-438M'
PACKAGE_BUGREPORT='rahra at cypherpunk.at'
# Factoring default headers for most tests.
@@ -1206,7 +1206,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.1.10-434M to adapt to many kinds of systems.
+\`configure' configures onioncat 0.1.10-438M to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1272,7 +1272,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of onioncat 0.1.10-434M:";;
+ short | recursive ) echo "Configuration of onioncat 0.1.10-438M:";;
esac
cat <<\_ACEOF
@@ -1362,7 +1362,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-onioncat configure 0.1.10-434M
+onioncat configure 0.1.10-438M
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1376,7 +1376,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.1.10-434M, which was
+It was created by onioncat $as_me 0.1.10-438M, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2066,7 +2066,7 @@ fi
# Define the identity of the package.
PACKAGE='onioncat'
- VERSION='0.1.10-434M'
+ VERSION='0.1.10-438M'
cat >>confdefs.h <<_ACEOF
@@ -2217,7 +2217,7 @@ ac_config_headers="$ac_config_headers config.h"
cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "434M"
+#define SVN_REVISION "438M"
_ACEOF
@@ -5300,7 +5300,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.1.10-434M, which was
+This file was extended by onioncat $as_me 0.1.10-438M, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5353,7 +5353,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-onioncat config.status 0.1.10-434M
+onioncat config.status 0.1.10-438M
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/src/ocat.c b/src/ocat.c
index ac827da..70944e7 100644
--- a/src/ocat.c
+++ b/src/ocat.c
@@ -25,7 +25,8 @@ void usage(const char *s)
"%s\n"
"usage: %s [OPTIONS] <onion_hostname>\n"
" -a create connect log at \"$HOME/%s/%s\" (default = %d)\n"
- " -b daemonize\n"
+ " -b daemonize (default = %d)\n"
+ " -B do not daemonize (default = %d)\n"
" -h display usage message\n"
" -C disable local controller interface\n"
" -d <n> set debug level to n, default = %d\n"
@@ -47,7 +48,9 @@ void usage(const char *s)
" -4 enable IPv4 support (default = %d)\n"
, CNF(version), s,
// option defaults start here
- OCAT_DIR, OCAT_CONNECT_LOG, CNF(create_clog), CNF(debug_level), OCAT_LISTEN_PORT,
+ OCAT_DIR, OCAT_CONNECT_LOG, CNF(create_clog),
+ CNF(daemon), CNF(daemon) ^ 1,
+ CNF(debug_level), OCAT_LISTEN_PORT,
CNF(pid_file),
CNF(ocat_dest_port), ntohs(CNF(socks_dst)->sin_port),
#ifndef WITHOUT_TUN
@@ -204,7 +207,7 @@ int main(int argc, char *argv[])
if (argc < 2)
usage(argv[0]), exit(1);
- while ((c = getopt(argc, argv, "abCd:f:hrRiopl:t:T:s:u:4L:P:")) != -1)
+ while ((c = getopt(argc, argv, "abBCd:f:hrRiopl:t:T:s:u:4L:P:")) != -1)
switch (c)
{
case 'a':
@@ -215,6 +218,10 @@ int main(int argc, char *argv[])
CNF(daemon) = 1;
break;
+ case 'B':
+ CNF(daemon) = 0;
+ break;
+
case 'C':
CNF(controller) = 0;
break;
diff --git a/src/ocatsetup.c b/src/ocatsetup.c
index 4530030..41e6f82 100644
--- a/src/ocatsetup.c
+++ b/src/ocatsetup.c
@@ -54,7 +54,7 @@ struct OcatSetup setup_ =
{0x00, 0x00, 0x6c, 0x00, 0x00, 0x00}, // ocat_hwaddr (OnionCat MAC address)
PID_FILE,
NULL, NULL, // logfile
- 0, // daemon
+ 1, // daemon
{
/*
{{{0xfd, 0x87, 0xd8, 0x7e, 0xeb, 0x43,
--
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