- tor-commits - lists.torproject.org

[tor/master] Fix minor comment issues
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit d7254bea11a0fc2685cc2ea24fb57d2ab3945b2f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:28:40 2011 -0700 Fix minor comment issues --- src/common/compat.c | 2 +- src/or/connection.c | 6 +++--- src/or/or.h | 6 +++--- src/test/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 9377959..c983925 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -415,7 +415,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) * * This function is not timing-safe. * - * Requires that nlen be greater than zero. + * Requires that nlen be greater than zero. */ const void * tor_memmem(const void *_haystack, size_t hlen, diff --git a/src/or/connection.c b/src/or/connection.c index a9e3a74..b2412a2 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2751,15 +2751,15 @@ connection_outbuf_too_full(connection_t *conn) return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); } -/** Try to flush more bytes onto conn-\>s. +/** Try to flush more bytes onto conn-\>s. * * This function gets called either from conn_write() in main.c * when poll() has declared that conn wants to write, or below * from connection_write_to_buf() when an entire TLS record is ready. * - * Update conn-\>timestamp_lastwritten to now, and call flush_buf + * Update conn-\>timestamp_lastwritten to now, and call flush_buf * or flush_buf_tls appropriately. If it succeeds and there are no more - * more bytes on conn->outbuf, then call connection_finished_flushing + * more bytes on conn-\>outbuf, then call connection_finished_flushing * on it too. * * If force, then write as many bytes as possible, ignoring bandwidth diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..1909887 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2318,14 +2318,14 @@ typedef struct or_circuit_t { cell_ewma_t p_cell_ewma; } or_circuit_t; -/** Convert a circuit subtype to a circuit_t.*/ +/** Convert a circuit subtype to a circuit_t. */ #define TO_CIRCUIT(x) (&((x)->_base)) -/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Asserts +/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ static or_circuit_t *TO_OR_CIRCUIT(circuit_t *); /** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t. - * Asserts if the cast is impossible. */ + * Assert if the cast is impossible. */ static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 546fa2f..904719d 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -I"$(top_srcdir)/src/or" # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. -# This seems to matter nowhere but on windows, but I assure you that it +# This seems to matter nowhere but on Windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. test_SOURCES = \

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 8a55da57ed17dfb9cefe3193cbda53a15547630e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:25:51 2011 -0700 Fix comment typo --- src/test/tinytest_demo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index bd33cc3..4d2f588 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -39,7 +39,7 @@ /* ============================================================ */ /* First, let's see if strcmp is working. (All your test cases should be - * functions declared to take a single void * as) an argument. */ + * functions declared to take a single void * as an argument.) */ void test_strcmp(void *data) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 9919b0127568253b6bec4f681db3cdc2b5978991 Merge: 64a5a41 2b5ebc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 22 18:15:27 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 22 +++++++++++++--------- src/common/compat.c | 2 +- src/common/container.c | 5 +++-- src/or/connection.c | 6 +++--- src/or/or.h | 6 +++--- src/test/Makefile.am | 2 +- src/test/tinytest_demo.c | 2 +- 7 files changed, 25 insertions(+), 20 deletions(-)

1 0

[tor/master] Improve documentation of smartlist_split_string
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 2b5ebc70973b1c0dd62201908632733c0953a4ec Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 22 13:47:32 2011 -0700 Improve documentation of smartlist_split_string --- src/common/container.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index da44b7f..1515c38 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -338,7 +338,8 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) /** * Split a string str along all occurrences of sep, - * adding the split strings, in order, to sl. + * appending the (newly allocated) split strings, in order, to + * sl. Return the number of strings added to sl. * * If flags&SPLIT_SKIP_SPACE is true, remove initial and * trailing space from each entry. @@ -347,7 +348,7 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) * If flags&SPLIT_STRIP_SPACE is true, strip spaces from each * split string. * - * If max>0, divide the string into no more than max pieces. If + * If max\>0, divide the string into no more than max pieces. If * sep is NULL, split on any sequence of horizontal space. */ int

1 0

[tor/master] Correct terminology in comment
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 76d0d62bd9ad91c54817f2599305575d9a551f08 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 11:28:52 2011 -0700 Correct terminology in comment --- src/or/or.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 31f9e5b..d44e863 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2197,8 +2197,8 @@ typedef struct { unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ unsigned int is_internal : 1; - /** Did we pick this as a one-hop tunnel (not safe for other conns)? - * These are for encrypted connections that exit to this router, not + /** Did we pick this as a one-hop tunnel (not safe for other streams)? + * These are for encrypted dir conns that exit to this router, not * for arbitrary exits from the circuit. */ unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */

1 0

[tor/master] Store cpath_build_state_t flags in one-bit bitfields, not ints
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 58f801fadf56dcd72c922a6934b166b7651d14d1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 11:28:15 2011 -0700 Store cpath_build_state_t flags in one-bit bitfields, not ints --- src/or/or.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 7daf195..31f9e5b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2192,15 +2192,15 @@ typedef struct { /** How to extend to the planned exit node. */ extend_info_t *chosen_exit; /** Whether every node in the circ must have adequate uptime. */ - int need_uptime; + unsigned int need_uptime : 1; /** Whether every node in the circ must have adequate capacity. */ - int need_capacity; + unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ - int is_internal; + unsigned int is_internal : 1; /** Did we pick this as a one-hop tunnel (not safe for other conns)? * These are for encrypted connections that exit to this router, not * for arbitrary exits from the circuit. */ - int onehop_tunnel; + unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */ crypt_path_t *pending_final_cpath; /** How many times has building a circuit for this task failed? */

1 0

[tor/master] Merge branch 'master' of ssh://git-rw.torproject.org/tor
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 4bbd6a27612e8e48c593dd0683294a980ecb8484 Merge: 9919b01 694cd7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 24 16:48:01 2011 -0400 Merge branch 'master' of ssh://git-rw.torproject.org/tor ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3456'
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 0b536469ee8a6d437cd939cbcdaa56039e27cdcb Merge: 4bbd6a2 76d0d62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 24 16:48:38 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3456' src/or/or.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)

1 0

r24838: {website} bump package versions for 0.2.2.29-beta (website/trunk/include)
by Erinn Clark 24 Jun '11

24 Jun '11

Author: erinn Date: 2011-06-24 20:06:17 +0000 (Fri, 24 Jun 2011) New Revision: 24838 Modified: website/trunk/include/versions.wmi Log: bump package versions for 0.2.2.29-beta Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-06-24 15:56:56 UTC (rev 24837) +++ website/trunk/include/versions.wmi 2011-06-24 20:06:17 UTC (rev 24838) @@ -2,24 +2,24 @@ <define-tag version-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.27-beta-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.9</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.9</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.27-beta</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.10, zlib-1.2.3, openssl-0.9.8p</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.17</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.27-1</define-tag> +<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0

[torflow/master] Fix permissions on bwauthority.py
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 35039739229c5ca58562fccd6d43f7efb3beb3d9 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Jun 17 18:56:37 2011 -0700 Fix permissions on bwauthority.py --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py old mode 100644 new mode 100755

1 0