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

[tor-browser-bundle/master] Bump TBB version for #3455 fixup.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit a7f6793b95dba3e6f4bb1f2128eacfc83eb95ffa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 31 14:15:14 2014 -0700 Bump TBB version for #3455 fixup. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8501889..27ee9da 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -… [View More]

1 0

[tor-browser/tor-browser-31.2.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
by mikeperry＠torproject.org 31 Oct '14

31 Oct '14

commit e65a5a72227f5bb1915e5402fa945d0a9d3cf591 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Oct 31 10:20:31 2014 -0700 fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain. --- netwerk/base/src/nsProtocolProxyService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp index ed8b311..b4a6a9c 100644 --- a/netwerk/base/src/… [View More]

1 0

[stem/master] Note when new hidden service methods were added
by atagar＠torproject.org 31 Oct '14

31 Oct '14

commit 116cbdfc136e4b822b352860d9a4294d267725fd Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 31 09:35:09 2014 -0700 Note when new hidden service methods were added --- stem/control.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/stem/control.py b/stem/control.py index 93fe354..c297f0b 100644 --- a/stem/control.py +++ b/stem/control.py @@ -2065,6 +2065,8 @@ class Controller(BaseController): }, } + .. versionadded:: 1.3.0 + … [View More]

1 0

[arm/master] Labeling the y-axis
by atagar＠torproject.org 31 Oct '14

31 Oct '14

commit 99cd9b24d96e44a7113f3fad2fbebb0baf0a450a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 27 08:50:21 2014 -0700 Labeling the y-axis We made a lot of sacrifices in the name of screen real estate, but a poor one was to leave the y-axis unlabeled. Bandwidth is in Kb or KB, and size is in MB. Who would guess that? Hell, I need to check the code every time I'm asked. This is a work in progress. Two missing bits... * The graph … [View More]presently covers the labels if it's long. * The labels should be right aligned. --- arm/graph_panel.py | 78 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/arm/graph_panel.py b/arm/graph_panel.py index a7c403c..5af3fb0 100644 --- a/arm/graph_panel.py +++ b/arm/graph_panel.py @@ -136,6 +136,19 @@ class GraphCategory(object): tor_controller().add_event_listener(self.bandwidth_event, stem.control.EventType.BW) + def y_axis_label(self, value, is_primary): + """ + Provides the label we should display on our y-axis. + + :param int value: value being shown on the y-axis + :param bool is_primary: True if this is the primary attribute, False if + it's the secondary + + :returns: **str** with our y-axis label + """ + + return '' + def bandwidth_event(self, event): """ Called when it's time to process another event. All graphs use tor BW @@ -167,26 +180,29 @@ class BandwidthStats(GraphCategory): start_time = system.start_time(controller.get_pid(None)) if read_total and write_total and start_time: - self.primary.total = int(read_total) / 1024 # Bytes -> KB - self.secondary.total = int(write_total) / 1024 # Bytes -> KB + self.primary.total = int(read_total) + self.secondary.total = int(write_total) self.primary.start_time = self.secondary.start_time = start_time + def y_axis_label(self, value, is_primary): + return str_tools.size_label(value, is_bytes = CONFIG['features.graph.bw.transferInBytes']) + def bandwidth_event(self, event): # scales units from B to KB for graphing - self.primary.update(event.read / 1024.0) - self.secondary.update(event.written / 1024.0) + self.primary.update(event.read) + self.secondary.update(event.written) self.primary_header_stats = [ - '%-14s' % ('%s/sec' % _size_label(self.primary.latest_value * 1024)), - '- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.primary.start_time) * 1024), - ', total: %s' % _size_label(self.primary.total * 1024), + '%-14s' % ('%s/sec' % _size_label(self.primary.latest_value)), + '- avg: %s/sec' % _size_label(self.primary.total / (time.time() - self.primary.start_time)), + ', total: %s' % _size_label(self.primary.total), ] self.secondary_header_stats = [ - '%-14s' % ('%s/sec' % _size_label(self.secondary.latest_value * 1024)), - '- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.secondary.start_time) * 1024), - ', total: %s' % _size_label(self.secondary.total * 1024), + '%-14s' % ('%s/sec' % _size_label(self.secondary.latest_value)), + '- avg: %s/sec' % _size_label(self.secondary.total / (time.time() - self.secondary.start_time)), + ', total: %s' % _size_label(self.secondary.total), ] stats = [] @@ -228,6 +244,9 @@ class ConnectionStats(GraphCategory): Tracks number of inbound and outbound connections. """ + def y_axis_label(self, value, is_primary): + return str(value) + def bandwidth_event(self, event): inbound_count, outbound_count = 0, 0 @@ -259,20 +278,19 @@ class ResourceStats(GraphCategory): Tracks cpu and memory usage of the tor process. """ + def y_axis_label(self, value, is_primary): + return "%i%%" % value if is_primary else str_tools.size_label(value) + def bandwidth_event(self, event): resources = arm.util.tracker.get_resource_tracker().get_value() self.primary.update(resources.cpu_sample * 100) # decimal percentage to whole numbers - self.secondary.update(resources.memory_bytes / 1048576) # translate size to MB so axis labels are short + self.secondary.update(resources.memory_bytes) avg = self.primary.total / max(1, self.primary.tick) self.primary_header_stats = ['%0.1f%%' % self.primary.latest_value, ', avg: %0.1f%%' % avg] - # memory sizes are converted from MB to B before generating labels - - usage_label = str_tools.size_label(self.secondary.latest_value * 1048576, 1) - avg = self.secondary.total / max(1, self.secondary.tick) - self.secondary_header_stats = [usage_label, ', avg: %s' % str_tools.size_label(avg * 1048576, 1)] + self.secondary_header_stats = [str_tools.size_label(self.secondary.latest_value, 1), ', avg: %s' % str_tools.size_label(avg, 1)] class GraphPanel(panel.Panel): @@ -283,19 +301,20 @@ class GraphPanel(panel.Panel): def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, 'graph', 0) - self.update_interval = CONFIG['features.graph.interval'] - if self.update_interval not in CONFIG['attr.graph.intervals']: + if CONFIG['features.graph.interval'] in CONFIG['attr.graph.intervals']: + self.update_interval = CONFIG['features.graph.interval'] + else: self.update_interval = 'each second' log.warn("'%s' isn't a valid graphing interval, options are: %s" % (CONFIG['features.graph.interval'], ', '.join(CONFIG['attr.graph.intervals']))) if CONFIG['features.graph.bound'] in Bounds: self.bounds = CONFIG['features.graph.bound'] else: - log.warn("'%s' isn't a valid type of graph bound." % CONFIG['features.graph.bound']) self.bounds = Bounds.LOCAL_MAX + log.warn("'%s' isn't a valid graph bounds, options are: %s" % (CONFIG['features.graph.bound'], ', '.join(Bounds))) - self.graph_height = CONFIG['features.graph.height'] + self.graph_height = max(1, CONFIG['features.graph.height']) self.current_display = None # label of the stats currently being displayed self._accounting_stats = None self._last_redraw = 0 @@ -320,7 +339,9 @@ class GraphPanel(panel.Panel): # prepopulates bandwidth values from state file - if CONFIG["features.graph.bw.prepopulate"] and tor_controller().is_alive(): + controller = tor_controller() + + if CONFIG['features.graph.bw.prepopulate'] and controller.is_alive(): try: missing_seconds = prepopulate_from_state(self.stats[GraphStat.BANDWIDTH]) @@ -333,7 +354,6 @@ class GraphPanel(panel.Panel): except ValueError as exc: log.info(msg('panel.graphing.prepopulation_failure', error = str(exc))) - controller = tor_controller() controller.add_event_listener(self.bandwidth_event, stem.control.EventType.BW) controller.add_status_listener(self.reset_listener) @@ -566,11 +586,11 @@ class GraphPanel(panel.Panel): # displays upper and lower bounds - self.addstr(2, 0, '%4i' % primary_max_bound, PRIMARY_COLOR) - self.addstr(self.graph_height + 1, 0, '%4i' % primary_min_bound, PRIMARY_COLOR) + self.addstr(2, 0, param.y_axis_label(primary_max_bound, True), PRIMARY_COLOR) + self.addstr(self.graph_height + 1, 0, param.y_axis_label(primary_min_bound, True), PRIMARY_COLOR) - self.addstr(2, graph_column + 5, '%4i' % secondary_max_bound, SECONDARY_COLOR) - self.addstr(self.graph_height + 1, graph_column + 5, '%4i' % secondary_min_bound, SECONDARY_COLOR) + self.addstr(2, graph_column + 5, param.y_axis_label(secondary_max_bound, False), SECONDARY_COLOR) + self.addstr(self.graph_height + 1, graph_column + 5, param.y_axis_label(secondary_min_bound, False), SECONDARY_COLOR) # displays intermediate bounds on every other row @@ -587,13 +607,13 @@ class GraphPanel(panel.Panel): primary_val = (primary_max_bound - primary_min_bound) * (self.graph_height - row - 1) / (self.graph_height - 1) if primary_val not in (primary_min_bound, primary_max_bound): - self.addstr(row + 2, 0, '%4i' % primary_val, PRIMARY_COLOR) + self.addstr(row + 2, 0, param.y_axis_label(primary_val, True), PRIMARY_COLOR) if secondary_min_bound != secondary_max_bound: secondary_val = (secondary_max_bound - secondary_min_bound) * (self.graph_height - row - 1) / (self.graph_height - 1) if secondary_val not in (secondary_min_bound, secondary_max_bound): - self.addstr(row + 2, graph_column + 5, '%4i' % secondary_val, SECONDARY_COLOR) + self.addstr(row + 2, graph_column + 5, param.y_axis_label(secondary_val, False), SECONDARY_COLOR) # creates bar graph (both primary and secondary) @@ -739,7 +759,7 @@ def prepopulate_from_state(stat): # fills the graphing parameters with state information for i in range(entry_count): - read_value, write_value = bw_read_entries[i], bw_write_entries[i] + read_value, write_value = bw_read_entries[i] * 1024, bw_write_entries[i] * 1024 # KB => B stat.primary.latest_value, stat.secondary.latest_value = read_value / 900, write_value / 900 [View Less]

1 0

[tor/master] Merge branch 'digest256map'
by nickm＠torproject.org 31 Oct '14

31 Oct '14

commit bac6d542c912f733aa6103c47ef41423848fef7c Merge: 5ad8721 542b470 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 31 11:15:49 2014 -0400 Merge branch 'digest256map' changes/bug13399_part1 | 3 + src/common/container.c | 673 ++++++++++++++++++++---------------------------- src/common/container.h | 10 + 3 files changed, 287 insertions(+), 399 deletions(-)

1 0

[tor/master] Refactor {str,digest}map into a common implementation; add digest256map
by nickm＠torproject.org 31 Oct '14

31 Oct '14

commit 542b4701644224bf096599931a61dbae645aa2cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 31 10:54:12 2014 -0400 Refactor {str,digest}map into a common implementation; add digest256map Needed for #13399. --- changes/bug13399_part1 | 3 + src/common/container.c | 673 ++++++++++++++++++++---------------------------- src/common/container.h | 10 + 3 files changed, 287 insertions(+), 399 deletions(-) diff --git a/changes/bug13399_part1 b/changes/… [View More]bug13399_part1 new file mode 100644 index 0000000..2ad3f8d --- /dev/null +++ b/changes/bug13399_part1 @@ -0,0 +1,3 @@ + o Code simplifications and refactoring: + - Refactor our generic strmap and digestmap types into a single + implementation, so that we can add a new digest256map type trivially. diff --git a/src/common/container.c b/src/common/container.c index 5997f52..ab4e22d 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -1021,6 +1021,7 @@ smartlist_uniq_digests256(smartlist_t *sl) DEFINE_MAP_STRUCTS(strmap_t, char *key, strmap_); DEFINE_MAP_STRUCTS(digestmap_t, char key[DIGEST_LEN], digestmap_); +DEFINE_MAP_STRUCTS(digest256map_t, uint8_t key[DIGEST256_LEN], digest256map_); /** Helper: compare strmap_entry_t objects by key value. */ static INLINE int @@ -1050,6 +1051,21 @@ digestmap_entry_hash(const digestmap_entry_t *a) return (unsigned) siphash24g(a->key, DIGEST_LEN); } +/** Helper: compare digestmap_entry_t objects by key value. */ +static INLINE int +digest256map_entries_eq(const digest256map_entry_t *a, + const digest256map_entry_t *b) +{ + return tor_memeq(a->key, b->key, DIGEST256_LEN); +} + +/** Helper: return a hash value for a digest_map_t. */ +static INLINE unsigned int +digest256map_entry_hash(const digest256map_entry_t *a) +{ + return (unsigned) siphash24g(a->key, DIGEST256_LEN); +} + HT_PROTOTYPE(strmap_impl, strmap_entry_t, node, strmap_entry_hash, strmap_entries_eq) HT_GENERATE2(strmap_impl, strmap_entry_t, node, strmap_entry_hash, @@ -1060,194 +1076,278 @@ HT_PROTOTYPE(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash, HT_GENERATE2(digestmap_impl, digestmap_entry_t, node, digestmap_entry_hash, digestmap_entries_eq, 0.6, tor_reallocarray_, tor_free_) -/** Constructor to create a new empty map from strings to void*'s. - */ -MOCK_IMPL(strmap_t *, -strmap_new,(void)) +HT_PROTOTYPE(digest256map_impl, digest256map_entry_t, node, + digest256map_entry_hash, + digest256map_entries_eq) +HT_GENERATE2(digest256map_impl, digest256map_entry_t, node, + digest256map_entry_hash, + digest256map_entries_eq, 0.6, tor_reallocarray_, tor_free_) + +static INLINE void +strmap_entry_free(strmap_entry_t *ent) { - strmap_t *result; - result = tor_malloc(sizeof(strmap_t)); - HT_INIT(strmap_impl, &result->head); - return result; + tor_free(ent->key); + tor_free(ent); } - -/** Constructor to create a new empty map from digests to void*'s. - */ -MOCK_IMPL(digestmap_t *, -digestmap_new,(void)) +static INLINE void +digestmap_entry_free(digestmap_entry_t *ent) { - digestmap_t *result; - result = tor_malloc(sizeof(digestmap_t)); - HT_INIT(digestmap_impl, &result->head); - return result; + tor_free(ent); } - -/** Set the current value for key to val. Returns the previous - * value for key if one was set, or NULL if one was not. - * - * This function makes a copy of key if necessary, but not of - * val. - */ -void * -strmap_set(strmap_t *map, const char *key, void *val) -{ - strmap_entry_t *resolve; - strmap_entry_t search; - void *oldval; - tor_assert(map); - tor_assert(key); - tor_assert(val); - search.key = (char*)key; - resolve = HT_FIND(strmap_impl, &map->head, &search); - if (resolve) { - oldval = resolve->val; - resolve->val = val; - return oldval; - } else { - resolve = tor_malloc_zero(sizeof(strmap_entry_t)); - resolve->key = tor_strdup(key); - resolve->val = val; - tor_assert(!HT_FIND(strmap_impl, &map->head, resolve)); - HT_INSERT(strmap_impl, &map->head, resolve); - return NULL; - } +static INLINE void +digest256map_entry_free(digest256map_entry_t *ent) +{ + tor_free(ent); } -#define OPTIMIZED_DIGESTMAP_SET - -/** Like strmap_set() above but for digestmaps. */ -void * -digestmap_set(digestmap_t *map, const char *key, void *val) +static INLINE void +strmap_assign_tmp_key(strmap_entry_t *ent, const char *key) { -#ifndef OPTIMIZED_DIGESTMAP_SET - digestmap_entry_t *resolve; -#endif - digestmap_entry_t search; - void *oldval; - tor_assert(map); - tor_assert(key); - tor_assert(val); - memcpy(&search.key, key, DIGEST_LEN); -#ifndef OPTIMIZED_DIGESTMAP_SET - resolve = HT_FIND(digestmap_impl, &map->head, &search); - if (resolve) { - oldval = resolve->val; - resolve->val = val; - return oldval; - } else { - resolve = tor_malloc_zero(sizeof(digestmap_entry_t)); - memcpy(resolve->key, key, DIGEST_LEN); - resolve->val = val; - HT_INSERT(digestmap_impl, &map->head, resolve); - return NULL; - } -#else - /* We spend up to 5% of our time in this function, so the code below is - * meant to optimize the check/alloc/set cycle by avoiding the two trips to - * the hash table that we do in the unoptimized code above. (Each of - * HT_INSERT and HT_FIND calls HT_SET_HASH and HT_FIND_P.) - */ - HT_FIND_OR_INSERT_(digestmap_impl, node, digestmap_entry_hash, &(map->head), - digestmap_entry_t, &search, ptr, - { - /* we found an entry. */ - oldval = (*ptr)->val; - (*ptr)->val = val; - return oldval; - }, - { - /* We didn't find the entry. */ - digestmap_entry_t *newent = - tor_malloc_zero(sizeof(digestmap_entry_t)); - memcpy(newent->key, key, DIGEST_LEN); - newent->val = val; - HT_FOI_INSERT_(node, &(map->head), &search, newent, ptr); - return NULL; - }); -#endif + ent->key = (char*)key; } - -/** Return the current value associated with key, or NULL if no - * value is set. - */ -void * -strmap_get(const strmap_t *map, const char *key) -{ - strmap_entry_t *resolve; - strmap_entry_t search; - tor_assert(map); - tor_assert(key); - search.key = (char*)key; - resolve = HT_FIND(strmap_impl, &map->head, &search); - if (resolve) { - return resolve->val; - } else { - return NULL; - } +static INLINE void +digestmap_assign_tmp_key(digestmap_entry_t *ent, const char *key) +{ + memcpy(ent->key, key, DIGEST_LEN); } - -/** Like strmap_get() above but for digestmaps. */ -void * -digestmap_get(const digestmap_t *map, const char *key) -{ - digestmap_entry_t *resolve; - digestmap_entry_t search; - tor_assert(map); - tor_assert(key); - memcpy(&search.key, key, DIGEST_LEN); - resolve = HT_FIND(digestmap_impl, &map->head, &search); - if (resolve) { - return resolve->val; - } else { - return NULL; - } +static INLINE void +digest256map_assign_tmp_key(digest256map_entry_t *ent, const uint8_t *key) +{ + memcpy(ent->key, key, DIGEST256_LEN); +} +static INLINE void +strmap_assign_key(strmap_entry_t *ent, const char *key) +{ + ent->key = tor_strdup(key); +} +static INLINE void +digestmap_assign_key(digestmap_entry_t *ent, const char *key) +{ + memcpy(ent->key, key, DIGEST_LEN); +} +static INLINE void +digest256map_assign_key(digest256map_entry_t *ent, const uint8_t *key) +{ + memcpy(ent->key, key, DIGEST256_LEN); } -/** Remove the value currently associated with key from the map. - * Return the value if one was set, or NULL if there was no entry for - * key. - * - * Note: you must free any storage associated with the returned value. +/** + * Macro: implement all the functions for a map that are declared in + * container.h by the DECLARE_MAP_FNS() macro. You must additionally define a + * prefix_entry_free_() function to free entries (and their keys), a + * prefix_assign_tmp_key() function to temporarily set a stack-allocated + * entry to hold a key, and a prefix_assign_key() function to set a + * heap-allocated entry to hold a key. */ -void * -strmap_remove(strmap_t *map, const char *key) -{ - strmap_entry_t *resolve; - strmap_entry_t search; - void *oldval; - tor_assert(map); - tor_assert(key); - search.key = (char*)key; - resolve = HT_REMOVE(strmap_impl, &map->head, &search); - if (resolve) { - oldval = resolve->val; - tor_free(resolve->key); - tor_free(resolve); - return oldval; - } else { - return NULL; +#define IMPLEMENT_MAP_FNS(maptype, keytype, prefix) \ + /** Create and return a new empty map. */ \ + MOCK_IMPL(maptype *, \ + prefix##_new,(void)) \ + { \ + maptype *result; \ + result = tor_malloc(sizeof(maptype)); \ + HT_INIT(prefix##_impl, &result->head); \ + return result; \ + } \ + \ + /** Return the item from map whose key matches key, or \ + * NULL if no such value exists. */ \ + void * \ + prefix##_get(const maptype *map, const keytype key) \ + { \ + prefix ##_entry_t *resolve; \ + prefix ##_entry_t search; \ + tor_assert(map); \ + tor_assert(key); \ + prefix ##_assign_tmp_key(&search, key); \ + resolve = HT_FIND(prefix ##_impl, &map->head, &search); \ + if (resolve) { \ + return resolve->val; \ + } else { \ + return NULL; \ + } \ + } \ + \ + /** Add an entry to map mapping key to val; \ + * return the previous value, or NULL if no such value existed. */ \ + void * \ + prefix##_set(maptype *map, const keytype key, void *val) \ + { \ + prefix##_entry_t search; \ + void *oldval; \ + tor_assert(map); \ + tor_assert(key); \ + tor_assert(val); \ + prefix##_assign_tmp_key(&search, key); \ + /* We a lot of our time in this function, so the code below is */ \ + /* meant to optimize the check/alloc/set cycle by avoiding the two */\ + /* trips to the hash table that we would do in the unoptimized */ \ + /* version of this code. (Each of HT_INSERT and HT_FIND calls */ \ + /* HT_SET_HASH and HT_FIND_P.) */ \ + HT_FIND_OR_INSERT_(prefix##_impl, node, prefix##_entry_hash, \ + &(map->head), \ + prefix##_entry_t, &search, ptr, \ + { \ + /* we found an entry. */ \ + oldval = (*ptr)->val; \ + (*ptr)->val = val; \ + return oldval; \ + }, \ + { \ + /* We didn't find the entry. */ \ + prefix##_entry_t *newent = \ + tor_malloc_zero(sizeof(prefix##_entry_t)); \ + prefix##_assign_key(newent, key); \ + newent->val = val; \ + HT_FOI_INSERT_(node, &(map->head), \ + &search, newent, ptr); \ + return NULL; \ + }); \ + } \ + \ + /** Remove the value currently associated with key from the map. \ + * Return the value if one was set, or NULL if there was no entry for \ + * key. \ + * \ + * Note: you must free any storage associated with the returned value. \ + */ \ + void * \ + prefix##_remove(maptype *map, const keytype key) \ + { \ + prefix##_entry_t *resolve; \ + prefix##_entry_t search; \ + void *oldval; \ + tor_assert(map); \ + tor_assert(key); \ + prefix##_assign_tmp_key(&search, key); \ + resolve = HT_REMOVE(prefix##_impl, &map->head, &search); \ + if (resolve) { \ + oldval = resolve->val; \ + prefix##_entry_free(resolve); \ + return oldval; \ + } else { \ + return NULL; \ + } \ + } \ + \ + /** Return the number of elements in map. */ \ + int \ + prefix##_size(const maptype *map) \ + { \ + return HT_SIZE(&map->head); \ + } \ + \ + /** Return true iff map has no entries. */ \ + int \ + prefix##_isempty(const maptype *map) \ + { \ + return HT_EMPTY(&map->head); \ + } \ + \ + /** Assert that map is not corrupt. */ \ + void \ + prefix##_assert_ok(const maptype *map) \ + { \ + tor_assert(!prefix##_impl_HT_REP_IS_BAD_(&map->head)); \ + } \ + \ + /** Remove all entries from map, and deallocate storage for \ + * those entries. If free_val is provided, invoked it every value in \ + * map. */ \ + MOCK_IMPL(void, \ + prefix##_free, (maptype *map, void (*free_val)(void*))) \ + { \ + prefix##_entry_t **ent, **next, *this; \ + if (!map) \ + return; \ + for (ent = HT_START(prefix##_impl, &map->head); ent != NULL; \ + ent = next) { \ + this = *ent; \ + next = HT_NEXT_RMV(prefix##_impl, &map->head, ent); \ + if (free_val) \ + free_val(this->val); \ + prefix##_entry_free(this); \ + } \ + tor_assert(HT_EMPTY(&map->head)); \ + HT_CLEAR(prefix##_impl, &map->head); \ + tor_free(map); \ + } \ + \ + /** return an iterator pointer to the front of a map. \ + * \ + * Iterator example: \ + * \ + * \code \ + * // uppercase values in "map", removing empty values. \ + * \ + * strmap_iter_t *iter; \ + * const char *key; \ + * void *val; \ + * char *cp; \ + * \ + * for (iter = strmap_iter_init(map); !strmap_iter_done(iter); ) { \ + * strmap_iter_get(iter, &key, &val); \ + * cp = (char*)val; \ + * if (!*cp) { \ + * iter = strmap_iter_next_rmv(map,iter); \ + * free(val); \ + * } else { \ + * for (;*cp;cp++) *cp = TOR_TOUPPER(*cp); \ + */ \ + prefix##_iter_t * \ + prefix##_iter_init(maptype *map) \ + { \ + tor_assert(map); \ + return HT_START(prefix##_impl, &map->head); \ + } \ + \ + /** Advance iter a single step to the next entry, and return \ + * its new value. */ \ + prefix##_iter_t * \ + prefix##_iter_next(maptype *map, prefix##_iter_t *iter) \ + { \ + tor_assert(map); \ + tor_assert(iter); \ + return HT_NEXT(prefix##_impl, &map->head, iter); \ + } \ + /** Advance iter a single step to the next entry, removing the \ + * current entry, and return its new value. */ \ + prefix##_iter_t * \ + prefix##_iter_next_rmv(maptype *map, prefix##_iter_t *iter) \ + { \ + prefix##_entry_t *rmv; \ + tor_assert(map); \ + tor_assert(iter); \ + tor_assert(*iter); \ + rmv = *iter; \ + iter = HT_NEXT_RMV(prefix##_impl, &map->head, iter); \ + prefix##_entry_free(rmv); \ + return iter; \ + } \ + /** Set *keyp and *valp to the current entry pointed \ + * to by iter. */ \ + void \ + prefix##_iter_get(prefix##_iter_t *iter, const keytype *keyp, \ + void **valp) \ + { \ + tor_assert(iter); \ + tor_assert(*iter); \ + tor_assert(keyp); \ + tor_assert(valp); \ + *keyp = (*iter)->key; \ + *valp = (*iter)->val; \ + } \ + /** Return true iff iter has advanced past the last entry of \ + * map. */ \ + int \ + prefix##_iter_done(prefix##_iter_t *iter) \ + { \ + return iter == NULL; \ } -} -/** Like strmap_remove() above but for digestmaps. */ -void * -digestmap_remove(digestmap_t *map, const char *key) -{ - digestmap_entry_t *resolve; - digestmap_entry_t search; - void *oldval; - tor_assert(map); - tor_assert(key); - memcpy(&search.key, key, DIGEST_LEN); - resolve = HT_REMOVE(digestmap_impl, &map->head, &search); - if (resolve) { - oldval = resolve->val; - tor_free(resolve); - return oldval; - } else { - return NULL; - } -} +IMPLEMENT_MAP_FNS(strmap_t, char *, strmap) +IMPLEMENT_MAP_FNS(digestmap_t, char *, digestmap) +IMPLEMENT_MAP_FNS(digest256map_t, uint8_t *, digest256map) /** Same as strmap_set, but first converts key to lowercase. */ void * @@ -1287,231 +1387,6 @@ strmap_remove_lc(strmap_t *map, const char *key) return v; } -/** return an iterator pointer to the front of a map. - * - * Iterator example: - * - * \code - * // uppercase values in "map", removing empty values. - * - * strmap_iter_t *iter; - * const char *key; - * void *val; - * char *cp; - * - * for (iter = strmap_iter_init(map); !strmap_iter_done(iter); ) { - * strmap_iter_get(iter, &key, &val); - * cp = (char*)val; - * if (!*cp) { - * iter = strmap_iter_next_rmv(map,iter); - * free(val); - * } else { - * for (;*cp;cp++) *cp = TOR_TOUPPER(*cp); - * iter = strmap_iter_next(map,iter); - * } - * } - * \endcode - * - */ -strmap_iter_t * -strmap_iter_init(strmap_t *map) -{ - tor_assert(map); - return HT_START(strmap_impl, &map->head); -} - -/** Start iterating through map. See strmap_iter_init() for example. */ -digestmap_iter_t * -digestmap_iter_init(digestmap_t *map) -{ - tor_assert(map); - return HT_START(digestmap_impl, &map->head); -} - -/** Advance the iterator iter for map a single step to the next - * entry, and return its new value. */ -strmap_iter_t * -strmap_iter_next(strmap_t *map, strmap_iter_t *iter) -{ - tor_assert(map); - tor_assert(iter); - return HT_NEXT(strmap_impl, &map->head, iter); -} - -/** Advance the iterator iter for map a single step to the next entry, - * and return its new value. */ -digestmap_iter_t * -digestmap_iter_next(digestmap_t *map, digestmap_iter_t *iter) -{ - tor_assert(map); - tor_assert(iter); - return HT_NEXT(digestmap_impl, &map->head, iter); -} - -/** Advance the iterator iter a single step to the next entry, removing - * the current entry, and return its new value. - */ -strmap_iter_t * -strmap_iter_next_rmv(strmap_t *map, strmap_iter_t *iter) -{ - strmap_entry_t *rmv; - tor_assert(map); - tor_assert(iter); - tor_assert(*iter); - rmv = *iter; - iter = HT_NEXT_RMV(strmap_impl, &map->head, iter); - tor_free(rmv->key); - tor_free(rmv); - return iter; -} - -/** Advance the iterator iter a single step to the next entry, removing - * the current entry, and return its new value. - */ -digestmap_iter_t * -digestmap_iter_next_rmv(digestmap_t *map, digestmap_iter_t *iter) -{ - digestmap_entry_t *rmv; - tor_assert(map); - tor_assert(iter); - tor_assert(*iter); - rmv = *iter; - iter = HT_NEXT_RMV(digestmap_impl, &map->head, iter); - tor_free(rmv); - return iter; -} - -/** Set *keyp and *valp to the current entry pointed to by - * iter. */ -void -strmap_iter_get(strmap_iter_t *iter, const char **keyp, void **valp) -{ - tor_assert(iter); - tor_assert(*iter); - tor_assert(keyp); - tor_assert(valp); - *keyp = (*iter)->key; - *valp = (*iter)->val; -} - -/** Set *keyp and *valp to the current entry pointed to by - * iter. */ -void -digestmap_iter_get(digestmap_iter_t *iter, const char **keyp, void **valp) -{ - tor_assert(iter); - tor_assert(*iter); - tor_assert(keyp); - tor_assert(valp); - *keyp = (*iter)->key; - *valp = (*iter)->val; -} - -/** Return true iff iter has advanced past the last entry of - * map. */ -int -strmap_iter_done(strmap_iter_t *iter) -{ - return iter == NULL; -} - -/** Return true iff iter has advanced past the last entry of - * map. */ -int -digestmap_iter_done(digestmap_iter_t *iter) -{ - return iter == NULL; -} - -/** Remove all entries from map, and deallocate storage for those - * entries. If free_val is provided, it is invoked on every value in - * map. - */ -MOCK_IMPL(void, -strmap_free,(strmap_t *map, void (*free_val)(void*))) -{ - strmap_entry_t **ent, **next, *this; - if (!map) - return; - - for (ent = HT_START(strmap_impl, &map->head); ent != NULL; ent = next) { - this = *ent; - next = HT_NEXT_RMV(strmap_impl, &map->head, ent); - tor_free(this->key); - if (free_val) - free_val(this->val); - tor_free(this); - } - tor_assert(HT_EMPTY(&map->head)); - HT_CLEAR(strmap_impl, &map->head); - tor_free(map); -} - -/** Remove all entries from map, and deallocate storage for those - * entries. If free_val is provided, it is invoked on every value in - * map. - */ -MOCK_IMPL(void, -digestmap_free, (digestmap_t *map, void (*free_val)(void*))) -{ - digestmap_entry_t **ent, **next, *this; - if (!map) - return; - for (ent = HT_START(digestmap_impl, &map->head); ent != NULL; ent = next) { - this = *ent; - next = HT_NEXT_RMV(digestmap_impl, &map->head, ent); - if (free_val) - free_val(this->val); - tor_free(this); - } - tor_assert(HT_EMPTY(&map->head)); - HT_CLEAR(digestmap_impl, &map->head); - tor_free(map); -} - -/** Fail with an assertion error if anything has gone wrong with the internal - * representation of map. */ -void -strmap_assert_ok(const strmap_t *map) -{ - tor_assert(!strmap_impl_HT_REP_IS_BAD_(&map->head)); -} -/** Fail with an assertion error if anything has gone wrong with the internal - * representation of map. */ -void -digestmap_assert_ok(const digestmap_t *map) -{ - tor_assert(!digestmap_impl_HT_REP_IS_BAD_(&map->head)); -} - -/** Return true iff map has no entries. */ -int -strmap_isempty(const strmap_t *map) -{ - return HT_EMPTY(&map->head); -} - -/** Return true iff map has no entries. */ -int -digestmap_isempty(const digestmap_t *map) -{ - return HT_EMPTY(&map->head); -} - -/** Return the number of items in map. */ -int -strmap_size(const strmap_t *map) -{ - return HT_SIZE(&map->head); -} - -/** Return the number of items in map. */ -int -digestmap_size(const digestmap_t *map) -{ - return HT_SIZE(&map->head); -} - /** Declare a function called funcname that acts as a find_nth_FOO * function for an array of type elt_t*. * diff --git a/src/common/container.h b/src/common/container.h index def3d76..d3d20af 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -346,6 +346,9 @@ char *smartlist_join_strings2(smartlist_t *sl, const char *join, DECLARE_MAP_FNS(strmap_t, const char *, strmap_); /* Map from const char[DIGEST_LEN] to void *. Implemented with a hash table. */ DECLARE_MAP_FNS(digestmap_t, const char *, digestmap_); +/* Map from const uint8_t[DIGEST_LEN] to void *. Implemented with a hash + * table. */ +DECLARE_MAP_FNS(digest256map_t, const uint8_t *, digest256map_); #undef DECLARE_MAP_FNS @@ -461,6 +464,13 @@ DECLARE_MAP_FNS(digestmap_t, const char *, digestmap_); /** Used to end a DIGESTMAP_FOREACH() block. */ #define DIGESTMAP_FOREACH_END MAP_FOREACH_END +#define DIGEST256MAP_FOREACH(map, keyvar, valtype, valvar) \ + MAP_FOREACH(digest256map_, map, const uint8_t *, keyvar, valtype, valvar) +#define DIGEST256MAP_FOREACH_MODIFY(map, keyvar, valtype, valvar) \ + MAP_FOREACH_MODIFY(digest256map_, map, const uint8_t *, \ + keyvar, valtype, valvar) +#define DIGEST256MAP_FOREACH_END MAP_FOREACH_END + #define STRMAP_FOREACH(map, keyvar, valtype, valvar) \ MAP_FOREACH(strmap_, map, const char *, keyvar, valtype, valvar) #define STRMAP_FOREACH_MODIFY(map, keyvar, valtype, valvar) \ [View Less]

1 0

[support-tools/master] Add script to sort out spam from ham depending on ticket status
by lunar＠torproject.org 31 Oct '14

31 Oct '14

commit bbdf8b1868a21006fc8eaae72b35d16c5183f1d8 Author: Lunar <lunar(a)torproject.org> Date: Fri Oct 31 14:32:40 2014 +0100 Add script to sort out spam from ham depending on ticket status --- train-spam-filters/train_spam_filters | 119 +++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/train-spam-filters/train_spam_filters b/train-spam-filters/train_spam_filters new file mode 100755 index 0000000..c8f64dc --- /dev/null +++ b/train-spam-filters/… [View More]train_spam_filters @@ -0,0 +1,119 @@ +#!/usr/bin/python +# +# This program is free software. It comes without any warranty, to +# the extent permitted by applicable law. You can redistribute it +# and/or modify it under the terms of the Do What The Fuck You Want +# To Public License, Version 2, as published by Sam Hocevar. See +# http://sam.zoy.org/wtfpl/COPYING for more details. + +from __future__ import print_function + +import email.parser +import psycopg2 +import os +import os.path +from datetime import datetime, timedelta + +DEBUG = False + +MAILDIR_ROOT = os.path.join(os.environ['HOME'], 'Maildir') +SPAM_MAILDIR = '.spam.learn' +HAM_MAILDIR = '.xham.learn' + +KEEP_FOR_MAX_DAYS = 100 + +RT_CONNINFO = "host=drobovi.torproject.org sslmode=require user=rtreader dbname=rt" + +SELECT_HAM_TICKET_QUERY = """ + SELECT DISTINCT Tickets.Id + FROM Queues, Tickets, Transactions + LEFT OUTER JOIN Attachments ON Attachments.TransactionId = Transactions.Id + WHERE Queues.Name LIKE 'help%%' + AND Tickets.Queue = Queues.Id + AND Tickets.Status = 'resolved' + AND Transactions.ObjectId = Tickets.Id + AND Transactions.ObjectType = 'RT::Ticket' + AND Attachments.MessageId = %s; +""" + +SELECT_SPAM_TICKET_QUERY = """ + SELECT DISTINCT Tickets.Id + FROM Queues, Tickets, Transactions + LEFT OUTER JOIN Attachments ON Attachments.TransactionId = Transactions.Id + WHERE Queues.Name = 'spam' + AND Tickets.Queue = Queues.Id + AND Tickets.Status = 'rejected' + AND Transactions.ObjectId = Tickets.Id + AND Transactions.ObjectType = 'RT::Ticket' + AND Attachments.MessageId = %s; +""" + +EMAIL_PARSER = email.parser.Parser() + +if DEBUG: + def log(msg): + print(msg) +else: + def log(msg): + pass + +def is_ham(msg_id): + global con + + cur = con.cursor() + try: + cur.execute(SELECT_HAM_TICKET_QUERY, (msg_id,)) + return cur.fetchone() is not None + finally: + cur.close() + +def is_spam(msg_id): + global con + + cur = con.cursor() + try: + cur.execute(SELECT_SPAM_TICKET_QUERY, (msg_id,)) + return cur.fetchone() is not None + finally: + cur.close() + +def handle_message(path): + msg = EMAIL_PARSER.parse(open(path), headersonly=True) + msg_id = msg['Message-Id'] + if not msg_id.startswith('<') or not msg_id.endswith('>'): + log("%s: bad Message-Id, removing." % path) + print("os.unlink(" + path) + return + msg_id = msg_id[1:-1] + if is_ham(msg_id): + os.rename(path, os.path.join(MAILDIR_ROOT, HAM_MAILDIR, 'cur', os.path.basename(path))) + log("%s: ham, moving." % path) + return + if is_spam(msg_id): + os.rename(path, os.path.join(MAILDIR_ROOT, SPAM_MAILDIR, 'cur', os.path.basename(path))) + log("%s: spam, moving." % path) + return + mtime = datetime.fromtimestamp(os.stat(path).st_mtime) + limit = datetime.now() - timedelta(days=KEEP_FOR_MAX_DAYS) + if mtime <= limit: + log("%s: too old, removing." % path) + print("os.unlink(" + path) + return + # well, it's not identified ham, not identified spam, and not too old + # let's keep the message for now + log("%s: unknown, keeping." % path) + +def scan_directory(dir_path): + for filename in os.listdir(dir_path): + path = os.path.join(dir_path, filename) + handle_message(path) + +con = None + +if __name__ == '__main__': + con = psycopg2.connect(RT_CONNINFO) + for filename in os.listdir(MAILDIR_ROOT): + if filename.startswith('.help'): + for subdir in ['new', 'cur', 'tmp']: + scan_directory(os.path.join(MAILDIR_ROOT, filename, subdir)) + con.close() [View Less]

1 0

[tor/master] Repair format_changelog.py drupal breaks a little more. Drupal is weird.
by nickm＠torproject.org 31 Oct '14

31 Oct '14

commit 5ad87218389050fef48b1a123aab1260cdfb8d7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 31 09:13:08 2014 -0400 Repair format_changelog.py drupal breaks a little more. Drupal is weird. --- scripts/maint/format_changelog.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py index 4f3c62d..3fe5161 100755 --- a/scripts/maint/format_changelog.py +++ b/scripts/maint/format_changelog.py @@ -… [View More]

1 0

[tor/master] Silence spurious clang warnings
by nickm＠torproject.org 31 Oct '14

31 Oct '14

commit 13298d90a90dc62d21d38f910171c9b57a8f0273 Author: teor <teor2345(a)gmail.com> Date: Sun Oct 26 14:43:55 2014 +1100 Silence spurious clang warnings Silence clang warnings under --enable-expensive-hardening, including: + implicit truncation of 64 bit values to 32 bit; + const char assignment to self; + tautological compare; and + additional parentheses around equality tests. (gcc uses these to silence assignment, so clang warns when they'… [View More]re present in an equality test. But we need to use extra parentheses in macros to isolate them from other code). --- changes/spurious-clang-warnings | 10 ++++++++++ src/common/compat.c | 9 +++++---- src/common/compat.h | 9 +++++---- src/common/crypto_pwbox.c | 2 +- src/ext/ht.h | 3 ++- src/ext/tor_queue.h | 23 +++++++++++++++-------- src/or/channeltls.c | 4 ++-- src/or/circuitmux_ewma.c | 4 ++-- src/or/connection.h | 3 ++- src/or/or.h | 5 +++-- 10 files changed, 47 insertions(+), 25 deletions(-) diff --git a/changes/spurious-clang-warnings b/changes/spurious-clang-warnings new file mode 100644 index 0000000..d039920 --- /dev/null +++ b/changes/spurious-clang-warnings @@ -0,0 +1,10 @@ + o Minor bugfixes: + - Silence clang warnings under --enable-expensive-hardening, including: + + implicit truncation of 64 bit values to 32 bit; + + const char assignment to self; + + tautological compare; and + + additional parentheses around equality tests. (gcc uses these to + silence assignment, so clang warns when they're present in an + equality test. But we need to use extra parentheses in macros to + isolate them from other code). + Fixes bug 13577. diff --git a/src/common/compat.c b/src/common/compat.c index 0c04892..e4758aa 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -138,9 +138,10 @@ int tor_open_cloexec(const char *path, int flags, unsigned mode) { int fd; + const char *p = path; #ifdef O_CLOEXEC - path = sandbox_intern_string(path); - fd = open(path, flags|O_CLOEXEC, mode); + p = sandbox_intern_string(path); + fd = open(p, flags|O_CLOEXEC, mode); if (fd >= 0) return fd; /* If we got an error, see if it is EINVAL. EINVAL might indicate that, @@ -150,8 +151,8 @@ tor_open_cloexec(const char *path, int flags, unsigned mode) return -1; #endif - log_debug(LD_FS, "Opening %s with flags %x", path, flags); - fd = open(path, flags, mode); + log_debug(LD_FS, "Opening %s with flags %x", p, flags); + fd = open(p, flags, mode); #ifdef FD_CLOEXEC if (fd >= 0) { if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) { diff --git a/src/common/compat.h b/src/common/compat.h index a61ed00..f2eef5b 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -562,17 +562,18 @@ const char *tor_socket_strerror(int e); #else #define SOCK_ERRNO(e) e #if EAGAIN == EWOULDBLOCK -#define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN) +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ +#define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN || 0) #else #define ERRNO_IS_EAGAIN(e) ((e) == EAGAIN || (e) == EWOULDBLOCK) #endif -#define ERRNO_IS_EINPROGRESS(e) ((e) == EINPROGRESS) -#define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS) +#define ERRNO_IS_EINPROGRESS(e) ((e) == EINPROGRESS || 0) +#define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS || 0) #define ERRNO_IS_ACCEPT_EAGAIN(e) \ (ERRNO_IS_EAGAIN(e) || (e) == ECONNABORTED) #define ERRNO_IS_ACCEPT_RESOURCE_LIMIT(e) \ ((e) == EMFILE || (e) == ENFILE || (e) == ENOBUFS || (e) == ENOMEM) -#define ERRNO_IS_EADDRINUSE(e) ((e) == EADDRINUSE) +#define ERRNO_IS_EADDRINUSE(e) (((e) == EADDRINUSE) || 0) #define tor_socket_errno(sock) (errno) #define tor_socket_strerror(e) strerror(e) #endif diff --git a/src/common/crypto_pwbox.c b/src/common/crypto_pwbox.c index 91659db..b866c7e 100644 --- a/src/common/crypto_pwbox.c +++ b/src/common/crypto_pwbox.c @@ -62,7 +62,7 @@ crypto_pwbox(uint8_t **out, size_t *outlen_out, pwbox_encoded_setlen_data(enc, encrypted_len); encrypted_portion = pwbox_encoded_getarray_data(enc); - set_uint32(encrypted_portion, htonl(input_len)); + set_uint32(encrypted_portion, htonl((uint32_t)input_len)); memcpy(encrypted_portion+4, input, input_len); /* Now that all the data is in position, derive some keys, encrypt, and diff --git a/src/ext/ht.h b/src/ext/ht.h index 1cca28e..09f5dcc 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -38,8 +38,9 @@ } #endif +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ #define HT_EMPTY(head) \ - ((head)->hth_n_entries == 0) + (((head)->hth_n_entries == 0) || 0) /* How many elements in 'head'? */ #define HT_SIZE(head) \ diff --git a/src/ext/tor_queue.h b/src/ext/tor_queue.h index f05e48c..a6530c2 100644 --- a/src/ext/tor_queue.h +++ b/src/ext/tor_queue.h @@ -109,7 +109,8 @@ struct { \ */ #define TOR_SLIST_FIRST(head) ((head)->slh_first) #define TOR_SLIST_END(head) NULL -#define TOR_SLIST_EMPTY(head) (SLIST_FIRST(head) == TOR_SLIST_END(head)) +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ +#define TOR_SLIST_EMPTY(head) ((SLIST_FIRST(head) == TOR_SLIST_END(head)) || 0) #define TOR_SLIST_NEXT(elm, field) ((elm)->field.sle_next) #define TOR_SLIST_FOREACH(var, head, field) \ @@ -181,9 +182,11 @@ struct { \ /* * List access methods */ -#define TOR_LIST_FIRST(head) ((head)->lh_first) -#define TOR_LIST_END(head) NULL -#define TOR_LIST_EMPTY(head) (TOR_LIST_FIRST(head) == TOR_LIST_END(head)) +#define TOR_LIST_FIRST(head) ((head)->lh_first) +#define TOR_LIST_END(head) NULL +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ +#define TOR_LIST_EMPTY(head) \ + ((TOR_LIST_FIRST(head) == TOR_LIST_END(head)) || 0) #define TOR_LIST_NEXT(elm, field) ((elm)->field.le_next) #define TOR_LIST_FOREACH(var, head, field) \ @@ -265,8 +268,10 @@ struct { \ * Simple queue access methods. */ #define TOR_SIMPLEQ_FIRST(head) ((head)->sqh_first) -#define TOR_SIMPLEQ_END(head) NULL -#define TOR_SIMPLEQ_EMPTY(head) (TOR_SIMPLEQ_FIRST(head) == TOR_SIMPLEQ_END(head)) +#define TOR_SIMPLEQ_END(head) NULL +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ +#define TOR_SIMPLEQ_EMPTY(head) \ + ((TOR_SIMPLEQ_FIRST(head) == TOR_SIMPLEQ_END(head)) || 0) #define TOR_SIMPLEQ_NEXT(elm, field) ((elm)->field.sqe_next) #define TOR_SIMPLEQ_FOREACH(var, head, field) \ @@ -345,8 +350,9 @@ struct { \ /* XXX */ #define TOR_TAILQ_PREV(elm, headname, field) \ (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ #define TOR_TAILQ_EMPTY(head) \ - (TOR_TAILQ_FIRST(head) == TOR_TAILQ_END(head)) + ((TOR_TAILQ_FIRST(head) == TOR_TAILQ_END(head)) || 0) #define TOR_TAILQ_FOREACH(var, head, field) \ for((var) = TOR_TAILQ_FIRST(head); \ @@ -462,8 +468,9 @@ struct { \ #define TOR_CIRCLEQ_END(head) ((void *)(head)) #define TOR_CIRCLEQ_NEXT(elm, field) ((elm)->field.cqe_next) #define TOR_CIRCLEQ_PREV(elm, field) ((elm)->field.cqe_prev) +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ #define TOR_CIRCLEQ_EMPTY(head) \ - (TOR_CIRCLEQ_FIRST(head) == TOR_CIRCLEQ_END(head)) + ((TOR_CIRCLEQ_FIRST(head) == TOR_CIRCLEQ_END(head)) || 0) #define TOR_CIRCLEQ_FOREACH(var, head, field) \ for((var) = TOR_CIRCLEQ_FIRST(head); \ diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f5f345b..db044ae 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -847,8 +847,8 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan, tor_assert(conn); tor_assert(conn->chan == chan); tor_assert(chan->conn == conn); - /* -Werror appeasement */ - tor_assert(old_state == old_state); + /* Shut the compiler up without triggering -Wtautological-compare */ + (void)old_state; base_chan = TLS_CHAN_TO_BASE(chan); diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c index d8cd6c3..49d899e 100644 --- a/src/or/circuitmux_ewma.c +++ b/src/or/circuitmux_ewma.c @@ -273,8 +273,8 @@ ewma_alloc_circ_data(circuitmux_t *cmux, tor_assert(circ); tor_assert(direction == CELL_DIRECTION_OUT || direction == CELL_DIRECTION_IN); - /* Shut the compiler up */ - tor_assert(cell_count == cell_count); + /* Shut the compiler up without triggering -Wtautological-compare */ + (void)cell_count; cdata = tor_malloc_zero(sizeof(*cdata)); cdata->base_.magic = EWMA_POL_CIRC_DATA_MAGIC; diff --git a/src/or/connection.h b/src/or/connection.h index 917a6fb..7cdfd3e 100644 --- a/src/or/connection.h +++ b/src/or/connection.h @@ -189,7 +189,8 @@ dir_connection_t *connection_dir_get_by_purpose_and_resource( int any_other_active_or_conns(const or_connection_t *this_conn); -#define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ +#define connection_speaks_cells(conn) (((conn)->type == CONN_TYPE_OR) || 0) int connection_is_listener(connection_t *conn); int connection_state_is_open(connection_t *conn); int connection_state_is_connecting(connection_t *conn); diff --git a/src/or/or.h b/src/or/or.h index eaf6092..6170c21 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -241,7 +241,7 @@ typedef enum { #define PROXY_CONNECT 1 #define PROXY_SOCKS4 2 #define PROXY_SOCKS5 3 -/* !!!! If there is ever a PROXY_* type over 2, we must grow the proxy_type +/* !!!! If there is ever a PROXY_* type over 3, we must grow the proxy_type * field in or_connection_t */ /* Pluggable transport proxy type. Don't use this in or_connection_t, @@ -4317,7 +4317,8 @@ static INLINE void or_state_mark_dirty(or_state_t *state, time_t when) /** Please turn this IP address into an FQDN, privately. */ #define SOCKS_COMMAND_RESOLVE_PTR 0xF1 -#define SOCKS_COMMAND_IS_CONNECT(c) ((c)==SOCKS_COMMAND_CONNECT) +/* || 0 is for -Wparentheses-equality (-Wall?) appeasement under clang */ +#define SOCKS_COMMAND_IS_CONNECT(c) (((c)==SOCKS_COMMAND_CONNECT) || 0) #define SOCKS_COMMAND_IS_RESOLVE(c) ((c)==SOCKS_COMMAND_RESOLVE || \ (c)==SOCKS_COMMAND_RESOLVE_PTR) [View Less]

1 0

[tor/master] Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'
by nickm＠torproject.org 31 Oct '14

31 Oct '14

commit 6f87aa3371ff3542c58c0083e9f44c470103d94d Merge: 96e3936 13298d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 31 08:52:07 2014 -0400 Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273' changes/spurious-clang-warnings | 10 ++++++++++ src/common/compat.c | 9 +++++---- src/common/compat.h | 9 +++++---- src/common/crypto_pwbox.c | 2 +- src/ext/ht.h | 3 ++- src/ext/tor_queue.h | … [View More]

1 0