Nick Mathewson
a4995d1507
Merge branch 'tickets_5529_5534_5974_6406'
2012-07-19 17:52:21 -04:00
Linus Nordberg
fff842a47c
Add config option AuthDirPublishIPv6.
...
Test for config option AuthDirPublishIPv6 == 1 rather than for running
as a bridge authority when deciding whether to care or not about IPv6
OR ports in descriptors.
Implements enhancement #6406 .
2012-07-19 17:51:15 -04:00
Nick Mathewson
6208106c18
Try to re-approximate the older semantics of nodelist_add_routerinfo
2012-07-19 17:51:15 -04:00
Linus Nordberg
dee4f068ee
Don't shadow 'buf'.
2012-07-19 18:21:23 +02:00
Linus Nordberg
0fe6dde4b2
Add changes file for #5534 .
2012-07-19 18:21:22 +02:00
Linus Nordberg
044da1bf0f
Add configure option AuthDirHasIPv6Connectivity.
...
Implements enhancement 5974.
2012-07-19 18:21:22 +02:00
Linus Nordberg
cdef2b181a
Rename routers_have_same_or_addr() to reflect the fact that it now checks both OR ports.
2012-07-19 18:21:22 +02:00
Linus Nordberg
7c80a4502c
Include IPv6 OR ports in status documents only if we're a bridge authority.
2012-07-19 18:21:21 +02:00
Linus Nordberg
6d99c51f15
Don't put unreachable IPv6 OR port in routerstatus.
...
To have only reachable ports in "a" lines.
2012-07-19 18:21:21 +02:00
Linus Nordberg
dda177b19e
Add "a" line to status document.
2012-07-19 18:21:21 +02:00
Linus Nordberg
4cce8ab742
Add last_reachable and testing_since for IPv6 OR port.
2012-07-19 18:21:20 +02:00
Linus Nordberg
c1ff07440e
Don't assume that a node has routerinfo.
...
We can end up in dirserv_orconn_tls_done() with a node missing
routerinfo in at least two cases -- command_process_certs_cell() and
connection_or_check_valid_tls_handshake() -- and probably more.
2012-07-19 18:21:20 +02:00
Linus Nordberg
631ec5c4fe
Move last_reachable and testing_since from routerinfo_t to node_t.
2012-07-19 18:21:20 +02:00
Nick Mathewson
24451e6f7d
Avoid double-typedef of transport_t.
...
You can say "struct foo_t" as much as you want, but you'd better not
have "typedef struct foo_t foo_t" more than once.
Fix for bug 6416. Bug not in any released version of Tor.
2012-07-19 09:06:11 -04:00
George Kadianakis
a1d060a68f
Better handling of server managed proxies when Tor is not a relay.
2012-07-18 20:01:02 +02:00
Nick Mathewson
393944dfb6
Have the bug6252 commit message reflect its on-again/off-again status
2012-07-18 10:24:17 -04:00
Roger Dingledine
c1bd104111
Detect bug 6252 (unexpected sendme cell)
...
I only check on circuits, not streams, since bloating your stream
window past the initial circuit window can't help you much.
Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising
races if we lower CIRCWINDOW_START for an experiment.
2012-07-18 10:23:04 -04:00
Nick Mathewson
f8c9cc713d
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-18 10:14:40 -04:00
Nick Mathewson
b355ddb20f
Merge branch 'smartlist_shorten' into maint-0.2.3
2012-07-18 10:14:14 -04:00
Nick Mathewson
78dec94307
Tweaks to 6400 changes file and docs as suggested by arma
2012-07-18 10:12:19 -04:00
Nick Mathewson
ec8bdc5da8
Merge remote-tracking branch 'asn/bug3589'
2012-07-17 12:05:08 -04:00
Nick Mathewson
f9478b7a79
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-17 12:03:10 -04:00
Nick Mathewson
4cac5df554
Improve message on spurious SOCKSListenAddress
2012-07-17 12:02:55 -04:00
Nick Mathewson
efdf6c7118
Fix the remaining instances of nexted SMARTLIST_FOREACH
2012-07-17 10:41:24 -04:00
Nick Mathewson
7faf115dff
Change all SMARTLIST_FOREACH loops of >=10 lines to use BEGIN/END
...
The SMARTLIST_FOREACH macro is more convenient than BEGIN/END when
you have a nice short loop body, but using it for long bodies makes
your preprocessor tell the compiler that all the code is on the same
line. That causes grief, since compiler warnings and debugger lines
will all refer to that one line.
So, here's a new style rule: SMARTLIST_FOREACH blocks need to be
short.
2012-07-17 10:34:08 -04:00
Nick Mathewson
0b6fb5ebcd
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-17 09:50:18 -04:00
Linus Nordberg
21c6c84853
Allow TestingTorNetwork when alternate dir and bridge authorities are set.
...
Allow TestingTorNetwork when AlternateDirAuthority and
AlternateBridgeAuthority is set even if DirServer is not.
2012-07-17 09:35:38 -04:00
Nick Mathewson
7ac8a4a037
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-16 11:50:53 -04:00
Nick Mathewson
93b7301755
Refer to the correct variable in a loop when parsing entry guard state
...
Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta.
2012-07-16 11:49:45 -04:00
Nick Mathewson
d32f5081e1
Coverity 709056: Check return value on fputs in tor-gencert
2012-07-16 11:38:39 -04:00
Nick Mathewson
deaf30a8af
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-16 11:22:41 -04:00
Nick Mathewson
9ad5b25930
Improve Alternate*Authority docs. Bug 6387.
2012-07-16 11:21:20 -04:00
George Kadianakis
8b9f4d75f2
Address Nick's comments.
...
- Add a changes/ file.
- Make it compile under --enable-gcc-warnings.
- Update the file-level documentation of src/or/transports.c.
- Only update descriptor if at least a managed proxy was configured.
- Add our external IP address to the extra-info descriptor instead of 0.0.0.0.
2012-07-12 15:28:43 +02:00
Roger Dingledine
6652477526
forward-port the 0.2.3.19-rc changelog
2012-07-07 04:59:39 -04:00
Roger Dingledine
6cad84503b
Merge branch 'maint-0.2.3'
2012-07-06 16:32:08 -04:00
Roger Dingledine
5ddb9b3134
Merge branch 'maint-0.2.2' into maint-0.2.3
2012-07-06 16:31:40 -04:00
Roger Dingledine
4e7552e552
Revert to the May 2012 geoip db
...
The June 2012 db marks too many relays as country "A1".
Addresses bug 6334.
2012-07-06 16:29:51 -04:00
Roger Dingledine
1fee920999
Merge branch 'maint-0.2.3'
2012-07-06 08:59:26 -04:00
Roger Dingledine
27ec0248d2
Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3
2012-07-06 08:57:29 -04:00
Nick Mathewson
7e1a0bb24e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-06 08:03:16 -04:00
George Kadianakis
62c1311b3a
Fix port range in parse_port_range().
2012-07-06 08:02:14 -04:00
Nick Mathewson
419f541aa7
Fix a bug handling SENDME cells on nonexistent streams.
...
This could result in bizarre window values. Report and patch
contributed pseudymously. Fixes part of bug 6271. This bug was
introduced before the first Tor release, in svn commit r152.
(bug 6271, part a.)
2012-07-06 07:29:54 -04:00
Nick Mathewson
d30783ecbb
Fix compilation on 32-bit. Fix for bug 6277, not in any released tor.
2012-07-05 16:44:07 -04:00
Nick Mathewson
7e8d7a017e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-07-05 05:08:54 -04:00
Nick Mathewson
e9b33ed1bf
On windows, ENOBUFS starts with WSA. #6296 . Fix on 0.2.18-rc
2012-07-05 05:01:00 -04:00
George Kadianakis
f8e49c5789
Change extra-info "method" to "transport".
2012-07-03 21:26:03 +03:00
George Kadianakis
ca4e986c1d
Mark descriptor as dirty if all managed proxies are configured.
2012-07-03 21:26:03 +03:00
George Kadianakis
9dea3a03b9
Add pluggable transport info to extra-info descriptors.
2012-07-03 21:26:03 +03:00
George Kadianakis
4bafe24400
Constify some functions.
2012-07-03 21:26:03 +03:00
George Kadianakis
17caec3676
Make some transports.c functions static.
...
- Also reorder functions.
2012-07-03 21:26:03 +03:00
