Nick Mathewson
4235425fce
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-10 19:53:31 -04:00
Nick Mathewson
301faf2813
Merge branch 'bug8447_squashed' into maint-0.2.4
2013-03-10 19:52:43 -04:00
Nick Mathewson
339df5df08
Fix 8447: use %u to format circid_t.
...
Now that circid_t is 4 bytes long, the default integer promotions will
leave it alone when sizeof(int) == 4, which will leave us formatting an
unsigned as an int. That's technically undefined behavior.
Fixes bug 8447 on bfffc1f0fc
. Bug not
in any released Tor.
2013-03-10 19:52:06 -04:00
Nick Mathewson
d13b996d83
Fix to test for bug8444 / 6034
2013-03-09 19:56:43 -05:00
Andrea Shepard
8027ebb5fd
Better comment for dirserv_query_measured_bw_cache()
2013-03-07 15:59:30 -08:00
Andrea Shepard
b522434834
Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision
2013-03-07 15:55:01 -08:00
Andrea Shepard
6e978ab829
Add unit test for dirserv measured bandwidth cache
2013-03-07 15:41:22 -08:00
Karsten Loesing
3dde6d5d29
Update to the March 2013 GeoIP database.
2013-03-07 20:58:31 +01:00
Karsten Loesing
5cad78c2ce
Manually fix yet another fourteen 'A1' ranges.
...
MaxMind added fourteen new 'A1' ranges in their March 2013 database that
the automatic substitution algorithm couldn't fix. Fix them manually.
2013-03-07 20:55:46 +01:00
Andrea Shepard
302d1dae6c
Make sure expiry check in dirserv_expire_measured_bw_cache() works if time_t is unsigned
2013-03-07 05:10:54 -08:00
Andrea Shepard
c7947619df
More constness in dirserv.c
2013-03-07 05:05:56 -08:00
Andrea Shepard
75eb79a6aa
Make dirserv_cache_measured_bw() use a const measured_bw_line_t *
2013-03-07 03:42:14 -08:00
Andrea Shepard
0efe96cae8
Call dirserv_clear_measured_bw_cache() from dirserv_free_all()
2013-03-05 13:11:43 -08:00
Nick Mathewson
62ef02ad65
A couple more easy unit tests
2013-03-02 10:56:57 -05:00
Nick Mathewson
55ce9bff54
Remove unused check_fingerprint_syntax
2013-03-01 22:01:26 -05:00
Nick Mathewson
a05dc378e3
Remove unused HMAC-SHA1 function
...
(We're not adding any new SHA1 instances in our protocols, so this
should never actually be needed.)
2013-03-01 21:59:12 -05:00
Nick Mathewson
289653c392
Remove a few more unused functions.
2013-03-01 21:57:52 -05:00
Nick Mathewson
a6c7630845
Unit tests for a few more functions and cases in address.c
...
This brings address's coverage up over 80%.
2013-03-01 14:48:33 -05:00
Nick Mathewson
6dfa709030
Remove the unused addr_mask_cmp_bits
2013-03-01 14:46:34 -05:00
Nick Mathewson
24fb926726
Remove the unused parse_addr_and_port_range
2013-03-01 14:35:17 -05:00
Nick Mathewson
f6697d5b3b
More unit tests for old TAP onion handshake.
...
The test coverage for onion_tap.c is now at 89%, up from 67%.
2013-03-01 14:06:09 -05:00
Nick Mathewson
165b2c0123
Add unit test for tor_addr_is_loopback
2013-03-01 12:40:41 -05:00
Nick Mathewson
b528aaef03
Make sure that [::1] is recognized as a private address
...
Fixes bug 8377; bugfix on 0.2.1.3-alpha.
2013-03-01 12:22:57 -05:00
Nick Mathewson
045c989d03
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-01 10:19:19 -05:00
Andrea Shepard
74c33945e3
Correctly set entry->is_dir_cache when adding an entry guard for the first time
...
(Second part of a bug8367 fix. -NM)
2013-03-01 10:17:07 -05:00
Nick Mathewson
ad49abe5a1
Fix bootstrapping with bridges by making is_dir_cache is set on them.
...
This fixes bug 8367, introduced in d7089ff228
. Not in
any released Tor.
2013-03-01 10:17:07 -05:00
Nick Mathewson
dc4ccfdbe2
Merge branch 'bug8367_v2'
2013-03-01 09:33:15 -05:00
Andrea Shepard
8b26766a66
Correctly set entry->is_dir_cache when adding an entry guard for the first time
...
(Second part of a bug8367 fix. -NM)
2013-03-01 09:32:37 -05:00
Nick Mathewson
c0b1f05fe7
Fix bootstrapping with bridges by making is_dir_cache is set on them.
...
This fixes bug 8367, introduced in d7089ff228
. Not in
any released Tor.
2013-03-01 09:32:17 -05:00
Nick Mathewson
c72d58cbff
Merge remote-tracking branch 'public/feature8109'
2013-03-01 00:33:37 -05:00
Nick Mathewson
94d0f226e6
Whoops. I forgot the "alpha"
2013-03-01 00:16:46 -05:00
Nick Mathewson
d9293ab3a7
Bump version in master to 0.2.5.0-alpha-dev
2013-03-01 00:13:36 -05:00
Andrea Shepard
b5a164bde4
Prefer measured bandwidths over advertised when computing things for votes on a dirauth
2013-02-27 19:43:50 -08:00
Nick Mathewson
4740d2e8bc
Remove some lingering tsocks cruft.
...
Now the manpages no longer refer to tsocks or tsocks.conf, and we no
longer have or ship a tor-tsocks.conf. The only remaining instances
of "tsocks" in our repository are old ChangeLog and ReleaseNotes
entries, and the torify script saying that it doesn't support tsocks.
Fixes bug 8290.
2013-02-27 19:39:57 -05:00
Roger Dingledine
9bc05c30d7
update the in-progress bandwidth requirements for authorities
2013-02-25 09:19:04 -05:00
Nick Mathewson
6879910334
Fix a comment in tor_main.c
...
We don't use subversion or src/*/makefile.am any longer
2013-02-25 03:24:53 -05:00
Nick Mathewson
a4e9d67292
Remove some functions which were unused except for their tests
2013-02-23 23:38:43 -05:00
Nick Mathewson
5bfa373eee
Remove some totally unused functions
2013-02-23 23:31:31 -05:00
Nick Mathewson
365e302f61
Remove a bunch of unused macro definitions
2013-02-23 23:05:25 -05:00
Nick Mathewson
9f044eac77
Refactor format_networkstatus_vote to avoid preallocating a buffer.
...
This saves a lot of "are we about to overrun the buffer?" checking,
and unmoots a bunch of "did we allocate enough" discussion.
2013-02-20 00:36:59 -05:00
Nick Mathewson
7bb51fdd89
Rename circuit_expire_all_dirty_circs
...
The new name is circuit_mark_all_dirty_circs_as_unusable.
This resolves an XXX024
2013-02-19 18:37:03 -05:00
Nick Mathewson
62fb209d83
Stop frobbing timestamp_dirty as our sole means to mark circuits unusable
...
In a number of places, we decrement timestamp_dirty by
MaxCircuitDirtiness in order to mark a stream as "unusable for any
new connections.
This pattern sucks for a few reasons:
* It is nonobvious.
* It is error-prone: decrementing 0 can be a bad choice indeed.
* It really wants to have a function.
It can also introduce bugs if the system time jumps backwards, or if
MaxCircuitDirtiness is increased.
So in this patch, I add an unusable_for_new_conns flag to
origin_circuit_t, make it get checked everywhere it should (I looked
for things that tested timestamp_dirty), and add a new function to
frob it.
For now, the new function does still frob timestamp_dirty (after
checking for underflow and whatnot), in case I missed any cases that
should be checking unusable_for_new_conns.
Fixes bug 6174. We first used this pattern in 516ef41ac1
,
which I think was in 0.0.2pre26 (but it could have been 0.0.2pre27).
2013-02-19 18:29:17 -05:00
Nick Mathewson
3dc52e6636
Add src/or/micro-revision.i to CLEANFILES in case anybody has one
...
Fix for 7143.
2013-02-19 17:53:38 -05:00
Nick Mathewson
1827be0bd6
Make a parse_config_line_from_str variant that gives error messages
...
Without this patch, there's no way to know what went wrong when we
fail to parse a torrc line entirely (that is, we can't turn it into
a K,V pair.) This patch introduces a new function that yields an
error message on failure, so we can at least tell the user what to
look for in their nonfunctional torrc.
(Actually, it's the same function as before with a new name:
parse_config_line_from_str is now a wrapper macro that the unit
tests use.)
Fixes bug 7950; fix on 0.2.0.16-alpha (58de695f90
) which first
introduced the possibility of a torrc value not parsing correctly.
2013-02-19 17:36:17 -05:00
Nick Mathewson
5d2b2b9ede
Clear up a comment about when an assertion could fire
...
Resolves ticket 6164
2013-02-19 16:23:58 -05:00
Nick Mathewson
337e32f5b8
fix a wide line
2013-02-19 15:08:54 -05:00
Nick Mathewson
8ddf4e218e
Merge branch 'bug8065_v2'
2013-02-19 15:02:22 -05:00
Nick Mathewson
3340d3279d
Downgrade an assert to LD_BUG
...
This should prevent crashes on further recurrence of 8065, and help
diagnose such if they occur
2013-02-19 15:02:08 -05:00
Nick Mathewson
804be10b09
Fix a may-be-used-uninitialized warning.
2013-02-19 15:00:08 -05:00
Nick Mathewson
b0b0d6af63
Merge branch 'bug2286_unit_test_squashed'
2013-02-19 14:54:05 -05:00