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

[tor/master] Merge branch 'tor-github/pr/1294'
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit ddd01541b909a84396e2d9ba31266ae63670c938 Merge: fb56b4c2b eb909c4e4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 5 17:12:19 2019 +0300 Merge branch 'tor-github/pr/1294' src/app/config/confparse.c | 9 ++++++ src/app/config/confparse.h | 69 +++++++++++++++++++++++++++++++++++++++++----- src/lib/conf/conftypes.h | 4 +++ 3 files changed, 75 insertions(+), 7 deletions(-) diff --cc src/lib/conf/conftypes.h index 612272e45,3db115204..4609564b3 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@@ -122,9 -100,13 +122,13 @@@ typedef struct struct_member_t * that they have the correct type. */ typedef struct struct_magic_decl_t { + /** The name of the structure */ const char *typename; + /** A value used to recognize instances of this structure. */ uint32_t magic_val; + /** The location within the structure at which we expect to find + * magic_val. */ - int magic_offset; + ptrdiff_t magic_offset; } struct_magic_decl_t; /**

1 0

[tor/master] config: explain CONFIG_TYPE_EXTENDED
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 03ce67d37840f260f478009caa04aad1aa9b60c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 11:54:42 2019 -0400 config: explain CONFIG_TYPE_EXTENDED Also add an explanation of a possible future refactoring where we might remove the config_type_t enumeration entierly. Fixes ticket 31624. No changes file, since this is a comment-only change. --- src/lib/conf/conftypes.h | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index fabad97d0..15662ba00 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -63,8 +63,17 @@ typedef enum config_type_t { * context-sensitive config lines when fetching. */ CONFIG_TYPE_OBSOLETE, /**< Obsolete (ignored) option. */ - CONFIG_TYPE_EXTENDED, /**< Extended type; definition will appear in - * pointer. */ + /** + * Extended type: definition appears in the type_def pointer + * of the corresponding struct_member_t. + * + * For some types, we cannot define them as particular values of this + * enumeration, since those types are abstractions defined at a higher level + * than this module. (For example, parsing a routerset_t is higher-level + * than this module.) To handle this, we use CONFIG_TYPE_EXTENDED for those + * types, and give a definition for them in the struct_member_t.type_def. + **/ + CONFIG_TYPE_EXTENDED, } config_type_t; /* Forward delcaration for var_type_def_t, for extended types. */ @@ -74,15 +83,26 @@ struct var_type_def_t; typedef struct struct_member_t { /** Name of the field. */ const char *name; - /** Type of the field, according to the config_type_t enumeration. + /** + * Type of the field, according to the config_type_t enumeration. * - * This value is CONFIG_TYPE_EXTENDED for any type not listed in - * config_type_t. + * For any type not otherwise listed in config_type_t, this field's value + * should be CONFIG_TYPE_EXTENDED. When it is, the type_def pointer + * must be set. **/ + /* + * NOTE: In future refactoring, we might remove this field entirely, along + * with its corresponding enumeration. In that case, we will require that + * type_def be set in all cases. If we do, we will also need a new mechanism + * to enforce consistency between configuration variable types and their + * corresponding structures, since our current design in + * lib/conf/conftesting.h won't work any more. + */ config_type_t type; /** * Pointer to a type definition for the type of this field. Overrides - * type if not NULL. + * type if it is not NULL. Must be set when type is + * CONFIG_TYPE_EXTENDED. **/ const struct var_type_def_t *type_def; /**

1 0

[tor/master] Merge branch 'tor-github/pr/1293'
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit fb56b4c2bffe5d1d752694901b1853d89e3fb8cc Merge: c750ec20a 03ce67d37 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 5 17:10:07 2019 +0300 Merge branch 'tor-github/pr/1293' src/lib/conf/conftypes.h | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-)

1 0

[tor/master] smartlist_pqueue: use ptrdiff_t instead of int for offsets.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit dc199f40fb03588af0bccb149a564e895e11d60d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 10:56:14 2019 -0400 smartlist_pqueue: use ptrdiff_t instead of int for offsets. This is technically correct, but should not matter in practice, since we don't use this on any structs whose size exceeds INT_MAX. --- src/lib/container/smartlist.c | 10 +++++----- src/lib/container/smartlist.h | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c index 3ab2797d6..2b71c1128 100644 --- a/src/lib/container/smartlist.c +++ b/src/lib/container/smartlist.c @@ -678,7 +678,7 @@ smartlist_sort_pointers(smartlist_t *sl) static inline void smartlist_heapify(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset, + ptrdiff_t idx_field_offset, int idx) { while (1) { @@ -725,7 +725,7 @@ smartlist_heapify(smartlist_t *sl, void smartlist_pqueue_add(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset, + ptrdiff_t idx_field_offset, void *item) { int idx; @@ -754,7 +754,7 @@ smartlist_pqueue_add(smartlist_t *sl, void * smartlist_pqueue_pop(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset) + ptrdiff_t idx_field_offset) { void *top; tor_assert(sl->num_used); @@ -778,7 +778,7 @@ smartlist_pqueue_pop(smartlist_t *sl, void smartlist_pqueue_remove(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset, + ptrdiff_t idx_field_offset, void *item) { int idx = IDX_OF_ITEM(item); @@ -802,7 +802,7 @@ smartlist_pqueue_remove(smartlist_t *sl, void smartlist_pqueue_assert_ok(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset) + ptrdiff_t idx_field_offset) { int i; for (i = sl->num_used - 1; i >= 0; --i) { diff --git a/src/lib/container/smartlist.h b/src/lib/container/smartlist.h index 81b015143..25638e4b2 100644 --- a/src/lib/container/smartlist.h +++ b/src/lib/container/smartlist.h @@ -13,6 +13,7 @@ **/ #include <stdarg.h> +#include <stddef.h> #include "lib/smartlist_core/smartlist_core.h" #include "lib/smartlist_core/smartlist_foreach.h" @@ -72,18 +73,18 @@ int smartlist_bsearch_idx(const smartlist_t *sl, const void *key, void smartlist_pqueue_add(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset, + ptrdiff_t idx_field_offset, void *item); void *smartlist_pqueue_pop(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset); + ptrdiff_t idx_field_offset); void smartlist_pqueue_remove(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset, + ptrdiff_t idx_field_offset, void *item); void smartlist_pqueue_assert_ok(smartlist_t *sl, int (*compare)(const void *a, const void *b), - int idx_field_offset); + ptrdiff_t idx_field_offset); char *smartlist_join_strings(smartlist_t *sl, const char *join, int terminate, size_t *len_out) ATTR_MALLOC;

1 0

[tor/master] compat_compiler: fix documentation for STRUCT_VAR_P
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit b39ee42904d9210ff3b6872d69535d32f588f907 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 10:56:57 2019 -0400 compat_compiler: fix documentation for STRUCT_VAR_P Previously we had said that off_t was a reasonable type to hold the result of offsetof(). That isn't so: ptrdiff_t is correct. --- src/lib/cc/compat_compiler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index a8d159321..92301449e 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -195,7 +195,7 @@ * structure st. Example: * <pre> * struct a { int foo; int bar; } x; - * off_t bar_offset = offsetof(struct a, bar); + * ptrdiff_t bar_offset = offsetof(struct a, bar); * int *bar_p = STRUCT_VAR_P(&x, bar_offset); * *bar_p = 3; * </pre>

1 0

[tor/master] config: use ptrdiff_t for all field-offset members.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 539158f2be6001a7849b7a85e053e43d7d78195a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 10:50:09 2019 -0400 config: use ptrdiff_t for all field-offset members. Previously we used int here, but it is more correct to use ptrdiff_t. (This never actually matters for our code in practice, since the structure we are managing here never exceed INT_MAX in size.) --- src/app/config/confparse.h | 2 +- src/lib/conf/conftypes.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h index b788e2cd1..fc07996aa 100644 --- a/src/app/config/confparse.h +++ b/src/app/config/confparse.h @@ -72,7 +72,7 @@ typedef struct config_format_t { const struct_member_t *extra; /** The position of a config_suite_t pointer within the toplevel object, * or -1 if there is no such pointer. */ - int config_suite_offset; + ptrdiff_t config_suite_offset; } config_format_t; /** diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index fabad97d0..abfb53b21 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -33,6 +33,8 @@ #include "lib/conf/conftesting.h" #endif +#include <stddef.h> + /** Enumeration of types which option values can take */ typedef enum config_type_t { CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */ @@ -89,7 +91,7 @@ typedef struct struct_member_t { * Offset of this field within the structure. Compute this with * offsetof(structure, fieldname). **/ - int offset; + ptrdiff_t offset; } struct_member_t; /** @@ -102,7 +104,7 @@ typedef struct struct_member_t { typedef struct struct_magic_decl_t { const char *typename; uint32_t magic_val; - int magic_offset; + ptrdiff_t magic_offset; } struct_magic_decl_t; /**

1 0

[tor/master] rendclient: use ptrdiff, not off_t, for offset of DH field.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit ec724fe8c8baf245a4cada85bb8b8b4832f6e725 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 10:59:18 2019 -0400 rendclient: use ptrdiff, not off_t, for offset of DH field. The off_t type is only useful for offsets on the filesystem. For in-memory offsets, use ptrdiff_t. --- src/feature/rend/rendclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/rend/rendclient.c b/src/feature/rend/rendclient.c index 5bdd4d453..2540066df 100644 --- a/src/feature/rend/rendclient.c +++ b/src/feature/rend/rendclient.c @@ -119,7 +119,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, char tmp[RELAY_PAYLOAD_SIZE]; rend_cache_entry_t *entry = NULL; crypt_path_t *cpath; - off_t dh_offset; + ptrdiff_t dh_offset; crypto_pk_t *intro_key = NULL; int status = 0; const char *onion_address;

1 0

[tor/master] buffers: use ptrdiff_t to indicate offsets.
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 3aba13f77927e669d80009b2318c6d3d3d90a922 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 11:06:15 2019 -0400 buffers: use ptrdiff_t to indicate offsets. Previously we used int in some places and off_t for others. Neither is correct: ptrdiff_t is right for differences between pointers. (off_t is only for offsets and sizes on the filesystem.) --- src/lib/buf/buffers.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 88a25b847..4d026bd37 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -158,7 +158,7 @@ chunk_new_with_alloc_size(size_t alloc) static inline chunk_t * chunk_grow(chunk_t *chunk, size_t sz) { - off_t offset; + ptrdiff_t offset; const size_t memlen_orig = chunk->memlen; const size_t orig_alloc = CHUNK_ALLOC_SIZE(memlen_orig); const size_t new_alloc = CHUNK_ALLOC_SIZE(sz); @@ -440,7 +440,7 @@ chunk_copy(const chunk_t *in_chunk) #endif newch->next = NULL; if (in_chunk->data) { - off_t offset = in_chunk->data - in_chunk->mem; + ptrdiff_t offset = in_chunk->data - in_chunk->mem; newch->data = newch->mem + offset; } return newch; @@ -710,7 +710,8 @@ buf_move_all(buf_t *buf_out, buf_t *buf_in) /** Internal structure: represents a position in a buffer. */ typedef struct buf_pos_t { const chunk_t *chunk; /**< Which chunk are we pointing to? */ - int pos;/**< Which character inside the chunk's data are we pointing to? */ + ptrdiff_t pos;/**< Which character inside the chunk's data are we pointing + * to? */ size_t chunk_pos; /**< Total length of all previous chunks. */ } buf_pos_t; @@ -726,15 +727,15 @@ buf_pos_init(const buf_t *buf, buf_pos_t *out) /** Advance out to the first appearance of ch at the current * position of out, or later. Return -1 if no instances are found; * otherwise returns the absolute position of the character. */ -static off_t +static ptrdiff_t buf_find_pos_of_char(char ch, buf_pos_t *out) { const chunk_t *chunk; - int pos; + ptrdiff_t pos; tor_assert(out); if (out->chunk) { if (out->chunk->datalen) { - tor_assert(out->pos < (off_t)out->chunk->datalen); + tor_assert(out->pos < (ptrdiff_t)out->chunk->datalen); } else { tor_assert(out->pos == 0); } @@ -762,7 +763,7 @@ buf_pos_inc(buf_pos_t *pos) { tor_assert(pos->pos < INT_MAX - 1); ++pos->pos; - if (pos->pos == (off_t)pos->chunk->datalen) { + if (pos->pos == (ptrdiff_t)pos->chunk->datalen) { if (!pos->chunk->next) return -1; pos->chunk_pos += pos->chunk->datalen; @@ -836,11 +837,11 @@ buf_peek_startswith(const buf_t *buf, const char *cmd) /** Return the index within buf at which ch first appears, * or -1 if ch does not appear on buf. */ -static off_t +static ptrdiff_t buf_find_offset_of_char(buf_t *buf, char ch) { chunk_t *chunk; - off_t offset = 0; + ptrdiff_t offset = 0; tor_assert(buf->datalen < INT_MAX); for (chunk = buf->head; chunk; chunk = chunk->next) { char *cp = memchr(chunk->data, ch, chunk->datalen); @@ -863,7 +864,7 @@ int buf_get_line(buf_t *buf, char *data_out, size_t *data_len) { size_t sz; - off_t offset; + ptrdiff_t offset; if (!buf->head) return 0;

1 0

[tor/master] Merge branch 'tor-github/pr/1291'
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit c750ec20ab3f24fad09695317da55888788e772e Merge: c29f05b15 106b75aa5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Sep 5 17:09:20 2019 +0300 Merge branch 'tor-github/pr/1291' changes/ticket31532 | 4 ++++ src/app/config/confparse.h | 2 +- src/feature/rend/rendclient.c | 2 +- src/lib/buf/buffers.c | 21 +++++++++++---------- src/lib/cc/compat_compiler.h | 2 +- src/lib/conf/conftypes.h | 6 ++++-- src/lib/container/smartlist.c | 10 +++++----- src/lib/container/smartlist.h | 9 +++++---- 8 files changed, 32 insertions(+), 24 deletions(-)

1 0

[tor/master] changes file for 31532
by asn＠torproject.org 05 Sep '19

05 Sep '19

commit 106b75aa5398f7a260a4d0f3093c244376258242 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 11:09:01 2019 -0400 changes file for 31532 --- changes/ticket31532 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket31532 b/changes/ticket31532 new file mode 100644 index 000000000..95bcbc517 --- /dev/null +++ b/changes/ticket31532 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Use the ptrdiff_t type consistently for expressing variable offsets and + pointer differences. Previously we incorrectly (but harmlessly) used + int and sometimes off_t for these cases. Closes ticket 31532.

1 0