- tor-commits - lists.torproject.org

[tor/master] MSVC build issue: add magic to make openssl headers in aes.c work
by nickm＠torproject.org 14 May '12

14 May '12

commit 7134be06379f2a964c0a84ecb7ac002f59ea3214 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:04:13 2012 -0400 MSVC build issue: add magic to make openssl headers in aes.c work --- src/common/aes.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/common/aes.c b/src/common/aes.c index c6bc2a8..a9a0188 100644 --- a/src/common/aes.c +++ b/src/common/aes.c @@ -10,6 +10,23 @@ **/ #include "orconfig.h" + +#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ + #ifndef WIN32_WINNT + #define WIN32_WINNT 0x400 + #endif + #ifndef _WIN32_WINNT + #define _WIN32_WINNT 0x400 + #endif + #define WIN32_LEAN_AND_MEAN + #if defined(_MSC_VER) && (_MSC_VER < 1300) + #include <winsock.h> + #else + #include <winsock2.h> + #include <ws2tcpip.h> + #endif +#endif + #include <openssl/opensslv.h> #include <assert.h> #include <stdlib.h>

1 0

[tor/master] Add a changes file for the misc bug5859 build issues
by nickm＠torproject.org 14 May '12

14 May '12

commit ee1b8196d372a1a407b3e4bd23e9860376330e69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:07:47 2012 -0400 Add a changes file for the misc bug5859 build issues --- changes/bug5859 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug5859 b/changes/bug5859 new file mode 100644 index 0000000..1720175 --- /dev/null +++ b/changes/bug5859 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Resolve numerous small warnings and build issues with MSVC. Resolves + bug 5859.

1 0

[tor/master] MSVC build issue: it can't tell that tor_assert(0) aborts.
by nickm＠torproject.org 14 May '12

14 May '12

commit d8de831932cefe2fe7196609b855892ee7188b4b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:07:27 2012 -0400 MSVC build issue: it can't tell that tor_assert(0) aborts. --- src/or/connection.c | 3 ++- src/or/networkstatus.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index d379533..0c970cc 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -778,7 +778,8 @@ create_unix_sockaddr(const char *listenaddress, char **readable_address, "Unix domain sockets not supported, yet we tried to create one."); *len_out = 0; tor_assert(0); -}; + return NULL; +} #endif /* HAVE_SYS_UN_H */ /** Warn that an accept or a connect has failed because we're running up diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 910b99c..3646ee6 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1463,8 +1463,10 @@ networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f) return current_ns_consensus; else if (f == FLAV_MICRODESC) return current_md_consensus; - else + else { tor_assert(0); + return NULL; + } } /** Return the most recent consensus that we have downloaded, or NULL if it is

1 0

[tor/master] Be a good git person: store nmakefiles in correct text fmt
by nickm＠torproject.org 14 May '12

14 May '12

commit 02d206a58b04fc783fe0fd79d063ad74193aac83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 13:01:05 2012 -0400 Be a good git person: store nmakefiles in correct text fmt --- src/common/Makefile.nmake | 40 ++++++++++++++++---------------- src/or/Makefile.nmake | 56 ++++++++++++++++++++++---------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/common/Makefile.nmake b/src/common/Makefile.nmake index c8b5988..e548273 100644 --- a/src/common/Makefile.nmake +++ b/src/common/Makefile.nmake @@ -1,20 +1,20 @@ -all: libor.lib libor-crypto.lib libor-event.lib - -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include - -LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ - log.obj memarea.obj mempool.obj procmon.obj util.obj \ - util_codedigest.obj - -LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj - -LIBOR_EVENT_OBJECTS = compat_libevent.obj - -libor.lib: $(LIBOR_OBJECTS) - lib $(LIBOR_OBJECTS) /out:libor.lib - -libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS) - lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib - -libor-event.lib: $(LIBOR_EVENT_OBJECTS) - lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib +all: libor.lib libor-crypto.lib libor-event.lib + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include + +LIBOR_OBJECTS = address.obj compat.obj container.obj di_ops.obj \ + log.obj memarea.obj mempool.obj procmon.obj util.obj \ + util_codedigest.obj + +LIBOR_CRYPTO_OBJECTS = aes.obj crypto.obj torgzip.obj tortls.obj + +LIBOR_EVENT_OBJECTS = compat_libevent.obj + +libor.lib: $(LIBOR_OBJECTS) + lib $(LIBOR_OBJECTS) /out:libor.lib + +libor-crypto.lib: $(LIBOR_CRYPTO_OBJECTS) + lib $(LIBOR_CRYPTO_OBJECTS) /out:libor-crypto.lib + +libor-event.lib: $(LIBOR_EVENT_OBJECTS) + lib $(LIBOR_EVENT_OBJECTS) /out:libor-event.lib diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake index 919edbb..3181e79 100644 --- a/src/or/Makefile.nmake +++ b/src/or/Makefile.nmake @@ -1,28 +1,28 @@ -all: tor.exe - -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common - -LIBS = ..\..\..\build-alpha\lib\libevent.a \ - ..\..\..\build-alpha\lib\libcrypto.a \ - ..\..\..\build-alpha\lib\libssl.a \ - ..\..\..\build-alpha\lib\libz.a \ - ws2_32.lib advapi32.lib shell32.lib - -LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \ - command.obj config.obj connection.obj connection_edge.obj \ - connection_or.obj control.obj cpuworker.obj directory.obj \ - dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \ - hibernate.obj main.obj microdesc.obj networkstatus.obj \ - nodelist.obj onion.obj policies.obj reasons.obj relay.obj \ - rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \ - rephist.obj router.obj routerlist.obj routerparse.obj status.obj \ - config_codedigest.obj ntmain.obj - -libtor.lib: $(LIBTOR_OBJECTS) - lib $(LIBTOR_OBJECTS) /out:libtor.lib - -tor.exe: libtor.lib tor_main.obj - $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj - -clean: - del $(LIBTOR_OBJECTS) *.lib tor.exe +all: tor.exe + +CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common + +LIBS = ..\..\..\build-alpha\lib\libevent.a \ + ..\..\..\build-alpha\lib\libcrypto.a \ + ..\..\..\build-alpha\lib\libssl.a \ + ..\..\..\build-alpha\lib\libz.a \ + ws2_32.lib advapi32.lib shell32.lib + +LIBTOR_OBJECTS = buffers.obj circuitbuild.obj circuitlist.obj circuituse.obj \ + command.obj config.obj connection.obj connection_edge.obj \ + connection_or.obj control.obj cpuworker.obj directory.obj \ + dirserv.obj dirvote.obj dns.obj dnsserv.obj geoip.obj \ + hibernate.obj main.obj microdesc.obj networkstatus.obj \ + nodelist.obj onion.obj policies.obj reasons.obj relay.obj \ + rendclient.obj rendcommon.obj rendmid.obj rendservice.obj \ + rephist.obj router.obj routerlist.obj routerparse.obj status.obj \ + config_codedigest.obj ntmain.obj + +libtor.lib: $(LIBTOR_OBJECTS) + lib $(LIBTOR_OBJECTS) /out:libtor.lib + +tor.exe: libtor.lib tor_main.obj + $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib tor_main.obj + +clean: + del $(LIBTOR_OBJECTS) *.lib tor.exe

1 0

[tor/master] Remove the unused torrc.bridge.in. Bug 5622.
by nickm＠torproject.org 14 May '12

14 May '12

commit f1fca8aa4d5fd62e6456a0cad6be613b37579583 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:37:39 2012 -0400 Remove the unused torrc.bridge.in. Bug 5622. --- changes/bug5622 | 4 + src/config/torrc.bridge.in | 175 -------------------------------------------- 2 files changed, 4 insertions(+), 175 deletions(-) diff --git a/changes/bug5622 b/changes/bug5622 new file mode 100644 index 0000000..82b8e76 --- /dev/null +++ b/changes/bug5622 @@ -0,0 +1,4 @@ + o Removed files: + - Remove the torrc.bridge file: we don't use it for anything, and + it had become badly desynchronized from torrc.sample. Resolves + bug 5622. \ No newline at end of file diff --git a/src/config/torrc.bridge.in b/src/config/torrc.bridge.in deleted file mode 100644 index b7b7e05..0000000 --- a/src/config/torrc.bridge.in +++ /dev/null @@ -1,175 +0,0 @@ -## Configuration file for a typical Tor user -## Last updated 16 July 2009 for Tor 0.2.2.1-alpha. -## (May or may not work for much older or much newer versions of Tor.) -## -## Lines that begin with "## " try to explain what's going on. Lines -## that begin with just "#" are disabled commands: you can enable them -## by removing the "#" symbol. -## -## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, -## for more options you can use in this file. -## -## Tor will look for this file in various places based on your platform: -## https://www.torproject.org/docs/faq#torrc - - -## Replace this with "SocksPort 0" if you plan to run Tor only as a -## relay, and not make any local application connections yourself. -SocksPort 9050 # what port to open for local application connections -SocksListenAddress 127.0.0.1 # accept connections only from localhost -#SocksListenAddress 192.168.0.1:9100 # listen on this IP:port also - -## Entry policies to allow/deny SOCKS requests based on IP address. -## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests from SocksListenAddress. -#SocksPolicy accept 192.168.0.0/16 -#SocksPolicy reject * - -## Logs go to stdout at level "notice" unless redirected by something -## else, like one of the below lines. You can have as many Log lines as -## you want. -## -## We advise using "notice" in most cases, since anything more verbose -## may provide sensitive information to an attacker who obtains the logs. -## -## Send all messages of level 'notice' or higher to @LOCALSTATEDIR@/log/tor/notices.log -#Log notice file @LOCALSTATEDIR@/log/tor/notices.log -## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log -#Log debug file @LOCALSTATEDIR@/log/tor/debug.log -## Use the system log instead of Tor's logfiles -#Log notice syslog -## To send all messages to stderr: -#Log debug stderr - -## Uncomment this to start the process in the background... or use -## --runasdaemon 1 on the command line. This is ignored on Windows; -## see the FAQ entry if you want Tor to run as an NT service. -#RunAsDaemon 1 - -## The directory for keeping all the keys/etc. By default, we store -## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. -#DataDirectory @LOCALSTATEDIR@/lib/tor - -## The port on which Tor will listen for local connections from Tor -## controller applications, as documented in control-spec.txt. -#ControlPort 9051 -## If you enable the controlport, be sure to enable one of these -## authentication methods, to prevent attackers from accessing it. -#HashedControlPassword 16:872860B76453A77D60CA2BB8C1A7042072093276A3D701AD684053EC4C -#CookieAuthentication 1 - -############### This section is just for location-hidden services ### - -## Once you have configured a hidden service, you can look at the -## contents of the file ".../hidden_service/hostname" for the address -## to tell people. -## -## HiddenServicePort x y:z says to redirect requests on port x to the -## address y:z. - -#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/ -#HiddenServicePort 80 127.0.0.1:80 - -#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/ -#HiddenServicePort 80 127.0.0.1:80 -#HiddenServicePort 22 127.0.0.1:22 - -################ This section is just for relays ##################### -# -## See https://www.torproject.org/docs/tor-doc-relay for details. - -## Required: what port to advertise for incoming Tor connections. -ORPort 9001 -## If you want to listen on a port other than the one advertised -## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the -## line below too. You'll need to do ipchains or other port forwarding -## yourself to make this work. -#ORListenAddress 0.0.0.0:9090 - -## A handle for your relay, so people don't have to refer to it by key. -Nickname Unnamed - -## The IP address or full DNS name for your relay. Leave commented out -## and Tor will guess. -#Address noname.example.com - -## Define these to limit how much relayed traffic you will allow. Your -## own traffic is still unthrottled. Note that RelayBandwidthRate must -## be at least 20 KB. -## Note that units for these config options are bytes per second, not bits -## per second, and that prefixes are binary prefixes, i.e. 2^10, 2^20, etc. -#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps) -#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps) -RelayBandwidthBurst 10485760 -RelayBandwidthRate 5242880 - -## Use these to restrict the maximum traffic per day, week, or month. -## Note that this threshold applies to sent _and_ to received bytes, -## not to their sum: Setting "4 GB" may allow up to 8 GB -## total before hibernating. -## -## Set a maximum of 4 gigabytes each way per period. -#AccountingMax 4 GB -## Each period starts daily at midnight (AccountingMax is per day) -#AccountingStart day 00:00 -## Each period starts on the 3rd of the month at 15:00 (AccountingMax -## is per month) -#AccountingStart month 3 15:00 - -## Contact info to be published in the directory, so we can contact you -## if your relay is misconfigured or something else goes wrong. Google -## indexes this, so spammers might also collect it. -#ContactInfo Random Person <nobody AT example dot com> -## You might also include your PGP or GPG fingerprint if you have one: -#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com> - -## Uncomment this to mirror directory information for others. Please do -## if you have enough bandwidth. -DirPort 9030 # what port to advertise for directory connections -## If you want to listen on a port other than the one advertised -## in DirPort (e.g. to advertise 80 but bind to 9091), uncomment the line -## below too. You'll need to do ipchains or other port forwarding yourself -## to make this work. -#DirListenAddress 0.0.0.0:9091 -## Uncomment to return an arbitrary blob of html on your DirPort. Now you -## can explain what Tor is if anybody wonders why your IP address is -## contacting them. See contrib/tor-exit-notice.html in Tor's source -## distribution for a sample. -#DirPortFrontPage @CONFDIR@/tor-exit-notice.html - -## Uncomment this if you run more than one Tor relay, and add the identity -## key fingerprint of each Tor relay you control, even if they're on -## different networks. You declare it here so Tor clients can avoid -## using more than one of your relays in a single circuit. See -## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#MultipleServers -## However, you should never include a bridge's fingerprint here, as it would -## break its concealability and potentionally reveal its IP/TCP address. -#MyFamily $keyid,$keyid,... - -## A comma-separated list of exit policies. They're considered first -## to last, and the first match wins. If you want to _replace_ -## the default exit policy, end this with either a reject *:* or an -## accept *:*. Otherwise, you're _augmenting_ (prepending to) the -## default exit policy. Leave commented to just use the default, which is -## described in the man page or at -## https://www.torproject.org/documentation.html -## -## Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses -## for issues you might encounter if you use the default exit policy. -## -## If certain IPs and ports are blocked externally, e.g. by your firewall, -## you should update your exit policy to reflect this -- otherwise Tor -## users will be told that those destinations are down. -## -#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more -#ExitPolicy accept *:119 # accept nntp as well as default exit policy -#ExitPolicy reject *:* # no exits allowed -# -## Bridge relays (or "bridges") are Tor relays that aren't listed in the -## main directory. Since there is no complete public list of them, even if an -## ISP is filtering connections to all the known Tor relays, they probably -## won't be able to block all the bridges. Also, websites won't treat you -## differently because they won't know you're running Tor. If you can -## be a real relay, please do; but if not, be a bridge! -BridgeRelay 1 -ExitPolicy reject *:*

1 0

[tor/master] Add some MSVC stuff to gitignore
by nickm＠torproject.org 14 May '12

14 May '12

commit 67690307fb4cdcce3022ce6864b38c33340f9bb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:35:10 2012 -0400 Add some MSVC stuff to gitignore --- .gitignore | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 26e9e38..3a28ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.swp # C stuff *.o +*.obj # Diff droppings *.orig *.rej @@ -122,8 +123,11 @@ /src/common/Makefile.in /src/common/common_sha1.i /src/common/libor.a +/src/common/libor.lib /src/common/libor-crypto.a +/src/common/libor-crypto.lib /src/common/libor-event.a +/src/common/libor-event.lib # /src/config/ /src/config/Makefile @@ -140,6 +144,7 @@ /src/or/tor /src/or/tor.exe /src/or/libtor.a +/src/or/libtor.lib # /src/test /src/test/Makefile

1 0

[tor/master] We do not need to define _WIN32 by hand; MSVC does that for us
by nickm＠torproject.org 14 May '12

14 May '12

commit c5e87ef234e2feb7ac892f31c4c7eaedc56b06b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:22:51 2012 -0400 We do not need to define _WIN32 by hand; MSVC does that for us Bug 5858; fix on 0.2.3.12-alpha --- changes/bug5858 | 4 ++++ src/win32/orconfig.h | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/changes/bug5858 b/changes/bug5858 new file mode 100644 index 0000000..aa1e8bb --- /dev/null +++ b/changes/bug5858 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Remove bogus definition of "_WIN32" from src/win32/orconfig.h, to + unbreak the MSVC build. Fies bug 5858; bugfix on 0.2.3.12-alpha. + diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f6bbf8b..a08d0c6 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -3,7 +3,6 @@ */ /* Windows-only defines. */ -#define _WIN32 #define CONFDIR "" /* Define to 1 if you have the <arpa/inet.h> header file. */

1 0

[tor/master] Cut down on the OS information we give.
by nickm＠torproject.org 14 May '12

14 May '12

commit a2f0e7a65bb2397087ce92cf23149686185de8e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 17:50:30 2012 -0400 Cut down on the OS information we give. For uname-based detection, we now give only the OS name (e.g., "Darwin", "Linux".) For Windows, we give only the Operating System name as inferred from dw(Major|Minor)version, (e.g., "Windows XP", "Windows 7"), and whether the VER_NT_SERVER flag is set. For ticket 2988. --- changes/bug2988 | 6 ++++++ src/common/compat.c | 49 ++++++++++++------------------------------------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/changes/bug2988 b/changes/bug2988 new file mode 100644 index 0000000..88911e3 --- /dev/null +++ b/changes/bug2988 @@ -0,0 +1,6 @@ + o Minor features: + - The advertised platform of a router now includes only its + operating system's name (e.g., "Linux", "Darwin", "Windows 7"), + and not its service pack level (for Windows), or its CPU + architecture (for Unix). This is part of ticket 2988. + diff --git a/src/common/compat.c b/src/common/compat.c index 1680f66..2cc3c06 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2030,8 +2030,7 @@ get_uname(void) #ifdef HAVE_UNAME if (uname(&u) != -1) { /* (Linux says 0 is success, Solaris says 1 is success) */ - tor_snprintf(uname_result, sizeof(uname_result), "%s %s", - u.sysname, u.machine); + strlcpy(uname_result, u.sysname, sizeof(uname_result)); } else #endif { @@ -2039,8 +2038,6 @@ get_uname(void) OSVERSIONINFOEX info; int i; const char *plat = NULL; - const char *extra = NULL; - char acsd[MAX_PATH] = {0}; static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { @@ -2065,20 +2062,11 @@ get_uname(void) uname_result_is_set = 1; return uname_result; } -#ifdef UNICODE - wcstombs(acsd, info.szCSDVersion, MAX_PATH); -#else - strlcpy(acsd, info.szCSDVersion, sizeof(acsd)); -#endif if (info.dwMajorVersion == 4 && info.dwMinorVersion == 0) { if (info.dwPlatformId == VER_PLATFORM_WIN32_NT) plat = "Windows NT 4.0"; else plat = "Windows 95"; - if (acsd[1] == 'B') - extra = "OSR2 (B)"; - else if (acsd[1] == 'C') - extra = "OSR2 (C)"; } else { for (i=0; win_version_table[i].major>0; ++i) { if (win_version_table[i].major == info.dwMajorVersion && @@ -2088,39 +2076,26 @@ get_uname(void) } } } - if (plat && !strcmp(plat, "Windows 98")) { - if (acsd[1] == 'A') - extra = "SE (A)"; - else if (acsd[1] == 'B') - extra = "SE (B)"; - } if (plat) { - if (!extra) - extra = acsd; - tor_snprintf(uname_result, sizeof(uname_result), "%s %s", - plat, extra); + strlcpy(uname_result, plat, sizeof(uname_result)); } else { if (info.dwMajorVersion > 6 || (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), - "Very recent version of Windows [major=%d,minor=%d] %s", - (int)info.dwMajorVersion,(int)info.dwMinorVersion, - acsd); + "Very recent version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion, + ); else tor_snprintf(uname_result, sizeof(uname_result), - "Unrecognized version of Windows [major=%d,minor=%d] %s", - (int)info.dwMajorVersion,(int)info.dwMinorVersion, - acsd); + "Unrecognized version of Windows [major=%d,minor=%d]", + (int)info.dwMajorVersion,(int)info.dwMinorVersion); } #if !defined (WINCE) -#ifdef VER_SUITE_BACKOFFICE - if (info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [domain controller]", sizeof(uname_result)); - } else if (info.wProductType == VER_NT_SERVER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } else if (info.wProductType == VER_NT_WORKSTATION) { - strlcat(uname_result, " [workstation]", sizeof(uname_result)); - } +#ifdef VER_NT_SERVER + if (info.wProductType == VER_NT_SERVER || + info.wProductType == VER_NT_DOMAIN_CONTROLLER) { + strlcat(uname_result, " [server]", sizeof(uname_result)); + } #endif #endif #else

1 0

[tor/master] Do not publish the "git-XXX" tag in server descriptors
by nickm＠torproject.org 14 May '12

14 May '12

commit 31eb73f88e858d4dedceb4a748cab5c068896036 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 18:06:12 2012 -0400 Do not publish the "git-XXX" tag in server descriptors Instead, allow packagers to put a 'TOR_BUILD_TAG' field in the server descriptor to indicate a platform-specific value, if they need to. (According to weasel, this was his use for the git- tag previously.) This is part of 2988 --- changes/bug2988 | 6 +++++- src/or/config.c | 22 ++++++++++++++++++++-- src/or/config.h | 1 + src/or/router.c | 2 +- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/changes/bug2988 b/changes/bug2988 index 88911e3..aa141e8 100644 --- a/changes/bug2988 +++ b/changes/bug2988 @@ -3,4 +3,8 @@ operating system's name (e.g., "Linux", "Darwin", "Windows 7"), and not its service pack level (for Windows), or its CPU architecture (for Unix). This is part of ticket 2988. - + - Do not include the (git-XYZ) tag in published server descriptor + platform lines. This is part of ticket 2988. + - Allow packagers to insert an extra string in server descriptor + platform lines by setting the preprocessor variable TOR_BUILD_TAG. + This is part of ticket 2988. diff --git a/src/or/config.c b/src/or/config.c index d118354..dcc57f8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -783,6 +783,7 @@ extern const char tor_git_revision[]; /* from tor_main.c */ /** The version of this Tor process, as parsed. */ static char *the_tor_version = NULL; +static char *the_short_tor_version = NULL; /** Return the current Tor version. */ const char * @@ -790,14 +791,31 @@ get_version(void) { if (the_tor_version == NULL) { if (strlen(tor_git_revision)) { - tor_asprintf(&the_tor_version, "%s (git-%s)", VERSION, tor_git_revision); + tor_asprintf(&the_tor_version, "%s (git-%s)", get_short_version(), + tor_git_revision); } else { - the_tor_version = tor_strdup(VERSION); + the_tor_version = tor_strdup(get_short_version()); } } return the_tor_version; } +/** Return the current Tor version, without any git tag. */ +const char * +get_short_version(void) +{ + + if (the_short_tor_version == NULL) { +#ifdef TOR_BUILD_TAG + tor_asprintf(&the_short_tor_version, "%s (%s)", VERSION, TOR_BUILD_TAG); +#else + the_short_tor_version = tor_strdup(VERSION); +#endif + } + return the_short_tor_version; +} + + /** Release additional memory allocated in options */ static void diff --git a/src/or/config.h b/src/or/config.h index 0495186..a68a3e3 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -22,6 +22,7 @@ const char *safe_str(const char *address); const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); const char *get_version(void); +const char *get_short_version(void); int config_get_lines(const char *string, config_line_t **result, int extended); void config_free_lines(config_line_t *front); diff --git a/src/or/router.c b/src/or/router.c index 4468c7b..a967f0d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1949,7 +1949,7 @@ router_guess_address_from_dir_headers(uint32_t *guess) void get_platform_str(char *platform, size_t len) { - tor_snprintf(platform, len, "Tor %s on %s", get_version(), get_uname()); + tor_snprintf(platform, len, "Tor %s on %s", get_short_version(), get_uname()); } /* XXX need to audit this thing and count fenceposts. maybe

1 0

[tor/master] Fix win32 compilation of 31eb73f88e8
by nickm＠torproject.org 14 May '12

14 May '12

commit b6028b9e8b4c97c503a5de83b89f411d003c531b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 14 12:08:05 2012 -0400 Fix win32 compilation of 31eb73f88e8 --- src/common/compat.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 2cc3c06..d40e503 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2083,8 +2083,7 @@ get_uname(void) (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d]", - (int)info.dwMajorVersion,(int)info.dwMinorVersion, - ); + (int)info.dwMajorVersion,(int)info.dwMinorVersion); else tor_snprintf(uname_result, sizeof(uname_result), "Unrecognized version of Windows [major=%d,minor=%d]",

1 0