- tor-commits - lists.torproject.org

r4534: Really remove some of the files (vidalia/trunk/src/common)
by vidalia-svn＠svn.torproject.org 19 Mar '11

19 Mar '11

Author: chiiph Date: 2011-03-19 21:57:33 +0000 (Sat, 19 Mar 2011) New Revision: 4534 Removed: vidalia/trunk/src/common/TorSslSocket.cpp vidalia/trunk/src/common/TorSslSocket.h Log: Really remove some of the files

1 0

r4533: Remove OpenSSL dep (in vidalia/trunk: . pkg/rpm src/common)
by vidalia-svn＠svn.torproject.org 19 Mar '11

19 Mar '11

Author: chiiph Date: 2011-03-19 21:56:43 +0000 (Sat, 19 Mar 2011) New Revision: 4533 Modified: vidalia/trunk/CMakeLists.txt vidalia/trunk/INSTALL vidalia/trunk/pkg/rpm/vidalia.spec.in vidalia/trunk/src/common/CMakeLists.txt vidalia/trunk/src/common/TorSslSocket.cpp vidalia/trunk/src/common/TorSslSocket.h Log: Remove OpenSSL dep Modified: vidalia/trunk/CMakeLists.txt =================================================================== --- vidalia/trunk/CMakeLists.txt 2011-03-18 11:30:36 UTC (rev 4532) +++ vidalia/trunk/CMakeLists.txt 2011-03-19 21:56:43 UTC (rev 4533) @@ -52,9 +52,9 @@ if (WIN32) include(${CMAKE_SOURCE_DIR}/cmake/FindWiX.cmake) endif(WIN32) -if (MSVC OR UNIX) +if (MSVC) include(${CMAKE_SOURCE_DIR}/cmake/FindOpenSSL.cmake) -endif(MSVC OR UNIX) +endif(MSVC) if(MSVC_IDE) set(CMAKE_SUPPRESS_REGENERATION TRUE) Modified: vidalia/trunk/INSTALL =================================================================== --- vidalia/trunk/INSTALL 2011-03-18 11:30:36 UTC (rev 4532) +++ vidalia/trunk/INSTALL 2011-03-19 21:56:43 UTC (rev 4533) @@ -179,10 +179,6 @@ `cmake` commands above. Each of the configuration options can be specified on the command line and follows the format "-D <var>:<type>=<value> - -DUSE_QSSLSOCKET=0 - - Disable building Vidalia with SSL support. - -DUSE_MINIUPNPC=0 Disable UPnP support in Vidalia. @@ -207,7 +203,8 @@ -DOPENSSL_LIBRARY_DIR=/path/to/openssl - Specifies the location of OpenSSL's libraries. + Specifies the location of OpenSSL's libraries for building installer on + Windows. -DCMAKE_INSTALL_PREFIX=/usr/local Modified: vidalia/trunk/pkg/rpm/vidalia.spec.in =================================================================== --- vidalia/trunk/pkg/rpm/vidalia.spec.in 2011-03-18 11:30:36 UTC (rev 4532) +++ vidalia/trunk/pkg/rpm/vidalia.spec.in 2011-03-19 21:56:43 UTC (rev 4533) @@ -10,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: openssl-devel BuildRequires: qt4-devel BuildRequires: cmake @@ -95,7 +94,7 @@ %files %defattr(-,root,root,-) -%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 LICENSE-OPENSSL README +%doc CHANGELOG CREDITS HACKING LICENSE LICENSE-GPLV2 LICENSE-GPLV3 README %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_datadir}/applications/%{name}.desktop Modified: vidalia/trunk/src/common/CMakeLists.txt =================================================================== --- vidalia/trunk/src/common/CMakeLists.txt 2011-03-18 11:30:36 UTC (rev 4532) +++ vidalia/trunk/src/common/CMakeLists.txt 2011-03-19 21:56:43 UTC (rev 4533) @@ -20,11 +20,9 @@ procutil.cpp stringutil.cpp TorSocket.cpp - TorSslSocket.cpp ) qt4_wrap_cpp(common_SRCS TorSocket.h - TorSslSocket.h ) if(WIN32) @@ -40,7 +38,3 @@ ${QT_QTNETWORK_LIBRARY} ) -if(OPENSSL_LIBRARIES) - target_link_libraries(common ${OPENSSL_LIBRARIES}) -endif(OPENSSL_LIBRARIES) - Modified: vidalia/trunk/src/common/TorSslSocket.cpp =================================================================== --- vidalia/trunk/src/common/TorSslSocket.cpp 2011-03-18 11:30:36 UTC (rev 4532) +++ vidalia/trunk/src/common/TorSslSocket.cpp 2011-03-19 21:56:43 UTC (rev 4533) @@ -1,160 +0,0 @@ -/* -** This file is part of Vidalia, and is subject to the license terms in the -** LICENSE file, found in the top level directory of this distribution. If you -** did not receive the LICENSE file with this file, you may obtain it from the -** Vidalia source package distributed by the Vidalia Project at -** http://www.vidalia-project.net/. No part of Vidalia, including this file, -** may be copied, modified, propagated, or distributed except according to the -** terms described in the LICENSE file. -*/ - -/* -** \file TorSslSocket.cpp -** \version $Id: /local/vidalia/trunk/src/util/torsocket.cpp 1564 2006-12-26T06:06:04.965088Z edmanm $ -** \brief A QSslSocket that makes encrypted requests over Tor -*/ - -#include "TorSslSocket.h" - -#include <QDataStream> -#include <QStringList> - -#define SOCKS_VERSION 0x04 /**< SOCKS version. */ -#define SOCKS_CONNECT 0x01 /**< SOCKS connect command ID. */ -#define SOCKS_FAKE_IP 0x00000001 /**< Bogus IP. */ -#define SOCKS_RESPONSE_LEN 0x08 /**< SOCKS server response length. */ -#define SOCKS_RESPONSE_VERSION 0x00 /**< SOCKS server response version. */ -#define SOCKS_CONNECT_STATUS_OK 0x5A /**< SOCKS server response status. */ - - -/** Constructor. */ -TorSslSocket::TorSslSocket(const QHostAddress &socksAddr, - quint16 socksPort, QObject *parent) -: QSslSocket(parent), - _socksAddr(socksAddr), - _socksPort(socksPort) -{ - QObject::connect(this, SIGNAL(sslErrors(QList<QSslError>)), - this, SLOT(onSslErrors(QList<QSslError>))); - QObject::connect(this, SIGNAL(error(QAbstractSocket::SocketError)), - this, SLOT(onError(QAbstractSocket::SocketError))); - QObject::connect(this, SIGNAL(readyRead()), - this, SLOT(onHandshakeResponse())); - QObject::connect(this, SIGNAL(connected()), - this, SLOT(connectedToProxy())); - QObject::connect(this, SIGNAL(encrypted()), - this, SLOT(onEncrypted())); -} - -/** Connects to the specified hostname and port via Tor. */ -void -TorSslSocket::connectToRemoteHost(const QString &remoteHost, quint16 remotePort, - bool encrypted) -{ - _remoteHost = remoteHost; - _remotePort = remotePort; - _encrypted = encrypted; - QTcpSocket::connectToHost(_socksAddr, _socksPort); -} - -/** Called when a connection error has occurred. */ -void -TorSslSocket::onError(QAbstractSocket::SocketError error) -{ - Q_UNUSED(error); - emit socketError(errorString()); -} - -/** Called when one or more SSL errors occur on the socket. */ -void -TorSslSocket::onSslErrors(const QList<QSslError> &errors) -{ - QStringList errorStrings; - foreach (QSslError error, errors) { - errorStrings << "\"" + error.errorString() + "\""; - } - emit socketError(errorStrings.join(",")); -} - -/** Called when a connection has been established to the proxy host and starts - * a Socks4a handshake. */ -void -TorSslSocket::connectedToProxy() -{ - sendSocksHandshake(_remoteHost, _remotePort); -} - -/** Called when an encrypted connection has been established to the remote - * host. */ -void -TorSslSocket::onEncrypted() -{ - emit connectedToRemoteHost(); -} - -/** Sends the first part of a Socks4a handshake, using the remote hostname and - * port specified in the previous call to connectToHost(). The message should - * be formatted as follows: - * - * 0x04 (socks version) - * 0x01 (connect) - * PORT (two bytes, most significant byte first) - * 0x00 0x00 0x00 0x01 (fake IP address: tells proxy to use SOCKS4a) - * 0x00 (empty username field) - * HOSTNAME (target hostname) - * 0x00 (marks the end of the hostname field) - */ -void -TorSslSocket::sendSocksHandshake(const QString &remoteHost, quint16 remotePort) -{ - QDataStream sock(this); - sock << (quint8)SOCKS_VERSION; - sock << (quint8)SOCKS_CONNECT; - sock << (quint16)remotePort; - sock << (quint32)SOCKS_FAKE_IP; - sock << (quint8)0; - sock.writeRawData(qPrintable(remoteHost), remoteHost.length()); - sock << (quint8)0; -} - -/** Handles the second half of the handshake, received from the SOCKS - * proxy server. The response should be formatted as follows: - * - * 0x00 (response version) - * STATUS (0x5A means success; other values mean failure) - * PORT (not set) - * ADDRESS (not set) - */ -void -TorSslSocket::onHandshakeResponse() -{ - QByteArray response; - if (bytesAvailable() >= SOCKS_RESPONSE_LEN) { - /* We've received our response, so stop waiting for it. */ - QObject::disconnect(this, SIGNAL(readyRead()), - this, SLOT(onHandshakeResponse())); - - /* Read the 8-byte response off the socket. */ - response = read(SOCKS_RESPONSE_LEN); - - /* Check to make sure we got a good response from the proxy. */ - if ((uchar)response[0] == (uchar)SOCKS_RESPONSE_VERSION && - (uchar)response[1] == (uchar)SOCKS_CONNECT_STATUS_OK) { - if (_encrypted) { - /* Connection status was okay, so start client encryption. */ - /* We first need to set the peer name to the intended remote host, - * otherwise Qt will use the proxy (e.g., 127.0.0.1) as the peer name - * when validating the server certificate. */ - setPeerName(_remoteHost); - startClientEncryption(); - } else { - /* Caller wanted an unencrypted, unauthenticated, uncool conn. */ - emit connectedToRemoteHost(); - } - } else { - /* Remote connection failed, so close the connection to the proxy. */ - disconnectFromHost(); - } - } -} - Modified: vidalia/trunk/src/common/TorSslSocket.h =================================================================== --- vidalia/trunk/src/common/TorSslSocket.h 2011-03-18 11:30:36 UTC (rev 4532) +++ vidalia/trunk/src/common/TorSslSocket.h 2011-03-19 21:56:43 UTC (rev 4533) @@ -1,71 +0,0 @@ -/* -** This file is part of Vidalia, and is subject to the license terms in the -** LICENSE file, found in the top level directory of this distribution. If you -** did not receive the LICENSE file with this file, you may obtain it from the -** Vidalia source package distributed by the Vidalia Project at -** http://www.vidalia-project.net/. No part of Vidalia, including this file, -** may be copied, modified, propagated, or distributed except according to the -** terms described in the LICENSE file. -*/ - -/* -** \file TorSslSocket.h -** \version $Id: /local/vidalia/trunk/src/util/torsocket.h 1564 2006-12-26T06:06:04.965088Z edmanm $ -** \brief A QSslSocket that makes encrypted requests over Tor -*/ - -#ifndef _TORSSLSOCKET_H -#define _TORSSLSOCKET_H - -#include <QSslSocket> -#include <QHostAddress> - - -class TorSslSocket : public QSslSocket -{ - Q_OBJECT - -public: - /** Constructor. */ - TorSslSocket(const QHostAddress &socksAddr, - quint16 socksPort, QObject *parent = 0); - - /** Connects to the specified hostname and port via Tor. */ - void connectToRemoteHost(const QString &remoteHost, quint16 remotePort, - bool encrypted); - -signals: - /** Emitted when a connection has been established through Tor to the remote - * host specified in a prior call to connectToHost(). */ - void connectedToRemoteHost(); - /** Emitted when a connection error has occurred. */ - void socketError(QString errmsg); - -private slots: - /** Called when the socket is connected to the proxy and sends our - * half of a Socks4a handshake. */ - void connectedToProxy(); - /** Called when an encrypted connection has been established to the remote - * host. */ - void onEncrypted(); - /** Handles the server's response part of a Socks4a handshake. */ - void onHandshakeResponse(); - /** Called when a connection error has occurred. */ - void onError(QAbstractSocket::SocketError error); - /** Called when one or more SSL errors occur on the socket. */ - void onSslErrors(const QList<QSslError> &errors); - -private: - /** Sends the client part of a Socks4a handshake with a proxy server. */ - void sendSocksHandshake(const QString &remoteHost, quint16 remotePort); - - QHostAddress _socksAddr; /**< Address of Tor's SOCKS listener. */ - QString _remoteHost; /**< Remote hostname. */ - quint16 _socksPort; /**< Port of Tor's SOCKS listener. */ - quint16 _remotePort; /**< Remote host port. */ - bool _encrypted; /**< Set to true if the connection to the remote - host should be encrypted. */ -}; - -#endif -

1 0

r24395: {translation} patched howto.txt with text from kaner (translation/trunk/documentation)
by Runa Sandvik 18 Mar '11

18 Mar '11

Author: runa Date: 2011-03-18 20:37:30 +0000 (Fri, 18 Mar 2011) New Revision: 24395 Modified: translation/trunk/documentation/howto.txt Log: patched howto.txt with text from kaner Modified: translation/trunk/documentation/howto.txt =================================================================== --- translation/trunk/documentation/howto.txt 2011-03-18 16:11:18 UTC (rev 24394) +++ translation/trunk/documentation/howto.txt 2011-03-18 20:37:30 UTC (rev 24395) @@ -192,14 +192,51 @@ BridgeDB: - # TODO: document the translation workflow for BridgeDB when we have - # figured it out. + 1. Updating the Translations + After pulling new translations from Transifex and checking them into + the BrideDB repository, log into the BridgeDB host and update + translations as follows in the BridgeDB source directory: + + $ python setup.py trans + $ python setup.py install_data + + This will ensure the newest translation strings can be used by BridgeDB. + + 2. Creating/Updating Translation Template Files + + To update the translation template file for BridgeDB, run the + following command inside the BridgeDB source directory: + + $ xgettext lib/bridgedb/I18n.py -dbridgedb --from-code=utf-8 \ + -oi18n/templates/bridgedb.pot + $ msgen -o i18n/en/bridgedb.po --lang=en i18n/templates/bridgedb.pot + $ for i in i18n/*/bridgedb.po; do \ + msgmerge -U $i i18n/templates/bridgedb.pot; done + GetTor: - # TODO: document the translation workflow for GetTor when we have - # figured it out. + 1. Updating the Translations + After pulling new translations from Transifex and checking them into + the GetTor repository, log into the GetTor host and update + translations as follows in the GetTor source directory: + + $ python setup.py trans + $ python setup.py install_data + + This will ensure the newest translation strings can be used by GetTor. + + 2. Creating/Updating Translation Template Files + + To update the translation template file for GetTor, run the + following command inside the BridgeDB source directory: + + $ xgettext lib/gettor/i18n.py -dgettor --from-code=utf-8 \ + -o i18n/templates/gettor.pot + $ for i in i18n/*/gettor.po; do \ + msgmerge -U $i i18n/templates/gettor.pot; done + Vidalia Help Files: The Transifex configuration file, source files and translations can

1 0

[tor/master] Fix signed/unsigned compare warning
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit fe86be61b6d84fbb442b13aa52139e6a3892dac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:42:00 2011 -0400 Fix signed/unsigned compare warning --- src/or/geoip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index a991654..654241c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -426,7 +426,7 @@ geoip_note_client_seen(geoip_client_action_t action, ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } - if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + if (now / 60 <= (int)MAX_LAST_SEEN_IN_MINUTES && now >= 0) ent->last_seen_in_minutes = (unsigned)(now/60); else ent->last_seen_in_minutes = 0;

1 0

[tor/master] Fix two compile warnings when using clang
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 473ff2656355a796761e9eb5e15b30cd853c58b6 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Mar 10 01:47:00 2011 +0100 Fix two compile warnings when using clang Issue found by Steven Murdoch --- src/or/geoip.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index e5694b9..f3e0b72 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,6 +278,8 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } +#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu + /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ @@ -413,12 +415,13 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); + tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); if (ent) { - ent->last_seen_in_minutes = now / 60; + ent->last_seen_in_minutes = (unsigned)(now/60); } else { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = now / 60; + ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); }

1 0

[tor/master] Merge remote branch 'sebastian/bug2696' into maint-0.2.2
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit f3d666366555226ec2ad0f647489a1d42145a2eb Merge: 9dfa244 4aac35c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:39:40 2011 -0400 Merge remote branch 'sebastian/bug2696' into maint-0.2.2 changes/bug2696 | 5 +++++ configure.in | 24 +++++++++++++++++++----- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-)

1 0

[tor/master] Fix compilation under LLVM/clang with --enable-gcc-warnings
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 56bdc844ba68ac0911efc7ad3398f1eafeaaac76 Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Wed Mar 9 19:05:51 2011 +0000 Fix compilation under LLVM/clang with --enable-gcc-warnings - When compiling using clang (2.9 or lower) do not enable -Wnormalized=id or -Woverride-init when --enable-gcc-warnings or --enable-gcc-warnings-advisory is set as these options are unsupported. --- configure.in | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index f30402d..9999f60 100644 --- a/configure.in +++ b/configure.in @@ -894,6 +894,11 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy #error #endif])], have_gcc43=yes, have_gcc43=no) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ +#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9) +#error +#endif])], have_clang29orlower=yes, have_clang29orlower=no) + save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wshorten-64-to-32" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], have_shorten64_flag=yes, @@ -924,11 +929,19 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy if test x$have_gcc42 = xyes ; then # These warnings break gcc 4.0.2 and work on gcc 4.2 # XXXX020 See if any of these work with earlier versions. - CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1" + CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1" + # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi - if test x$have_gcc43 = xyes ; then + if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then + # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2 + # We only disable these for clang 2.9 and lower, in case they are + # supported in later versions. + CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init" + fi + + if test x$have_gcc43 = xyes ; then # These warnings break gcc 4.2 and work on gcc 4.3 # XXXX020 See if any of these work with earlier versions. CFLAGS="$CFLAGS -Wextra -Warray-bounds"

1 0

[tor/master] Add 2696 changes file
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 4aac35cafa9843d10b05921da51dcc42bc3e9176 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Mar 18 17:13:43 2011 +0100 Add 2696 changes file --- changes/bug2696 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug2696 b/changes/bug2696 new file mode 100644 index 0000000..6ea41d4 --- /dev/null +++ b/changes/bug2696 @@ -0,0 +1,5 @@ + o Minor features: + - Make compilation with clang possible when using + --enable-gcc-warnings by removing two warnings that clang hasn't + implemented yet and by fixing a few warnings. Implements ticket + 2696.

1 0

[tor/master] Futz with the clang patch a bit and tidy some geoip.c stuff
by nickm＠torproject.org 18 Mar '11

18 Mar '11

commit 547635c0049ec92e929e0f360f729b5dd308a215 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 17 14:06:04 2011 -0400 Futz with the clang patch a bit and tidy some geoip.c stuff --- src/or/geoip.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/geoip.c b/src/or/geoip.c index f3e0b72..a991654 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -278,19 +278,24 @@ geoip_is_loaded(void) return geoip_countries != NULL && geoip_entries != NULL; } -#define MAX_LAST_SEEN_IN_MINUTES 0x3FFFFFFFu - /** Entry in a map from IP address to the last time we've seen an incoming * connection from that IP address. Used by bridges only, to track which * countries have them blocked. */ typedef struct clientmap_entry_t { HT_ENTRY(clientmap_entry_t) node; uint32_t ipaddr; + /** Time when we last saw this IP address, in MINUTES since the epoch. + * + * (This will run out of space around 4011 CE. If Tor is still in use around + * 4000 CE, please remember to add more bits to last_seen_in_minutes.) */ unsigned int last_seen_in_minutes:30; unsigned int action:2; } clientmap_entry_t; -#define ACTION_MASK 3 +/** Largest allowable value for last_seen_in_minutes. (It's a 30-bit field, + * so it can hold up to (1u<<30)-1, or 0x3fffffffu. + */ +#define MAX_LAST_SEEN_IN_MINUTES 0X3FFFFFFFu /** Map from client IP address to last time seen. */ static HT_HEAD(clientmap, clientmap_entry_t) client_history = @@ -415,16 +420,16 @@ geoip_note_client_seen(geoip_client_action_t action, lookup.ipaddr = addr; lookup.action = (int)action; ent = HT_FIND(clientmap, &client_history, &lookup); - tor_assert(now / 60 <= MAX_LAST_SEEN_IN_MINUTES); - if (ent) { - ent->last_seen_in_minutes = (unsigned)(now/60); - } else { + if (! ent) { ent = tor_malloc_zero(sizeof(clientmap_entry_t)); ent->ipaddr = addr; - ent->last_seen_in_minutes = (unsigned)(now/60); ent->action = (int)action; HT_INSERT(clientmap, &client_history, ent); } + if (now / 60 <= MAX_LAST_SEEN_IN_MINUTES && now >= 0) + ent->last_seen_in_minutes = (unsigned)(now/60); + else + ent->last_seen_in_minutes = 0; if (action == GEOIP_CLIENT_NETWORKSTATUS || action == GEOIP_CLIENT_NETWORKSTATUS_V2) {

1 0

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

18 Mar '11

commit 8b393afa94891cb7d4d0371ff38469fbabbe61b3 Merge: 1db6eb6 fe86be6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 18 12:44:37 2011 -0400 Merge remote branch 'origin/maint-0.2.2' Trivial Conflicts: configure.in changes/bug2696 | 5 +++++ configure.in | 22 ++++++++++++++++++---- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 36 insertions(+), 9 deletions(-) diff --cc configure.in index d7cb91f,4436fe2..f5dcf44 --- a/configure.in +++ b/configure.in @@@ -1129,10 -927,11 +1135,11 @@@ if test x$enable_gcc_warnings = xyes | CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition" fi - if test x$have_gcc42 = xyes ; then + if test x$have_gcc42 = xyes ; then # These warnings break gcc 4.0.2 and work on gcc 4.2 # XXXX020 See if any of these work with earlier versions. - CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wnormalized=id -Woverride-init -Wstrict-overflow=1" + CFLAGS="$CFLAGS -Waddress -Wmissing-noreturn -Wstrict-overflow=1" + # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3. fi

1 0