summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2012-11-06Allow a v4 link protocol for 4-byte circuit IDs.Nick Mathewson
Implements proposal 214. Needs testing.
2012-11-06Merge branch 'bug7285'Nick Mathewson
2012-11-06Add warning message when a managed proxy dies during configuration.George Kadianakis
2012-11-06Fix a stupid logic-error in warnings about low ports.Nick Mathewson
Instead of warning about low ports that are advertised, we should have been warning about low ports that we're listening on. Bug 7285, fix on 0.2.3.9-alpha.
2012-11-04Merge remote-tracking branch 'asn/bug7292'Nick Mathewson
2012-11-04Whitespace fixesNick Mathewson
2012-11-04Clean up nonsensical calling convention for config_load_geoip_file_Nick Mathewson
(How many "load a file" functions do you typically see where the function frees the filename argument?)
2012-11-04Merge remote-tracking branch 'linus/bug5053-bug5055'Nick Mathewson
Conflicts: src/or/geoip.c
2012-11-02Use LOG_WARN instead of LOG_PROTOCOL_WARN when parsing transport lines.George Kadianakis
2012-11-02Avoid c99 designated initializers in circuitmux_ewma.cNick Mathewson
We still want to build on compilers w/o c99 support, such as (notoriously, shamefully) MSVC. So I'm commenting out the designated initializers in circuitmux_ewma.c. The alternative would have been to use some kind of macros to use designated initializers only when they're supported, but that's error-prone, and can lead to code having different meanings under different compilers. Bug 7286; fix on 0.2.4.4-alpha; spotted by Gisle Vanem.
2012-10-31Change some comments to reflect the multitude of GeoIP databases.Linus Nordberg
2012-10-31Fix whitespaceNick Mathewson
2012-10-31Don't memcmp struct in6_addr but rather its s6_addr member.Linus Nordberg
2012-10-31Duplicate less code.Linus Nordberg
2012-10-30Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/torAndrea Shepard
2012-10-23Fix a remotely triggerable assertion failure (CVE-2012-2250)Nick Mathewson
If we completed the handshake for the v2 link protocol but wound up negotiating the wong protocol version, we'd become so confused about what part of the handshake we were in that we'd promptly die with an assertion. This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha. All servers running that version or later should really upgrade. Bug and fix from "some guy from France." I tweaked his code slightly to make it log the IP of the offending node, and to forward-port it to 0.2.4.
2012-10-23Merge branch 'maint-0.2.3'Roger Dingledine
2012-10-23Let 0.2.3 clients exit to internal addresses if they wantRoger Dingledine
Clients now consider the ClientRejectInternalAddresses config option when using a microdescriptor consensus stanza to decide whether an exit relay would allow exiting to an internal address. Fixes bug 7190; bugfix on 0.2.3.1-alpha.
2012-10-23fix typoRoger Dingledine
2012-10-23Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2012-10-23Fix parse_short_policy (bug 7192.)Nick Mathewson
Our implementation of parse_short_policy was screwed up: it would ignore the last character of every short policy. Obviously, that's broken. This patch fixes the busted behavior, and adds a bunch of unit tests to make sure the rest of that function is okay. Fixes bug 7192; fix on 0.2.3.1-alpha.
2012-10-22add a unit test to expose bug 7192Roger Dingledine
2012-10-22Fix more madness from the split_circuitbuild mergeNick Mathewson
2012-10-22Kill extraneous x from 907db008ab0007f0a02Nick Mathewson
Looks like clang doesn't complain about this kind of thing. Spotted by Andrea. Bug not in any released version.
2012-10-22Merge branch 'split_circuitbuild'Nick Mathewson
Conflicts: src/or/circuitbuild.c There was a huge-looking conflict in circuitbuild.c, but the only change that had been made to circuitbuild.c since I forked off the split_circuitbuild branch was 17442560c44e8093f9a. So I took the split_circuitbuild version of the conflicting part, and manually re-applied the change from 17442560c44e8093f9a..
2012-10-22Name variables more consistently.Linus Nordberg
2012-10-22Document two functions.Linus Nordberg
2012-10-20Rename C reserved identifiers missed before.Linus Nordberg
2012-10-20Add "IPVersions" to control command "status/clients-seen".Linus Nordberg
2012-10-20Duplicate less code.Linus Nordberg
2012-10-20Separate IPv4 and IPv6 geoip file loading.Linus Nordberg
Also add IPv6 geoip file digest to extra info. Also also, add support for IPv6 addresses in control command "ip-to-country".
2012-10-19Merge branch 'block_renegotiate_024'Nick Mathewson
2012-10-19Merge branch 'block_renegotiate_023' into maint-0.2.3Nick Mathewson
2012-10-19Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2012-10-19Don't serve or accept v2 HS descs over a DirPortRobert Ransom
(changes file tweaked by nickm)
2012-10-18Factor out common parts of channel_tls_connect() and ↵Andrea Shepard
channel_tls_handle_incoming(); fixes get_remote_addr problem with incoming connections for bug 7112
2012-10-17Discard extraneous renegotiation attempts in the v3 link protocolNick Mathewson
Failure to do so left us open to a remotely triggerable assertion failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by "some guy from France". This patch is a forward-port to 0.2.4, to work with the new channel logic.
2012-10-17Discard extraneous renegotiation attempts in the v3 link protocolNick Mathewson
Failure to do so left us open to a remotely triggerable assertion failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by "some guy from France".
2012-10-17Fix a bug in channel_dump_statisticsNick Mathewson
We were calling channel_get_actual_remote_descr() before we used the output of a previous channel_get_canonical_remote_descr(), thus invalidating its output.
2012-10-17Document lifespan of return values of the _remote_descr() funcsNick Mathewson
2012-10-17Restore the 'address' value of tunneled connectionsNick Mathewson
When we merged the channel code, we made the 'address' field of linked directory connections created with begindir (and their associated edge connections) contain an address:port string, when they should only have contained the address part. This patch also tweaks the interface to the get_descr method of channels so that it takes a set of flags rather than a single flag.
2012-10-17Fix for bug 7112 (spewing complaints from tor_addr_is_internal)Nick Mathewson
In 4768c0efe3e9471cc367c3740d1a4ba0ab79626c (not in any released version of Tor), we removed a little block of code that set the addr field of an exit connection used in making a tunneled directory request. Turns out that wasn't right.
2012-10-17Document return value of channel_get_addr_if_possibleNick Mathewson
2012-10-17White space.Linus Nordberg
2012-10-17Use LD_PROTOCOL rather than LD_BUG to warn about bogus reason codes that ↵Andrea Shepard
originated remotely in circuit_end_reason_to_control_string()
2012-10-17Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in ↵Andrea Shepard
circuit_truncated()
2012-10-17Two changes lost in rebase resurrected.Linus Nordberg
2012-10-17Rename reserved C identifiers.Linus Nordberg
2012-10-17Minor tweaks to nils' v4 vs v6 bridge usage code.Karsten Loesing
2012-10-17Minor tweaks and comments to nils' geoip v6 code.Karsten Loesing