October 2019 - tor-commits - lists.torproject.org

[tor/master] tor-coccinelle: handle SIMPLEQ and TAILQ better.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 017c62000cc078e2e858bc0a9a7efa60c4196c60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 09:58:42 2019 -0400 tor-coccinelle: handle SIMPLEQ and TAILQ better. --- scripts/coccinelle/tor-coccinelle.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index 288722b5f..87871b40b 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -40,3 +40,7 @@ #define HT_INITIALIZER() { } #define X509 struct x509_st #define STACK_OF(x) struct foo_stack_t +#define TOR_TAILQ_HEAD(a,b) struct tailq_head +#define TOR_TAILQ_ENTRY(a) struct tailq_entry +#define TOR_SIMPLEQ_HEAD(a,b) struct simpleq_entry +#define TOR_SIMPLEQ_ENTRY(a) struct simpleq_entry

1 0

[tor/master] With coccinelle, avoid includes in the middle of an expression.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 630d8c7a1acda53b640b018039f7ec586e048ad7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:16:08 2019 -0400 With coccinelle, avoid includes in the middle of an expression. --- src/app/config/config.c | 6 ++++++ src/feature/dirparse/authcert_parse.c | 2 ++ src/feature/dirparse/ns_parse.c | 2 ++ src/lib/tls/tortls_openssl.c | 2 ++ src/lib/version/git_revision.c | 4 ++++ src/test/test_config.c | 2 ++ 6 files changed, 18 insertions(+) diff --git a/src/app/config/config.c b/src/app/config/config.c index b4bccd935..93cf5427c 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -765,7 +765,9 @@ static const config_var_t option_vars_[] = { /** List of default directory authorities */ static const char *default_authorities[] = { +#ifndef COCCI #include "auth_dirs.inc" +#endif NULL }; @@ -773,7 +775,9 @@ static const char *default_authorities[] = { * relays that meet certain stability criteria. */ static const char *default_fallbacks[] = { +#ifndef COCCI #include "fallback_dirs.inc" +#endif NULL }; @@ -783,7 +787,9 @@ static const struct { const char *k; const char *v; } testing_tor_network_defaults[] = { +#ifndef COCCI #include "testnet.inc" +#endif { NULL, NULL } }; diff --git a/src/feature/dirparse/authcert_parse.c b/src/feature/dirparse/authcert_parse.c index 8ba5a5398..5e4b12c76 100644 --- a/src/feature/dirparse/authcert_parse.c +++ b/src/feature/dirparse/authcert_parse.c @@ -16,7 +16,9 @@ /** List of tokens recognized in V3 authority certificates. */ static token_rule_t dir_key_certificate_table[] = { +#ifndef COCCI #include "feature/dirparse/authcert_members.i" +#endif T1("fingerprint", K_FINGERPRINT, CONCAT_ARGS, NO_OBJ ), END_OF_TABLE }; diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index d5405e646..0cf2a6f78 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -84,7 +84,9 @@ static token_rule_t networkstatus_token_table[] = { T01("required-relay-protocols", K_REQUIRED_RELAY_PROTOCOLS, CONCAT_ARGS, NO_OBJ ), +#ifndef COCCI #include "feature/dirparse/authcert_members.i" +#endif T0N("opt", K_OPT, CONCAT_ARGS, OBJ_OK ), T1( "contact", K_CONTACT, CONCAT_ARGS, NO_OBJ ), diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c index 86f0ac42c..42db05460 100644 --- a/src/lib/tls/tortls_openssl.c +++ b/src/lib/tls/tortls_openssl.c @@ -464,7 +464,9 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] = /** List of ciphers that clients should advertise, omitting items that * our OpenSSL doesn't know about. */ static const char CLIENT_CIPHER_LIST[] = +#ifndef COCCI #include "lib/tls/ciphers.inc" +#endif /* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version * of any cipher we say. */ "!SSLv2" diff --git a/src/lib/version/git_revision.c b/src/lib/version/git_revision.c index 900a1e12a..338ba2bc3 100644 --- a/src/lib/version/git_revision.c +++ b/src/lib/version/git_revision.c @@ -11,14 +11,18 @@ * src/core/include.am, and is usually right. */ const char tor_git_revision[] = +#ifndef COCCI #ifndef _MSC_VER #include "micro-revision.i" #endif +#endif ""; const char tor_bug_suffix[] = " (on Tor " VERSION +#ifndef COCCI #ifndef _MSC_VER " " #include "micro-revision.i" #endif +#endif ")"; diff --git a/src/test/test_config.c b/src/test/test_config.c index 9b715b2ec..162a49990 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3815,7 +3815,9 @@ static void test_config_default_fallback_dirs(void *arg) { const char *fallback[] = { +#ifndef COCCI #include "app/config/fallback_dirs.inc" +#endif NULL };

1 0

[tor/master] tor-coccinelle.h: handle SLIST and LIST.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 18f1624bbef19c89be1b116b950134c0b808d4fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:19:58 2019 -0400 tor-coccinelle.h: handle SLIST and LIST. --- scripts/coccinelle/tor-coccinelle.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index ea12a61fe..a31a5cd80 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -44,6 +44,10 @@ #define TOR_TAILQ_ENTRY(a) struct tailq_entry #define TOR_SIMPLEQ_HEAD(a,b) struct simpleq_entry #define TOR_SIMPLEQ_ENTRY(a) struct simpleq_entry +#define TOR_LIST_HEAD(a,b) struct list_head +#define TOR_LIST_ENTRY(a) struct list_entry +#define TOR_SLIST_HEAD(a,b) struct slist_head +#define TOR_SLIST_ENTRY(a) struct slist_entry #define NS_DECL(a, b, c) a b c #define NS(a) a

1 0

[tor/master] COCCI: Disable some buffers.c macros that coccinelle can't handle.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit b03c8c74ce87e44fc74e84183fe883018b43f088 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 09:28:35 2019 -0400 COCCI: Disable some buffers.c macros that coccinelle can't handle. --- src/lib/buf/buffers.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 4d026bd37..382858385 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -99,6 +99,7 @@ #define DBG_S(s) (void)0 #endif +#ifndef COCCI #ifdef DISABLE_MEMORY_SENTINELS #define CHUNK_SET_SENTINEL(chunk, alloclen) STMT_NIL #else @@ -109,6 +110,7 @@ memset(a,0,SENTINEL_LEN); \ } while (0) #endif /* defined(DISABLE_MEMORY_SENTINELS) */ +#endif /** Move all bytes stored in chunk to the front of chunk->mem, * to free up space at the end. */

1 0

[tor/master] tor-coccinelle.h: add MOCK_DECL
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 7798c53c989408c64a6d43175e84dbc4bfa137f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:21:15 2019 -0400 tor-coccinelle.h: add MOCK_DECL --- scripts/coccinelle/tor-coccinelle.h | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/coccinelle/tor-coccinelle.h b/scripts/coccinelle/tor-coccinelle.h index a31a5cd80..97935c2dd 100644 --- a/scripts/coccinelle/tor-coccinelle.h +++ b/scripts/coccinelle/tor-coccinelle.h @@ -17,6 +17,7 @@ * syntactically valid C. */ +#define MOCK_DECL(a, b, c) a b c #define MOCK_IMPL(a, b, c) a b c #define CHECK_PRINTF(a, b) #define STATIC static

1 0

[tor/master] COCCI: disable DOWLOAD_SCHEDULE macro
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 48be9221609ceafa259db6f4c32cf947e9395e30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 09:31:31 2019 -0400 COCCI: disable DOWLOAD_SCHEDULE macro --- src/app/config/config.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/config/config.c b/src/app/config/config.c index 93cf5427c..f6eae6e97 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -186,8 +186,12 @@ static const char unix_q_socket_prefix[] = "unix:\""; /** macro to help with the bulk rename of *DownloadSchedule to * *DowloadInitialDelay . */ +#ifndef COCCI #define DOWNLOAD_SCHEDULE(name) \ { #name "DownloadSchedule", #name "DownloadInitialDelay", 0, 1 } +#else +#define DOWNLOAD_SCHEDULE(name) { NULL, NULL, 0, 1 } +#endif /** A list of abbreviations and aliases to map command-line options, obsolete * option names, or alternative option names, to their current values. */

1 0

[tor/master] With COCCI defined, avoid PERIODIC_EVENT.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit b867e97ce6825e3d7f33a3c3dce8c65f11fe15ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 10:34:43 2019 -0400 With COCCI defined, avoid PERIODIC_EVENT. Coccinelle doesn't understand the particular pattern of token pasting we have going on here. --- src/core/mainloop/mainloop.c | 4 +++- src/core/mainloop/periodic.h | 2 ++ src/core/or/or_periodic.c | 2 ++ src/feature/dirauth/dirauth_periodic.c | 2 ++ src/feature/relay/relay_periodic.c | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index c051b1156..6e78a5bb2 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1363,8 +1363,10 @@ CALLBACK(second_elapsed); #undef CALLBACK /* Now we declare an array of periodic_event_item_t for each periodic event */ -#define CALLBACK(name, r, f) \ +#ifndef COCCI +#define CALLBACK(name, r, f) \ PERIODIC_EVENT(name, PERIODIC_EVENT_ROLE_ ## r, f) +#endif #define FL(name) (PERIODIC_EVENT_FLAG_ ## name) STATIC periodic_event_item_t mainloop_periodic_events[] = { diff --git a/src/core/mainloop/periodic.h b/src/core/mainloop/periodic.h index a9aa46196..0f80748f5 100644 --- a/src/core/mainloop/periodic.h +++ b/src/core/mainloop/periodic.h @@ -71,8 +71,10 @@ typedef struct periodic_event_item_t { } periodic_event_item_t; /** events will get their interval from first execution */ +#ifndef COCCI #define PERIODIC_EVENT(fn, r, f) { fn##_callback, 0, NULL, #fn, r, f, 0 } #define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL, 0, 0, 0 } +#endif /* Return true iff the given event was setup before thus is enabled to be * scheduled. */ diff --git a/src/core/or/or_periodic.c b/src/core/or/or_periodic.c index fe28c9919..879d142cb 100644 --- a/src/core/or/or_periodic.c +++ b/src/core/or/or_periodic.c @@ -20,11 +20,13 @@ #include "feature/relay/routermode.h" +#ifndef COCCI #define DECLARE_EVENT(name, roles, flags) \ static periodic_event_item_t name ## _event = \ PERIODIC_EVENT(name, \ PERIODIC_EVENT_ROLE_##roles, \ flags) +#endif #define FL(name) (PERIODIC_EVENT_FLAG_ ## name) diff --git a/src/feature/dirauth/dirauth_periodic.c b/src/feature/dirauth/dirauth_periodic.c index 02727d61b..c02b9ac86 100644 --- a/src/feature/dirauth/dirauth_periodic.c +++ b/src/feature/dirauth/dirauth_periodic.c @@ -18,11 +18,13 @@ #include "core/mainloop/periodic.h" +#ifndef COCCI #define DECLARE_EVENT(name, roles, flags) \ static periodic_event_item_t name ## _event = \ PERIODIC_EVENT(name, \ PERIODIC_EVENT_ROLE_##roles, \ flags) +#endif #define FL(name) (PERIODIC_EVENT_FLAG_##name) diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index b48b49589..7dc4cb453 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -31,11 +31,13 @@ #include "feature/nodelist/routerinfo_st.h" #include "feature/control/control_events.h" +#ifndef COCCI #define DECLARE_EVENT(name, roles, flags) \ static periodic_event_item_t name ## _event = \ PERIODIC_EVENT(name, \ PERIODIC_EVENT_ROLE_##roles, \ flags) +#endif #define FL(name) (PERIODIC_EVENT_FLAG_##name)

1 0

[tor/master] Use various COCCI tests to get mainloop.c to parse.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 67247fa9ac7c2c5b19c0a2b6884ab21f83cc5e5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 11:07:18 2019 -0400 Use various COCCI tests to get mainloop.c to parse. --- src/core/mainloop/mainloop.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 6e78a5bb2..dae82fba6 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1338,9 +1338,11 @@ get_signewnym_epoch(void) static int periodic_events_initialized = 0; /* Declare all the timer callback functions... */ +#ifndef COCCI #undef CALLBACK #define CALLBACK(name) \ static int name ## _callback(time_t, const or_options_t *) + CALLBACK(add_entropy); CALLBACK(check_expired_networkstatus); CALLBACK(clean_caches); @@ -1363,11 +1365,10 @@ CALLBACK(second_elapsed); #undef CALLBACK /* Now we declare an array of periodic_event_item_t for each periodic event */ -#ifndef COCCI #define CALLBACK(name, r, f) \ PERIODIC_EVENT(name, PERIODIC_EVENT_ROLE_ ## r, f) -#endif #define FL(name) (PERIODIC_EVENT_FLAG_ ## name) +#endif STATIC periodic_event_item_t mainloop_periodic_events[] = { @@ -1418,8 +1419,10 @@ STATIC periodic_event_item_t mainloop_periodic_events[] = { END_OF_PERIODIC_EVENTS }; +#ifndef COCCI #undef CALLBACK #undef FL +#endif /* These are pointers to members of periodic_events[] that are used to * implement particular callbacks. We keep them separate here so that we @@ -1518,8 +1521,10 @@ initialize_periodic_events(void) /* Set up all periodic events. We'll launch them by roles. */ +#ifndef COCCI #define NAMED_CALLBACK(name) \ STMT_BEGIN name ## _event = periodic_events_find( #name ); STMT_END +#endif NAMED_CALLBACK(prune_old_routers); NAMED_CALLBACK(fetch_networkstatus);

1 0

[tor/master] Disable a couple of iterator macros when COCCI is defined.
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit d9bad0203bb0926883d8d1513ddc966e84fcc734 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 11:10:08 2019 -0400 Disable a couple of iterator macros when COCCI is defined. --- src/core/or/circuitpadding.c | 2 ++ src/feature/hs/hs_service.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 99c68d5f6..d561b63ff 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -116,6 +116,7 @@ STATIC smartlist_t *origin_padding_machines = NULL; * runtime and as long as circuits are alive. */ STATIC smartlist_t *relay_padding_machines = NULL; +#ifndef COCCI /** Loop over the current padding state machines using loop_var as the * loop variable. */ #define FOR_EACH_CIRCUIT_MACHINE_BEGIN(loop_var) \ @@ -130,6 +131,7 @@ STATIC smartlist_t *relay_padding_machines = NULL; if (!(circ)->padding_info[loop_var]) \ continue; #define FOR_EACH_ACTIVE_CIRCUIT_MACHINE_END } STMT_END ; +#endif /** * Free the machineinfo at an index diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 702119090..600d64cac 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -67,6 +67,7 @@ #include <unistd.h> #endif +#ifndef COCCI /* Helper macro. Iterate over every service in the global map. The var is the * name of the service pointer. */ #define FOR_EACH_SERVICE_BEGIN(var) \ @@ -88,6 +89,7 @@ (var = service->desc_next); \ if (var == NULL) continue; #define FOR_EACH_DESCRIPTOR_END } STMT_END ; +#endif /* Onion service directory file names. */ static const char fname_keyfile_prefix[] = "hs_ed25519";

1 0

[tor/master] conftesting.h: when COCCI is defined, disable unhandled macros
by teor＠torproject.org 24 Oct '19

24 Oct '19

commit 04a74d4aa7d990b03ea07182e86263ed1651db43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 9 12:42:09 2019 -0400 conftesting.h: when COCCI is defined, disable unhandled macros --- src/lib/conf/conftesting.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h index a40c9bc97..8f82b5bf1 100644 --- a/src/lib/conf/conftesting.h +++ b/src/lib/conf/conftesting.h @@ -12,7 +12,9 @@ #ifndef TOR_LIB_CONF_CONFTESTING_H #define TOR_LIB_CONF_CONFTESTING_H +#ifndef COCCI #ifdef TOR_UNIT_TESTS +#define USE_CONF_TESTING /** * Union used when building in test mode typechecking the members of a type * used with confparse.c. See CONF_CHECK_VAR_TYPE for a description of how @@ -41,12 +43,10 @@ typedef union { // XXXX this doesn't belong at this level of abstraction. struct routerset_t **ROUTERSET; } confparse_dummy_values_t; -#endif /* defined(TOR_UNIT_TESTS) */ /* Macros to define extra members inside config_var_t fields, and at the * end of a list of them. */ -#ifdef TOR_UNIT_TESTS /* This is a somewhat magic type-checking macro for users of confparse.c. * It initializes a union member "confparse_dummy_values_t.conftype" with * the address of a static member "tp_dummy.member". This @@ -72,9 +72,10 @@ typedef union { #define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL } #define DUMMY_TYPECHECK_INSTANCE(tp) \ static tp tp ## _dummy +#endif +#endif -#else /* !(defined(TOR_UNIT_TESTS)) */ - +#ifndef USE_CONF_TESTING #define CONF_TEST_MEMBERS(tp, conftype, member) /* Repeatedly declarable incomplete struct to absorb redundant semicolons */ #define DUMMY_TYPECHECK_INSTANCE(tp) \

1 0