- tor-commits - lists.torproject.org

[obfsproxy/master] Tweak code.
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit b91353387ed9bbcf4f237aa4803bc54160f29fb3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Feb 13 18:26:44 2012 +0200 Tweak code. * Free the heartbeat periodic event on halt. * Turn status.c:connections to an unsigned int. * Delete connections_init() and inline its code in status_init(). It's already inlined in the rest of the code. * Wrap connections_clear() into descriptive macros. * Use 'day(s)', 'hour(s)', 'minute(s)', instead of 'days', 'hours', 'minutes'. * Write some documentation. * Heartbeat should log on 'notice'. --- src/main.c | 5 ++++- src/status.c | 46 ++++++++++++++++------------------------------ src/status.h | 3 +++ 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/main.c b/src/main.c index 607a153..0d690b7 100644 --- a/src/main.c +++ b/src/main.c @@ -271,10 +271,13 @@ obfsproxy_cleanup() evdns_base_free(get_evdns_base(), 0); event_free(sig_int); event_free(sig_term); + if (heartbeat) + event_free(heartbeat); + event_base_free(get_event_base()); cleanup_crypto(); - status_cleanup(); + status_connections_cleanup(); close_obfsproxy_logfile(); } diff --git a/src/status.c b/src/status.c index 80e1764..4fcb144 100644 --- a/src/status.c +++ b/src/status.c @@ -10,6 +10,7 @@ #include "util.h" +#include "status.h" #include "container.h" #include <string.h> @@ -20,22 +21,15 @@ #include <event2/listener.h> /** Count total connections. */ -static int connections = 0; +static unsigned int connections = 0; /** Count connections from unique addresses. */ static strmap_t *addresses = NULL; -/** Initialize counting connections from unique addresses. */ -static void -connections_init(void) -{ - if (!addresses) - addresses = strmap_new(); -} - -/** Clear connection counters. */ -static void -connections_clear(int reinit) +/** Clear connection counters. If <b>reinit</b> is false, don't + reinitialize the info-keeping structures. */ +void +status_connections_clear(int reinit) { connections = 0; if (!addresses) @@ -55,7 +49,7 @@ status_note_connection(const char *addrport) if ((p = strrchr(addr, ':'))) { *p = '\0'; } else { - log_debug("Error in address %s: port expected.", addrport); + log_warn("Error in address %s: port expected.", addrport); free(addr); return; } @@ -74,7 +68,7 @@ static time_t started = 0; static time_t last_reset_counters = 0; /** Reset status information this often. */ -#define RESET_COUNTERS 86400 +#define RESET_COUNTERS 86400 /* 86400 seconds == 24 hours */ /** Initialize status information to print out heartbeat messages. */ void @@ -83,16 +77,8 @@ status_init(void) time_t now = time(NULL); started = now; last_reset_counters = now; - connections_init(); -} - -/** Free all memory used by printing heartbeat logs. */ -void -status_cleanup(void) -{ - started = 0; - last_reset_counters = 0; - connections_clear(0); + if (!addresses) + addresses = strmap_new(); } /** Log information about our uptime and the number of connections we saw. @@ -106,18 +92,18 @@ status_log_heartbeat(void) int hours = (int)((secs - (days * 86400)) / 3600); int last_reset_hours = (int) (now - last_reset_counters) / 3600; int minutes = (int)((secs - (days * 86400) - (hours * 3600)) / 60); - log_info("Heartbeat: obfsproxy's uptime is %ld days, %d hours, and " - "%d minutes.", days, hours, minutes); + log_notice("Heartbeat: obfsproxy's uptime is %ld day(s), %d hour(s), and " + "%d minute(s).", days, hours, minutes); /* Also log connection stats, if we are keeping notes. */ if (strmap_size(addresses) > 0) - log_info("Heartbeat: During the last %d hours we saw %d connections " - "from %d unique addresses.", - last_reset_hours, connections, strmap_size(addresses)); + log_notice("Heartbeat: During the last %d hour(s) we saw %u connection(s) " + "from %d unique address(es).", + last_reset_hours, connections, strmap_size(addresses)); if (now - last_reset_counters >= RESET_COUNTERS) { log_info("Resetting connection counters."); - connections_clear(1); + status_connections_reinit(); last_reset_counters += RESET_COUNTERS; } } diff --git a/src/status.h b/src/status.h index 54dfb9c..e556a5b 100644 --- a/src/status.h +++ b/src/status.h @@ -11,3 +11,6 @@ void status_init(void); void status_cleanup(void); void status_note_connection(const char *addrport); void status_log_heartbeat(void); +void status_connections_clear(int reinit); +#define status_connections_cleanup() status_connections_clear(0) +#define status_connections_reinit() status_connections_clear(1)

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 13 Feb '12

13 Feb '12

commit 426a44dbc3ff35c14b3309f6a28d0ed75ee77767 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 13 16:15:17 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fr/vidalia.po b/fr/vidalia.po index b6b4cd6..608e3d9 100644 --- a/fr/vidalia.po +++ b/fr/vidalia.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-13 15:44+0000\n" +"PO-Revision-Date: 2012-02-13 16:14+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -166,19 +166,19 @@ msgstr "REMARQUE: ceci va éditer le fichier torrc actuellement actif" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "Le chemin ControlSocket n'existe pas." +msgstr "Le chemin du ControlSocket n'existe pas." msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." -msgstr "L'emplacement spécifié Tor fichier de configuration contient des caractères qui ne peuvent pas être représentés avec l'encodage de caractères sur 8 bits de votre système." +msgstr "L'emplacement du fichier de configuration de Tor défini contient des caractères qui ne peuvent pas être utilisés avec l'encodage de caractères sur 8 bits de votre système." msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "L'emplacement spécifié pour le répertoire des données de Tor contient des caractères qui ne peuvent pas être représentés avec l''encodage de caractères sur 8 bits de votre système." +msgstr "L'emplacement défini pour le répertoire des données de Tor contient des caractères qui ne peuvent pas être représentés avec l''encodage de caractères sur 8 bits de votre système." msgctxt "AdvancedPage" msgid "Warning" @@ -201,7 +201,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "Vidalia a été incapable de supprimer le service Tor. Vous pouvez avoir besoin de l'enlever manuellement." +msgstr "Vidalia a été incapable de supprimer le service Tor.\n\nVous pourriez avoir besoin de le supprimer manuellement." msgctxt "AppearancePage" msgid "Language" @@ -217,7 +217,7 @@ msgstr "Style" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" -msgstr "Choisissez le style de l'interface de Vidalia" +msgstr "Choisissez le style de l'interface pour Vidalia" msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." @@ -249,7 +249,7 @@ msgstr "Taux d'envoi" msgctxt "BandwidthGraph" msgid "Always on Top" -msgstr "Toujours sur le dessus" +msgstr "Toujours en avant-plan" msgctxt "BandwidthGraph" msgid "Style" @@ -257,7 +257,7 @@ msgstr "Style" msgctxt "BandwidthGraph" msgid "Changes the transparency of the Bandwidth Graph" -msgstr "Modifications de la transparence du graphique de la bande passante" +msgstr "Modifie la transparence du graphique de la bande passante" msgctxt "BandwidthGraph" msgid "100" @@ -281,7 +281,7 @@ msgstr "Graphique de la bande passante" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Démarrage de la demande de pont HTTPS ..." +msgstr "Démarrage de la demande du pont HTTPS ..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -289,7 +289,7 @@ msgstr "Connexion à %1:%2 ..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Envoi une demande de liste de ponts en HTTPS..." +msgstr "Envoi une demande de liste de ponts HTTPS..." msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." @@ -297,7 +297,7 @@ msgstr "Téléchargement d'une liste de ponts ..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "Téléchargement de la liste des ponts" +msgstr "Téléchargement des ponts" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1"

1 0

[obfsproxy/master] Merge branch 'heartbeat_rebased_again'
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 41ce34e2109ac22a92ce2975a932b6f0f83c1efe Merge: 786a854 3e61d45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 10:53:03 2012 -0500 Merge branch 'heartbeat_rebased_again' Makefile.am | 2 + src/main.c | 24 +++++++++++ src/network.c | 3 + src/status.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/status.h | 13 ++++++ 5 files changed, 161 insertions(+), 0 deletions(-)

1 0

[obfsproxy/master] Add heartbeat message with total connections and unique IP counters.
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 3e61d45c607f2e420c28d94b2a42e082441b3bbd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Feb 11 13:17:04 2012 +0100 Add heartbeat message with total connections and unique IP counters. --- Makefile.am | 2 + src/main.c | 24 +++++++++++ src/network.c | 3 + src/status.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/status.h | 13 ++++++ 5 files changed, 161 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 963c725..533629b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ libobfsproxy_a_SOURCES = \ src/network.c \ src/protocol.c \ src/socks.c \ + src/status.c \ src/util.c \ src/protocols/dummy.c \ src/protocols/obfs2.c @@ -48,6 +49,7 @@ noinst_HEADERS = \ src/protocol.h \ src/sha256.h \ src/socks.h \ + src/status.h \ src/util.h \ src/protocols/dummy.h \ src/protocols/obfs2.h \ diff --git a/src/main.c b/src/main.c index 1d7132d..607a153 100644 --- a/src/main.c +++ b/src/main.c @@ -22,6 +22,8 @@ #include "managed.h" #include "external.h" +#include "status.h" + #include <errno.h> #include <signal.h> #include <stdio.h> @@ -32,6 +34,7 @@ static struct event_base *the_event_base; static struct event *sig_int; static struct event *sig_term; +static struct event *heartbeat; /* Pluggable transport proxy mode. ('External' or 'Managed') */ static int is_external_proxy=1; @@ -193,6 +196,16 @@ handle_obfsproxy_args(const char *const *argv) return i; } +/** Libevent callback: Log heartbeat message once every hour. */ +static void +heartbeat_cb(evutil_socket_t fd, short what, void *arg) +{ + (void) fd; + (void) what; + (void) arg; + status_log_heartbeat(); +} + /** Initialize basic components of obfsproxy. */ @@ -233,6 +246,16 @@ obfsproxy_init() if (event_add(sig_int,NULL) || event_add(sig_term,NULL)) { log_error("Failed to initialize signal handling."); } + + /* Initialize hourly heartbeat messages. */ + struct timeval one_hour; + one_hour.tv_sec = 3600; + one_hour.tv_usec = 0; + status_init(); + heartbeat = event_new(the_event_base, -1, EV_PERSIST, heartbeat_cb, NULL); + if (event_add(heartbeat, &one_hour)) { + log_error("Failed to initialize heartbeat logs."); + } } /** @@ -251,6 +274,7 @@ obfsproxy_cleanup() event_base_free(get_event_base()); cleanup_crypto(); + status_cleanup(); close_obfsproxy_logfile(); } diff --git a/src/network.c b/src/network.c index a7c1fa6..0a6852e 100644 --- a/src/network.c +++ b/src/network.c @@ -75,6 +75,8 @@ #include "socks.h" #include "protocol.h" +#include "status.h" + #include <errno.h> #include <event2/buffer.h> @@ -549,6 +551,7 @@ open_outbound(conn_t *conn, bufferevent_data_cb readcb) success: log_info("%s (%s): Successful outbound connection to '%s'.", safe_str(conn->peername), conn->cfg->vtable->name, safe_str(peername)); + status_note_connection(conn->peername); bufferevent_enable(buf, EV_READ|EV_WRITE); newconn->peername = peername; obfs_assert(connections); diff --git a/src/status.c b/src/status.c new file mode 100644 index 0000000..40cd968 --- /dev/null +++ b/src/status.c @@ -0,0 +1,119 @@ +/* Copyright 2012 The Tor Project + See LICENSE for other credits and copying information +*/ + +/** + * \file status.c + * \headerfile status.h + * \brief Keeps status information and logs heartbeat messages. + **/ + +#include "util.h" + +#include "container.h" + +#include <string.h> +#include <stdio.h> +#include <time.h> + +#include <event2/event.h> +#include <event2/listener.h> + +/** Count total connections. */ +static int connections = 0; + +/** Count connections from unique addresses. */ +static strmap_t *addresses = NULL; + +/** Initialize counting connections from unique addresses. */ +static void +connections_init(void) +{ + if (!addresses) + addresses = strmap_new(); +} + +/** Clear connection counters. */ +static void +connections_clear(int reinit) +{ + connections = 0; + if (!addresses) + return; + strmap_free(addresses, NULL); /* NULL, because no need to free values. */ + addresses = NULL; + if (reinit) + addresses = strmap_new(); +} + +/** Note that we saw a new connection. */ +void +status_note_connection(const char *addrport) +{ + char *addr = xstrdup(addrport), *p; + + if ((p = strrchr(addr, ':'))) { + *p = '\0'; + } else { + log_debug("Error in address %s: port expected.", addrport); + free(addr); + return; + } + + if (!addresses) + addresses = strmap_new(); + strmap_set_lc(addresses, addr, (void*)(1)); + free(addr); + connections++; +} + +/** Time when we started. */ +static time_t started = 0; + +/** Time when we last reset connection and address counters. */ +static time_t last_reset_counters = 0; + +/** Reset status information this often. */ +#define RESET_COUNTERS 86400 + +/** Initialize status information to print out heartbeat messages. */ +void +status_init(void) +{ + time_t now = time(NULL); + started = now; + last_reset_counters = now; + connections_init(); +} + +/** Free all memory used by printing heartbeat logs. */ +void +status_cleanup(void) +{ + started = 0; + last_reset_counters = 0; + connections_clear(0); +} + +/** Log information about our uptime and the number of connections we saw. + */ +void +status_log_heartbeat(void) +{ + time_t now = time(NULL); + long secs = now - started; + long days = secs / 86400; + int hours = (int)((secs - (days * 86400)) / 3600); + int last_reset_hours = (int) (now - last_reset_counters) / 3600; + int minutes = (int)((secs - (days * 86400) - (hours * 3600)) / 60); + log_info("Heartbeat: obfsproxy's uptime is %ld days, %d hours, and " + "%d minutes. During the last %d hours we saw %d connections " + "from %d unique addresses.", + days, hours, minutes, last_reset_hours, + connections, strmap_size(addresses)); + if (now - last_reset_counters >= RESET_COUNTERS) { + log_info("Resetting connection counters."); + connections_clear(1); + last_reset_counters += RESET_COUNTERS; + } +} diff --git a/src/status.h b/src/status.h new file mode 100644 index 0000000..54dfb9c --- /dev/null +++ b/src/status.h @@ -0,0 +1,13 @@ +/* Copyright 2012 The Tor Project + See LICENSE for other credits and copying information +*/ + +/** + * \file status.h + * \brief Headers for status.c. + **/ + +void status_init(void); +void status_cleanup(void); +void status_note_connection(const char *addrport); +void status_log_heartbeat(void);

1 0

[obfsproxy/master] log heartbeat messages at notice
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 433c89c37119686ed40774e34d5bd8ac524935fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 11:04:35 2012 -0500 log heartbeat messages at notice --- src/status.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/status.c b/src/status.c index 40cd968..60be008 100644 --- a/src/status.c +++ b/src/status.c @@ -106,7 +106,7 @@ status_log_heartbeat(void) int hours = (int)((secs - (days * 86400)) / 3600); int last_reset_hours = (int) (now - last_reset_counters) / 3600; int minutes = (int)((secs - (days * 86400) - (hours * 3600)) / 60); - log_info("Heartbeat: obfsproxy's uptime is %ld days, %d hours, and " + log_notice("Heartbeat: obfsproxy's uptime is %ld days, %d hours, and " "%d minutes. During the last %d hours we saw %d connections " "from %d unique addresses.", days, hours, minutes, last_reset_hours,

1 0

[tor/master] bump to 0.2.3.12-alpha-dev
by arma＠torproject.org 13 Feb '12

13 Feb '12

commit 184a4552930d4f1363c10471e98a5ab819e94c83 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Feb 13 10:53:49 2012 -0500 bump to 0.2.3.12-alpha-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index e6d8a8b..b39d156 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.12-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.12-alpha-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index e154e30..73e79f0 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.12-alpha" +!define VERSION "0.2.3.12-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f4f763d..52883cc 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,7 +233,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.12-alpha" +#define VERSION "0.2.3.12-alpha-dev"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 13 Feb '12

13 Feb '12

commit 033d72609f103b4ec0c7a0201343024c40240eed Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 13 15:45:21 2012 +0000 Update translations for vidalia_alpha --- fr/vidalia.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/vidalia.po b/fr/vidalia.po index fe490bf..b6b4cd6 100644 --- a/fr/vidalia.po +++ b/fr/vidalia.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-05-03 14:28+0000\n" -"PO-Revision-Date: 2012-02-13 12:18+0000\n" -"Last-Translator: Sylvie SEGUI <seguisylvie(a)yahoo.fr>\n" +"PO-Revision-Date: 2012-02-13 15:44+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,7 +50,7 @@ msgstr "Vous avez sélectionné une authentification par 'Mot de passe', mais vo msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "Sélectionnez Fichier de configuration de Tor" +msgstr "Sélectionnez le Fichier de configuration de Tor" msgctxt "AdvancedPage" msgid "File Not Found" @@ -118,7 +118,7 @@ msgstr "Fichier de configuration de Tor" msgctxt "AdvancedPage" msgid "Start the Tor software with the specified configuration file (torrc)" -msgstr "Démarrez le logiciel Tor avec le fichier de configuration spécifié (torrc)" +msgstr "Démarrez le logiciel Tor avec le fichier de configuration défini (torrc)" msgctxt "AdvancedPage" msgid "Select path to your configuration file"

1 0

[obfsproxy/master] Say in the usage string that notice is the default logging severity.
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 044168b0feedf2c2b1531e78080f672bbf3d5329 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Feb 12 10:21:09 2012 +0100 Say in the usage string that notice is the default logging severity. --- src/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/main.c b/src/main.c index e7671c8..6540ab0 100644 --- a/src/main.c +++ b/src/main.c @@ -52,7 +52,7 @@ usage(void) fprintf(stderr, "\n* obfsproxy_args:\n" "--log-file=<file> ~ set logfile\n" "--log-min-severity=warn|notice|info|debug ~ " - "set minimum logging severity\n" + "set minimum logging severity (default: notice)\n" "--no-log ~ disable logging\n"); exit(1);

1 0

[obfsproxy/master] Merge remote-tracking branch 'karsten/noticelogs'
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 786a8549c556f962c5c1dd4f54ef90e1cfc23d21 Merge: fc7008f 044168b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 13 10:48:20 2012 -0500 Merge remote-tracking branch 'karsten/noticelogs' Conflicts: src/main.c doc/HACKING | 4 ++-- src/main.c | 12 +++++++----- src/util.c | 32 ++++++++++++++++++++++++-------- src/util.h | 12 +++++++++--- 4 files changed, 42 insertions(+), 18 deletions(-) diff --cc src/main.c index 31878f9,6540ab0..1d7132d --- a/src/main.c +++ b/src/main.c @@@ -53,9 -51,9 +53,10 @@@ usage(void fprintf(stderr,"[%s] ", supported_protocols[i]->name); fprintf(stderr, "\n* obfsproxy_args:\n" "--log-file=<file> ~ set logfile\n" - "--log-min-severity=warn|info|debug ~ set minimum logging severity\n" + "--log-min-severity=warn|notice|info|debug ~ " + "set minimum logging severity (default: notice)\n" - "--no-log ~ disable logging\n"); + "--no-log ~ disable logging\n" + "--no-safe-logging ~ disable safe (scrubbed address) logging\n"); exit(1); }

1 0

[obfsproxy/master] Add a notice log level and make it the default.
by nickm＠torproject.org 13 Feb '12

13 Feb '12

commit 0d201bff6df2eeffb8aab25db6b9ec487d51181c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Feb 12 10:03:17 2012 +0100 Add a notice log level and make it the default. --- doc/HACKING | 4 ++-- src/main.c | 12 +++++++----- src/util.c | 32 ++++++++++++++++++++++++-------- src/util.h | 12 +++++++++--- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index c9197fb..b1134bf 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -37,8 +37,8 @@ obfsproxy currently provides the following functions for protocols according to your protocol. Note that (*handshake) and (*destroy) are optional. -For all your logging needs you can use the functions log_{warn,info,debug} -defined in src/util.h. +For all your logging needs you can use the functions +log_{warn,notice,info,debug} defined in src/util.h. [1]: For example: 'your_protocol --additional-parameter=yes server 127.0.0.1:666' diff --git a/src/main.c b/src/main.c index 7ebdd51..e7671c8 100644 --- a/src/main.c +++ b/src/main.c @@ -51,7 +51,8 @@ usage(void) fprintf(stderr,"[%s] ", supported_protocols[i]->name); fprintf(stderr, "\n* obfsproxy_args:\n" "--log-file=<file> ~ set logfile\n" - "--log-min-severity=warn|info|debug ~ set minimum logging severity\n" + "--log-min-severity=warn|notice|info|debug ~ " + "set minimum logging severity\n" "--no-log ~ disable logging\n"); exit(1); @@ -78,16 +79,16 @@ handle_signal_cb(evutil_socket_t fd, short what, void *arg) case SIGINT: close_all_listeners(); if (!got_sigint) { - log_info("Got SIGINT. Preparing shutdown."); + log_notice("Got SIGINT. Preparing shutdown."); start_shutdown(0); got_sigint++; } else { - log_info("Got SIGINT for the second time. Terminating."); + log_notice("Got SIGINT for the second time. Terminating."); start_shutdown(1); } break; case SIGTERM: - log_info("Got SIGTERM. Terminating."); + log_notice("Got SIGTERM. Terminating."); start_shutdown(1); break; } @@ -236,7 +237,7 @@ void obfsproxy_cleanup() { /* We have landed. */ - log_info("Exiting."); + log_notice("Exiting."); close_all_listeners(); evdns_base_free(get_evdns_base(), 0); @@ -257,6 +258,7 @@ obfs_main(int argc, const char *const *argv) /* Handle optional obfsproxy arguments. */ begin = argv + handle_obfsproxy_args(argv); + log_notice("Starting."); if (is_external_proxy) { if (launch_external_proxy(begin) < 0) diff --git a/src/util.c b/src/util.c index f2089df..ee1766b 100644 --- a/src/util.c +++ b/src/util.c @@ -352,15 +352,16 @@ ascii_strlower(char *s) /** Logging severities */ -#define LOG_SEV_ERR 4 -#define LOG_SEV_WARN 3 +#define LOG_SEV_ERR 5 +#define LOG_SEV_WARN 4 +#define LOG_SEV_NOTICE 3 #define LOG_SEV_INFO 2 #define LOG_SEV_DEBUG 1 /* logging method */ static int logging_method=LOG_METHOD_STDERR; /* minimum logging severity */ -static int logging_min_sev=LOG_SEV_INFO; +static int logging_min_sev=LOG_SEV_NOTICE; /* logfile fd */ static int logging_logfile=-1; @@ -371,6 +372,7 @@ sev_to_string(int severity) switch (severity) { case LOG_SEV_ERR: return "error"; case LOG_SEV_WARN: return "warn"; + case LOG_SEV_NOTICE: return "notice"; case LOG_SEV_INFO: return "info"; case LOG_SEV_DEBUG: return "debug"; default: @@ -385,8 +387,10 @@ string_to_sev(const char *string) { if (!strcasecmp(string, "error")) return LOG_SEV_ERR; - if (!strcasecmp(string, "warn")) + else if (!strcasecmp(string, "warn")) return LOG_SEV_WARN; + else if (!strcasecmp(string, "notice")) + return LOG_SEV_NOTICE; else if (!strcasecmp(string, "info")) return LOG_SEV_INFO; else if (!strcasecmp(string, "debug")) @@ -402,9 +406,10 @@ string_to_sev(const char *string) static int sev_is_valid(int severity) { - return (severity == LOG_SEV_ERR || - severity == LOG_SEV_WARN || - severity == LOG_SEV_INFO || + return (severity == LOG_SEV_ERR || + severity == LOG_SEV_WARN || + severity == LOG_SEV_NOTICE || + severity == LOG_SEV_INFO || severity == LOG_SEV_DEBUG); } @@ -450,7 +455,6 @@ log_set_method(int method, const char *filename) } logging_method = method; - log_info("Starting."); return 0; } @@ -584,6 +588,18 @@ log_warn(const char *format, ...) va_end(ap); } +/** Public function for logging a notice message. */ +void +log_notice(const char *format, ...) +{ + va_list ap; + va_start(ap,format); + + logv(LOG_SEV_NOTICE, format, ap); + + va_end(ap); +} + /** Public function for logging an informative message. */ void log_info(const char *format, ...) diff --git a/src/util.h b/src/util.h index 3396abf..9197c8c 100644 --- a/src/util.h +++ b/src/util.h @@ -157,7 +157,8 @@ int obfs_snprintf(char *str, size_t size, int log_set_method(int method, const char *filename); /** Set the minimum severity that will be logged. - 'sev_string' may be "warn", "info", or "debug" (case-insensitively). */ + 'sev_string' may be "warn", "notice", "info", or "debug" + (case-insensitively). */ int log_set_min_severity(const char* sev_string); /** True if debug messages are being logged. */ @@ -181,8 +182,13 @@ void log_error_abort(const char *format, ...) void log_warn(const char *format, ...) ATTR_PRINTF_1; -/** Info-level severity: for messages that should be sent to the user - during normal operation. */ +/** Notice-level severity: for messages that most users would like to + learn about during normal operation. */ +void log_notice(const char *format, ...) + ATTR_PRINTF_1; + +/** Info-level severity: for rather verbose messages of some interest to + users during normal operation. */ void log_info(const char *format, ...) ATTR_PRINTF_1;

1 0