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

[tor/release-0.2.5] Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit dd22ab519ab9ac7affa3bd775b6021049ebe7dd9 Merge: 8391c96 1196ed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:51:39 2014 -0400 Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5 changes/bug12700 | 10 ++++++++++ src/or/relay.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor/release-0.2.5] Fix relay_command_to_string(); solve 12700.
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 1196ed7cc4fc202e43ca102a73befe62aa65767d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 18 13:19:43 2014 -0400 Fix relay_command_to_string(); solve 12700. Two bugs here: 1) We didn't add EXTEND2/EXTENDED2 to relay_command_to_string(). 2) relay_command_to_string() didn't log the value of unrecognized commands. Both fixed here. --- changes/bug12700 | 10 ++++++++++ src/or/relay.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/bug12700 b/changes/bug12700 new file mode 100644 index 0000000..1d8caeb --- /dev/null +++ b/changes/bug12700 @@ -0,0 +1,10 @@ + o Minor bugfixes: + - When logging information about an EXTEND2 or EXTENDED2 cell, log + their names correctly. Fixes part of bug 12700; bugfix on + 0.2.4.8-alpha. + + o Minor bugfixes: + - When logging information about a relay cell whose command we + don't recognize, log its command as an integer. Fixes part of + bug 12700; bugfix on 0.2.1.10-alpha. + diff --git a/src/or/relay.c b/src/or/relay.c index 7f06c6e..fffd45d 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -517,6 +517,7 @@ relay_header_unpack(relay_header_t *dest, const uint8_t *src) static const char * relay_command_to_string(uint8_t command) { + static char buf[64]; switch (command) { case RELAY_COMMAND_BEGIN: return "BEGIN"; case RELAY_COMMAND_DATA: return "DATA"; @@ -541,7 +542,12 @@ relay_command_to_string(uint8_t command) case RELAY_COMMAND_RENDEZVOUS_ESTABLISHED: return "RENDEZVOUS_ESTABLISHED"; case RELAY_COMMAND_INTRODUCE_ACK: return "INTRODUCE_ACK"; - default: return "(unrecognized)"; + case RELAY_COMMAND_EXTEND2: return "EXTEND2"; + case RELAY_COMMAND_EXTENDED2: return "EXTENDED2"; + default: + tor_snprintf(buf, sizeof(buf), "Unrecognized relay command %u", + (unsigned)command); + return buf; } }

1 0

[tor/maint-0.2.5] Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit dd22ab519ab9ac7affa3bd775b6021049ebe7dd9 Merge: 8391c96 1196ed7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:51:39 2014 -0400 Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5 changes/bug12700 | 10 ++++++++++ src/or/relay.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.5] Fix relay_command_to_string(); solve 12700.
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 1196ed7cc4fc202e43ca102a73befe62aa65767d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 18 13:19:43 2014 -0400 Fix relay_command_to_string(); solve 12700. Two bugs here: 1) We didn't add EXTEND2/EXTENDED2 to relay_command_to_string(). 2) relay_command_to_string() didn't log the value of unrecognized commands. Both fixed here. --- changes/bug12700 | 10 ++++++++++ src/or/relay.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/bug12700 b/changes/bug12700 new file mode 100644 index 0000000..1d8caeb --- /dev/null +++ b/changes/bug12700 @@ -0,0 +1,10 @@ + o Minor bugfixes: + - When logging information about an EXTEND2 or EXTENDED2 cell, log + their names correctly. Fixes part of bug 12700; bugfix on + 0.2.4.8-alpha. + + o Minor bugfixes: + - When logging information about a relay cell whose command we + don't recognize, log its command as an integer. Fixes part of + bug 12700; bugfix on 0.2.1.10-alpha. + diff --git a/src/or/relay.c b/src/or/relay.c index 7f06c6e..fffd45d 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -517,6 +517,7 @@ relay_header_unpack(relay_header_t *dest, const uint8_t *src) static const char * relay_command_to_string(uint8_t command) { + static char buf[64]; switch (command) { case RELAY_COMMAND_BEGIN: return "BEGIN"; case RELAY_COMMAND_DATA: return "DATA"; @@ -541,7 +542,12 @@ relay_command_to_string(uint8_t command) case RELAY_COMMAND_RENDEZVOUS_ESTABLISHED: return "RENDEZVOUS_ESTABLISHED"; case RELAY_COMMAND_INTRODUCE_ACK: return "INTRODUCE_ACK"; - default: return "(unrecognized)"; + case RELAY_COMMAND_EXTEND2: return "EXTEND2"; + case RELAY_COMMAND_EXTENDED2: return "EXTENDED2"; + default: + tor_snprintf(buf, sizeof(buf), "Unrecognized relay command %u", + (unsigned)command); + return buf; } }

1 0

[tor/master] Add instructions for building Tor with MSVC.
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 4e98ec8149ef362eb6eb0b5e1fdaad3132b6a0d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:30:57 2014 -0400 Add instructions for building Tor with MSVC. Written by "NewEraCracker" on ticket 13081; I've added a note that this is not our preferred or supported build method. --- doc/building-tor-msvc.txt | 116 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/doc/building-tor-msvc.txt b/doc/building-tor-msvc.txt new file mode 100644 index 0000000..b22f444 --- /dev/null +++ b/doc/building-tor-msvc.txt @@ -0,0 +1,116 @@ +Building Tor with MSVC. +======================= + +NOTE: This is not the preferred method for building Tor on windows: we use +mingw for our packages. + +Last updated 9 September 2014. + + +Requirements: +------------- + + * Visual Studio 2010 + http://go.microsoft.com/fwlink/?LinkId=323467 + * CMake 2.8.12.2 + http://www.cmake.org/download/ + * Perl 5.16 + http://www.activestate.com/activeperl/downloads + * Latest stable OpenSSL tarball + https://www.openssl.org/source/ + * Zlib 1.2.8 tarball + http://zlib.net/ + * Libevent 2.1 tarball + https://github.com/libevent/libevent/releases + +Make sure you check signatures on all these packages! + +Steps: +------ + +Building OpenSSL from source as a shared library: + + cd <openssl source dir> + perl Configure VC-WIN32 + perl util\mkfiles.pl >MINFO + perl util\mk1mf.pl no-asm dll VC-WIN32 >32dll.mak + perl util\mkdef.pl 32 libeay > ms\libeay32.def + perl util\mkdef.pl 32 ssleay > ms\ssleay32.def + nmake -f 32dll.mak + +Making OpenSSL final package: + + Create <openssl final package dir>, I'd recommend using a name like <openssl source dir>-vc10. + + Copy the following directories and files to their respective locations + <openssl source dir>\inc32\openssl => <openssl final package dir>\include\openssl + <openssl source dir>\out32dll\libeay32.lib => <openssl final package dir>\lib\libeay32.lib + <openssl source dir>\out32dll\ssleay32.lib => <openssl final package dir>\lib\ssleay32.lib + <openssl source dir>\out32dll\libeay32.dll => <openssl final package dir>\bin\libeay32.dll + <openssl source dir>\out32dll\openssl.exe => <openssl final package dir>\bin\openssl.exe + <openssl source dir>\out32dll\ssleay32.dll => <openssl final package dir>\bin\ssleay32.dll + +Building Zlib from source: + + cd <zlib source dir> + nmake -f win32/Makefile.msc + +Building libevent: + + cd <libevent source dir> + mkdir build && cd build + SET OPENSSL_ROOT_DIR=<openssl final package dir> + cmake -G "NMake Makefiles" .. -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="/MT /Zi /O2 /Ob1 /D NDEBUG" -DZLIB_LIBRARY:FILEPATH="<zlib source dir>\zdll.lib" -DZLIB_INCLUDE_DIR:PATH="<zlib source dir>" + nmake event + +Building Tor: + + Create a dir above tor source dir named build-alpha and two subdirs include and lib. + + Your build tree should now be similar to this one: + * build-alpha + - include + - lib + * <libevent source dir> + - build + - cmake + - ... + * <openssl source dir> + - ... + - ms + - util + - ... + * <openssl final package dir> + - bin + - include + - lib + * <tor source dir> + - ... + - src + - ... + * <zlib source dir> + - ... + - win32 + - ... + + Copy the following dirs and files to the following locations: + <openssl final package dir>\include\openssl => build-alpha\include\openssl + <libevent source dir>\include => build-alpha\include + <libevent source dir>\WIN32-Code\nmake\event2 => build-alpha\include\event2 + <zlib source dir>\z*.h => build-alpha\include\z*.h + + Now copy the following files to the followin locations: + + <libevent source dir>\build\lib\event.lib => build-alpha\lib\libevent.lib + <openssl final package dir>\lib\libeay32.lib => build-alpha\lib\libcrypto.lib + <openssl final package dir>\lib\ssleay32.lib => build-alpha\lib\libssl.lib + <zlib source dir>\zdll.lib => build-alpha\lib\libz.lib + + And we are now ready for the build process: + + cd <tor source dir> + nmake -f Makefile.nmake + + After the above process is completed there should be a tor.exe in <tor source dir>\src\or + + Copy tor.exe to desired location and also copy zlib1.dll, libeay32.dll and ssleay32.dll from built zlib and openssl packages

1 0

[tor/master] Clean up the MVSC nmake files so they work again.
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 8391c96091e8e86c43954302df0b188ec1e5490d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:27:05 2014 -0400 Clean up the MVSC nmake files so they work again. Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker." --- Makefile.nmake | 4 ++++ changes/bug13081 | 3 +++ src/common/Makefile.nmake | 9 +++++---- src/ext/Makefile.nmake | 12 ++++++++++++ src/or/Makefile.nmake | 8 +++++--- src/win32/orconfig.h | 8 ++++++++ 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index a0a11eb..32401b5 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,6 +1,8 @@ all: cd src/common $(MAKE) /F Makefile.nmake + cd ../../src/ext + $(MAKE) /F Makefile.nmake cd ../../src/or $(MAKE) /F Makefile.nmake cd ../../src/test @@ -9,6 +11,8 @@ all: clean: cd src/common $(MAKE) /F Makefile.nmake clean + cd ../../src/ext + $(MAKE) /F Makefile.nmake clean cd ../../src/or $(MAKE) /F Makefile.nmake clean cd ../../src/test diff --git a/changes/bug13081 b/changes/bug13081 new file mode 100644 index 0000000..154f73f --- /dev/null +++ b/changes/bug13081 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Make the nmake make files work again. Fixes bug 13081. Bugfix on 0.2.5.1-alpha. Patch + from "NewEraCracker". diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index 0ebeaaa..b8c5dd4 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -1,12 +1,13 @@ all: libor.lib libor-crypto.lib libor-event.lib -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\ext +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ + /I ..\ext -LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ - log.obj memarea.obj mempool.obj procmon.obj util.obj \ +LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \ + log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \ util_codedigest.obj -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \ +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj torgzip.obj tortls.obj \ crypto_curve25519.obj curve25519-donna.obj LIBOR_EVENT_OBJECTS = compat_libevent.obj diff --git a/src/ext/Makefile.nmake b/src/ext/Makefile.nmake new file mode 100644 index 0000000..d02d03b --- /dev/null +++ b/src/ext/Makefile.nmake @@ -0,0 +1,12 @@ +all: csiphash.lib + +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ + /I ..\ext + +CSIPHASH_OBJECTS = csiphash.obj + +csiphash.lib: $(CSIPHASH_OBJECTS) + lib $(CSIPHASH_OBJECTS) $(CURVE25519_DONNA_OBJECTS) /out:csiphash.lib + +clean: + del *.obj *.lib diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 3b627b1..523bf33 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -1,6 +1,6 @@ all: tor.exe -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ /I ..\ext LIBS = ..\..\..\build-alpha\lib\libevent.lib \ @@ -15,6 +15,7 @@ LIBTOR_OBJECTS = \ buffers.obj \ channel.obj \ channeltls.obj \ + circpathbias.obj \ circuitbuild.obj \ circuitlist.obj \ circuitmux.obj \ @@ -35,6 +36,7 @@ LIBTOR_OBJECTS = \ dirvote.obj \ dns.obj \ dnsserv.obj \ + ext_orport.obj \ fp_pair.obj \ entrynodes.obj \ geoip.obj \ @@ -69,7 +71,7 @@ libtor.lib: $(LIBTOR_OBJECTS) lib $(LIBTOR_OBJECTS) /out:$@ tor.exe: libtor.lib tor_main.obj - $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@ + $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@ clean: - del $(LIBTOR_OBJECTS) *.lib tor.exe + del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 8c2472c..9873955 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -257,3 +257,11 @@ #define USE_CURVE25519_DONNA #define ENUM_VALS_ARE_SIGNED 1 + +#ifndef STDOUT_FILENO +#define STDOUT_FILENO 1 +#endif + +#ifndef STDERR_FILENO +#define STDERR_FILENO 2 +#endif

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 29979082286cc8fa4dadf4e1fcbe85a1aa58d757 Merge: ad0ae89 8391c96 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:27:41 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' Makefile.nmake | 4 ++++ changes/bug13081 | 3 +++ src/common/Makefile.nmake | 9 +++++---- src/ext/Makefile.nmake | 12 ++++++++++++ src/or/Makefile.nmake | 8 +++++--- src/win32/orconfig.h | 8 ++++++++ 6 files changed, 37 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.5] Clean up the MVSC nmake files so they work again.
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 8391c96091e8e86c43954302df0b188ec1e5490d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:27:05 2014 -0400 Clean up the MVSC nmake files so they work again. Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker." --- Makefile.nmake | 4 ++++ changes/bug13081 | 3 +++ src/common/Makefile.nmake | 9 +++++---- src/ext/Makefile.nmake | 12 ++++++++++++ src/or/Makefile.nmake | 8 +++++--- src/win32/orconfig.h | 8 ++++++++ 6 files changed, 37 insertions(+), 7 deletions(-) diff --git a/Makefile.nmake b/Makefile.nmake index a0a11eb..32401b5 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,6 +1,8 @@ all: cd src/common $(MAKE) /F Makefile.nmake + cd ../../src/ext + $(MAKE) /F Makefile.nmake cd ../../src/or $(MAKE) /F Makefile.nmake cd ../../src/test @@ -9,6 +11,8 @@ all: clean: cd src/common $(MAKE) /F Makefile.nmake clean + cd ../../src/ext + $(MAKE) /F Makefile.nmake clean cd ../../src/or $(MAKE) /F Makefile.nmake clean cd ../../src/test diff --git a/changes/bug13081 b/changes/bug13081 new file mode 100644 index 0000000..154f73f --- /dev/null +++ b/changes/bug13081 @@ -0,0 +1,3 @@ + o Compilation fixes: + - Make the nmake make files work again. Fixes bug 13081. Bugfix on 0.2.5.1-alpha. Patch + from "NewEraCracker". diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index 0ebeaaa..b8c5dd4 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -1,12 +1,13 @@ all: libor.lib libor-crypto.lib libor-event.lib -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\ext +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ + /I ..\ext -LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ - log.obj memarea.obj mempool.obj procmon.obj util.obj \ +LIBOR_OBJECTS = address.obj backtrace.obj compat.obj container.obj di_ops.obj \ + log.obj memarea.obj mempool.obj procmon.obj sandbox.obj util.obj \ util_codedigest.obj -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj \ +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj crypto_format.obj torgzip.obj tortls.obj \ crypto_curve25519.obj curve25519-donna.obj LIBOR_EVENT_OBJECTS = compat_libevent.obj diff --git a/src/ext/Makefile.nmake b/src/ext/Makefile.nmake new file mode 100644 index 0000000..d02d03b --- /dev/null +++ b/src/ext/Makefile.nmake @@ -0,0 +1,12 @@ +all: csiphash.lib + +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ + /I ..\ext + +CSIPHASH_OBJECTS = csiphash.obj + +csiphash.lib: $(CSIPHASH_OBJECTS) + lib $(CSIPHASH_OBJECTS) $(CURVE25519_DONNA_OBJECTS) /out:csiphash.lib + +clean: + del *.obj *.lib diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 3b627b1..523bf33 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -1,6 +1,6 @@ all: tor.exe -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ +CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ /I ..\ext LIBS = ..\..\..\build-alpha\lib\libevent.lib \ @@ -15,6 +15,7 @@ LIBTOR_OBJECTS = \ buffers.obj \ channel.obj \ channeltls.obj \ + circpathbias.obj \ circuitbuild.obj \ circuitlist.obj \ circuitmux.obj \ @@ -35,6 +36,7 @@ LIBTOR_OBJECTS = \ dirvote.obj \ dns.obj \ dnsserv.obj \ + ext_orport.obj \ fp_pair.obj \ entrynodes.obj \ geoip.obj \ @@ -69,7 +71,7 @@ libtor.lib: $(LIBTOR_OBJECTS) lib $(LIBTOR_OBJECTS) /out:$@ tor.exe: libtor.lib tor_main.obj - $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj /Fe$@ + $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@ clean: - del $(LIBTOR_OBJECTS) *.lib tor.exe + del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 8c2472c..9873955 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -257,3 +257,11 @@ #define USE_CURVE25519_DONNA #define ENUM_VALS_ARE_SIGNED 1 + +#ifndef STDOUT_FILENO +#define STDOUT_FILENO 1 +#endif + +#ifndef STDERR_FILENO +#define STDERR_FILENO 2 +#endif

1 0

[tor/master] Expand the event_mask field in controller conns to 64 bits
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit d229025fefa6faa228d9154e391293d9d5b320d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 8 15:15:05 2014 -0400 Expand the event_mask field in controller conns to 64 bits Back in 078d6bcd, we added an event number 0x20, but we didn't make the event_mask field big enough to compensate. Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha. --- changes/bug13085 | 3 +++ src/or/control.c | 8 ++++---- src/or/control.h | 4 ++-- src/or/or.h | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/changes/bug13085 b/changes/bug13085 new file mode 100644 index 0000000..a46457c --- /dev/null +++ b/changes/bug13085 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Actually send TRANSPORT_LAUNCHED and HS_DESC events to controllers. + Fixes bug 13085; bugfix on 0.2.5.1-alpha. Patch by "teor". diff --git a/src/or/control.c b/src/or/control.c index 4a6b18d..9378f38 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -582,7 +582,7 @@ send_control_event_string,(uint16_t event, event_format_t which, conn->state == CONTROL_CONN_STATE_OPEN) { control_connection_t *control_conn = TO_CONTROL_CONN(conn); - if (control_conn->event_mask & (1<<event)) { + if (control_conn->event_mask & (((event_mask_t)1)<<event)) { int is_err = 0; connection_write_to_buf(msg, strlen(msg), TO_CONN(control_conn)); if (event == EVENT_ERR_MSG) @@ -950,7 +950,7 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, const char *body) { int event_code = -1; - uint32_t event_mask = 0; + event_mask_t event_mask = 0; smartlist_t *events = smartlist_new(); (void) len; @@ -978,7 +978,7 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, return 0; } } - event_mask |= (1 << event_code); + event_mask |= (((event_mask_t)1) << event_code); } SMARTLIST_FOREACH_END(ev); SMARTLIST_FOREACH(events, char *, e, tor_free(e)); @@ -2880,7 +2880,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len, int is_reverse = 0; (void) len; /* body is nul-terminated; it's safe to ignore the length */ - if (!(conn->event_mask & ((uint32_t)1L<<EVENT_ADDRMAP))) { + if (!(conn->event_mask & (((event_mask_t)1)<<EVENT_ADDRMAP))) { log_warn(LD_CONTROL, "Controller asked us to resolve an address, but " "isn't listening for ADDRMAP events. It probably won't see " "the answer."); diff --git a/src/or/control.h b/src/or/control.h index 68a6c24..494f04b 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -156,8 +156,8 @@ void control_free_all(void); #define EVENT_TRANSPORT_LAUNCHED 0x0020 #define EVENT_HS_DESC 0x0021 #define EVENT_MAX_ 0x0021 -/* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a - * different structure. */ +/* If EVENT_MAX_ ever hits 0x003F, we need to make the mask into a + * different structure, as it can only handle a maximum left shift of 1<<63. */ /* Used only by control.c and test.c */ STATIC size_t write_escaped_data(const char *data, size_t len, char **out); diff --git a/src/or/or.h b/src/or/or.h index 0f1457f..1609587 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1737,8 +1737,9 @@ typedef struct dir_connection_t { typedef struct control_connection_t { connection_t base_; - uint32_t event_mask; /**< Bitfield: which events does this controller - * care about? */ + uint64_t event_mask; /**< Bitfield: which events does this controller + * care about? + * EVENT_MAX_ is >31, so we need a 64 bit mask */ /** True if we have sent a protocolinfo reply on this connection. */ unsigned int have_sent_protocolinfo:1;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab Merge: 781b477 d229025 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 8 15:16:45 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13085 | 3 +++ src/or/control.c | 8 ++++---- src/or/control.h | 4 ++-- src/or/or.h | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-)

1 0