Changeset 514


Ignore:
Timestamp:
09/17/09 19:55:06 (3 years ago)
Author:
eagle
Message:

syslog behavior slightly modified

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/configure

    r513 r514  
    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.r513. 
     3# Generated by GNU Autoconf 2.62 for onioncat 0.2.0.r514. 
    44# 
    55# Report bugs to <rahra@cypherpunk.at>. 
    … …  
    597597PACKAGE_NAME='onioncat' 
    598598PACKAGE_TARNAME='onioncat' 
    599 PACKAGE_VERSION='0.2.0.r513' 
    600 PACKAGE_STRING='onioncat 0.2.0.r513' 
     599PACKAGE_VERSION='0.2.0.r514' 
     600PACKAGE_STRING='onioncat 0.2.0.r514' 
    601601PACKAGE_BUGREPORT='rahra@cypherpunk.at' 
    602602 
    … …  
    12601260  # This message is too long to be a string in the A/UX 3.1 sh. 
    12611261  cat <<_ACEOF 
    1262 \`configure' configures onioncat 0.2.0.r513 to adapt to many kinds of systems. 
     1262\`configure' configures onioncat 0.2.0.r514 to adapt to many kinds of systems. 
    12631263 
    12641264Usage: $0 [OPTION]... [VAR=VALUE]... 
    … …  
    13301330if test -n "$ac_init_help"; then 
    13311331  case $ac_init_help in 
    1332      short | recursive ) echo "Configuration of onioncat 0.2.0.r513:";; 
     1332     short | recursive ) echo "Configuration of onioncat 0.2.0.r514:";; 
    13331333   esac 
    13341334  cat <<\_ACEOF 
    … …  
    14221422if $ac_init_version; then 
    14231423  cat <<\_ACEOF 
    1424 onioncat configure 0.2.0.r513 
     1424onioncat configure 0.2.0.r514 
    14251425generated by GNU Autoconf 2.62 
    14261426 
    … …  
    14361436running configure, to aid debugging if configure makes a mistake. 
    14371437 
    1438 It was created by onioncat $as_me 0.2.0.r513, which was 
     1438It was created by onioncat $as_me 0.2.0.r514, which was 
    14391439generated by GNU Autoconf 2.62.  Invocation command line was 
    14401440 
    … …  
    20852085# Define the identity of the package. 
    20862086 PACKAGE='onioncat' 
    2087  VERSION='0.2.0.r513' 
     2087 VERSION='0.2.0.r514' 
    20882088 
    20892089 
    … …  
    22362236 
    22372237cat >>confdefs.h <<\_ACEOF 
    2238 #define SVN_REVISION "513" 
     2238#define SVN_REVISION "514" 
    22392239_ACEOF 
    22402240 
    … …  
    52095209# values after options handling. 
    52105210ac_log=" 
    5211 This file was extended by onioncat $as_me 0.2.0.r513, which was 
     5211This file was extended by onioncat $as_me 0.2.0.r514, which was 
    52125212generated by GNU Autoconf 2.62.  Invocation command line was 
    52135213 
    … …  
    52625262cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 
    52635263ac_cs_version="\\ 
    5264 onioncat config.status 0.2.0.r513 
     5264onioncat config.status 0.2.0.r514 
    52655265configured by $0, generated by GNU Autoconf 2.62, 
    52665266  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" 

  • trunk/man/ocat.1

    r509 r514  
    6565.TP 
    6666\fB\-B\fP 
    67 Run OnionCat in foreground. 
     67Run OnionCat in foreground. OnionCat will log to stderr by default. 
    6868.TP 
    6969\fB\-C\fP 
    … …  
    9595\fB\-L\fP \fIlog_file\fP 
    9696Log output to \fIlog_file\fP. If option is omitted, OnionCat logs to syslog if 
    97 running in background or to stderr if running in foreground. 
     97running in background or to stderr if running in foreground. If syslogging is 
     98desired while running in foreground, specify the special file name "syslog" as 
     99log file. 
    98100.TP 
    99101\fB\-o\fP \fIIPv6 address\fP 
    … …  
    105107.TP 
    106108\fB\-P\fP \fI[pid file]\fP 
    107 Create \fIpid file\fP at \fIpid_file\fP. If the parameter is omitted OC will 
    108 create a pid file at \fB/var/run/ocat.pid\fP. If this option is set without 
    109 parameter it MUST NOT be the last option in the list of options. 
     109Create \fIpid file\fP at \fIpid_file\fP. If the option parameter is omitted OC 
     110will create a pid file at \fB/var/run/ocat.pid\fP. In the latter case it MUST 
     111NOT be the last option in the list of options. 
    110112.TP 
    111113\fB\-r\fP 

  • trunk/src/ocat.c

    r513 r514  
    281281 
    282282         case 'L': 
    283             CNF(logfn) = optarg; 
     283            if (!strcmp(optarg, "syslog")) 
     284               CNF(use_syslog) = 1; 
     285            else 
     286               CNF(logfn) = optarg; 
    284287            break; 
    285288 
    … …  
    345348 
    346349   // log to stderr if in foreground 
    347    if (!CNF(daemon)) 
     350   if (!CNF(daemon) && !CNF(use_syslog)) 
    348351      CNF(logf) = stderr; 
    349352  

  • trunk/src/ocat.h

    r507 r514  
    280280   char *logfn; 
    281281   FILE *logf; 
     282   int use_syslog; 
    282283   int daemon; 
    283284   //! hardcoded permanent peers 

  • trunk/src/ocatsetup.c

    r511 r514  
    6464   0,                                      // create_pid_file 
    6565   NULL, NULL,                             // logfile 
     66   0,                                      // use_syslog 
    6667#ifdef __CYGWIN__ 
    6768   0, 
Note: See TracChangeset for help on using the changeset viewer.