]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
14 years agoThis commit is an attempt to beautify the previous commit.
George Kadianakis [Tue, 14 Jun 2011 02:28:36 +0000 (04:28 +0200)] 
This commit is an attempt to beautify the previous commit.

It creates some helper functions that return the proxy type, proxy addr/port, etc.

14 years agoOur warning now is much more specific, mentioning proxy type/addr/port.
George Kadianakis [Tue, 14 Jun 2011 01:27:07 +0000 (03:27 +0200)] 
Our warning now is much more specific, mentioning proxy type/addr/port.

Not included in the previous commit, because the implementation is
ugly; I see no other way of doing this though.

14 years agoWe now warn the user if a proxy server is not up when we try to connect with it.
George Kadianakis [Tue, 14 Jun 2011 00:51:59 +0000 (02:51 +0200)] 
We now warn the user if a proxy server is not up when we try to connect with it.

14 years agoVarious trivial changes.
George Kadianakis [Sun, 12 Jun 2011 14:41:32 +0000 (16:41 +0200)] 
Various trivial changes.

* Improved function documentation.
* Renamed find_bridge_transport_by_addrport() to
  find_transport_by_bridge_addrport().
* Sanitized log severities we use.
* Ran check-spaces.

14 years agoWe can now connect using transports as well!
George Kadianakis [Sat, 11 Jun 2011 22:14:11 +0000 (00:14 +0200)] 
We can now connect using transports as well!

14 years agoWe can now match our transports with our bridges.
George Kadianakis [Sat, 11 Jun 2011 21:20:39 +0000 (23:20 +0200)] 
We can now match our transports with our bridges.

14 years agoClientTransportPlugin parsing done.
George Kadianakis [Sat, 11 Jun 2011 15:08:31 +0000 (17:08 +0200)] 
ClientTransportPlugin parsing done.

14 years agofix typo in changes/coverity_master spotted by rransom
Nick Mathewson [Fri, 10 Jun 2011 20:40:47 +0000 (16:40 -0400)] 
fix typo in changes/coverity_master spotted by rransom

14 years agoMove errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373
Nick Mathewson [Fri, 10 Jun 2011 05:04:12 +0000 (01:04 -0400)] 
Move errant doc/nodefamily_routerset into 0.2.3.1-alpha ChangeLog. Fix bug 3373

14 years agoUpgrade to the latest version of tinytest
Nick Mathewson [Thu, 9 Jun 2011 21:30:09 +0000 (17:30 -0400)] 
Upgrade to the latest version of tinytest

14 years agoPrefer tt_assert in unit tests, not tor_assert
Nick Mathewson [Thu, 9 Jun 2011 00:33:53 +0000 (20:33 -0400)] 
Prefer tt_assert in unit tests, not tor_assert

14 years agotweak coverity_master changes file
Nick Mathewson [Thu, 9 Jun 2011 00:29:10 +0000 (20:29 -0400)] 
tweak coverity_master changes file

14 years agoFix a memleak in nodelist_assert_ok()
Sebastian Hahn [Wed, 8 Jun 2011 19:38:42 +0000 (21:38 +0200)] 
Fix a memleak in nodelist_assert_ok()

14 years agoRemove a dead variable in the heartbeat code
Sebastian Hahn [Wed, 8 Jun 2011 19:10:43 +0000 (21:10 +0200)] 
Remove a dead variable in the heartbeat code

14 years agoFix a minor coverity-found bug in tests
Sebastian Hahn [Wed, 8 Jun 2011 17:58:27 +0000 (19:58 +0200)] 
Fix a minor coverity-found bug in tests

14 years agoUpdate the uptime string to include an hours indicator
Sebastian Hahn [Mon, 16 May 2011 19:58:01 +0000 (21:58 +0200)] 
Update the uptime string to include an hours indicator

Before, it wasn't really obvious if one meant hours:minutes or
minutes:seconds etc.

14 years agoFix crash bug (3361) when setting off-flavor networkstatus
Nick Mathewson [Tue, 7 Jun 2011 18:46:28 +0000 (14:46 -0400)] 
Fix crash bug (3361) when setting off-flavor networkstatus

When we set a networkstatus in the non-preferred flavor, we'd check
the time in the current_consensus.  But that might have been NULL,
which could produce a crash as seen in bug 3361.

14 years agoMerge remote-tracking branch 'asn2/bug3336'
Nick Mathewson [Mon, 6 Jun 2011 22:34:45 +0000 (18:34 -0400)] 
Merge remote-tracking branch 'asn2/bug3336'

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 6 Jun 2011 20:20:22 +0000 (16:20 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoMerge branch 'bug3306_nm_squashed' into maint-0.2.2
Nick Mathewson [Mon, 6 Jun 2011 20:18:24 +0000 (16:18 -0400)] 
Merge branch 'bug3306_nm_squashed' into maint-0.2.2

14 years agoDetect insanely large circuit build state; don't give its length to rand_int
Nick Mathewson [Wed, 1 Jun 2011 16:12:01 +0000 (12:12 -0400)] 
Detect insanely large circuit build state; don't give its length to rand_int

14 years agoCheck maximum properly in crypto_rand_int()
Nick Mathewson [Wed, 1 Jun 2011 15:48:39 +0000 (11:48 -0400)] 
Check maximum properly in crypto_rand_int()

George Kadianakis notes that if you give crypto_rand_int() a value
above INT_MAX, it can return a negative number, which is not what
the documentation would imply.

The simple solution is to assert that the input is in [1,INT_MAX+1].
If in the future we need a random-value function that can return
values up to UINT_MAX, we can add one.

Fixes bug 3306; bugfix on 0.2.2pre14.

14 years agoAdd the heartbeat domain in log.c:domain_list[]
George Kadianakis [Sun, 5 Jun 2011 19:27:53 +0000 (21:27 +0200)] 
Add the heartbeat domain in log.c:domain_list[]
so that parse_log_domain() doesn't fail.

14 years agoMerge branch 'maint-0.2.2'
Roger Dingledine [Sun, 5 Jun 2011 15:14:28 +0000 (11:14 -0400)] 
Merge branch 'maint-0.2.2'

14 years agoMerge branch 'maint-0.2.1' into maint-0.2.2
Roger Dingledine [Sun, 5 Jun 2011 15:13:50 +0000 (11:13 -0400)] 
Merge branch 'maint-0.2.1' into maint-0.2.2

14 years agomove to the june 1 2011 maxmind geoip db
Roger Dingledine [Sun, 5 Jun 2011 15:12:28 +0000 (11:12 -0400)] 
move to the june 1 2011 maxmind geoip db

14 years agoport-forward the 0.2.2.28-beta changelog stanza
Roger Dingledine [Sun, 5 Jun 2011 05:46:13 +0000 (01:46 -0400)] 
port-forward the 0.2.2.28-beta changelog stanza

14 years agoput the changelog stanzas in time order
Roger Dingledine [Sun, 5 Jun 2011 05:45:42 +0000 (01:45 -0400)] 
put the changelog stanzas in time order

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Fri, 3 Jun 2011 15:36:21 +0000 (11:36 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoMerge branch 'bug3318c' into maint-0.2.2
Nick Mathewson [Fri, 3 Jun 2011 15:34:32 +0000 (11:34 -0400)] 
Merge branch 'bug3318c' into maint-0.2.2

14 years agoReject 128-byte keys that are not 1024-bit
Nick Mathewson [Thu, 2 Jun 2011 16:32:59 +0000 (12:32 -0400)] 
Reject 128-byte keys that are not 1024-bit

When we added the check for key size, we required that the keys be
128 bytes.  But RSA_size (which defers to BN_num_bytes) will return
128 for keys of length 1017..1024.  This patch adds a new
crypto_pk_num_bits() that returns the actual number of significant
bits in the modulus, and uses that to enforce key sizes.

Also, credit the original bug3318 in the changes file.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Fri, 3 Jun 2011 15:18:03 +0000 (11:18 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoUse an autobool for UseBridges_
Nick Mathewson [Fri, 3 Jun 2011 15:17:15 +0000 (11:17 -0400)] 
Use an autobool for UseBridges_

14 years agoMerge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
Nick Mathewson [Fri, 3 Jun 2011 15:16:48 +0000 (11:16 -0400)] 
Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Fri, 3 Jun 2011 14:47:35 +0000 (10:47 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoChanges file for bug2355.
Nick Mathewson [Tue, 31 May 2011 03:49:16 +0000 (23:49 -0400)] 
Changes file for bug2355.

14 years agoUpdate man page for new UseBridges tristate behaviour.
anonym [Mon, 30 May 2011 21:52:02 +0000 (23:52 +0200)] 
Update man page for new UseBridges tristate behaviour.

14 years agoAdd an "auto" option to UseBridges
Nick Mathewson [Tue, 31 May 2011 03:32:38 +0000 (23:32 -0400)] 
Add an "auto" option to UseBridges

UseBridges 1 now means "connect only to bridges; if you know no
bridges, don't make connections."  UseBridges auto means "Use bridges
if they are known, and we have no EntryNodes set, and we aren't a
server."  UseBridges 0 means "don't use bridges."

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 2 Jun 2011 19:07:08 +0000 (15:07 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/rendclient.c

14 years agoMerge remote-tracking branch 'rransom-tor/bug3309' into maint-0.2.2
Nick Mathewson [Thu, 2 Jun 2011 19:06:04 +0000 (15:06 -0400)] 
Merge remote-tracking branch 'rransom-tor/bug3309' into maint-0.2.2

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 2 Jun 2011 17:05:00 +0000 (13:05 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

This merge was a bit nontrivial, since I had to write a new
node_is_a_configured_bridge to parallel router_is_a_configured_bridge.

Conflicts:
src/or/circuitbuild.c

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 2 Jun 2011 16:56:45 +0000 (12:56 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/dirserv.c

14 years agoMerge remote-tracking branch 'arma/bug3321' into maint-0.2.2
Nick Mathewson [Thu, 2 Jun 2011 16:55:56 +0000 (12:55 -0400)] 
Merge remote-tracking branch 'arma/bug3321' into maint-0.2.2

14 years agoFix unit test failure in dir/formats
Sebastian Hahn [Thu, 2 Jun 2011 11:30:32 +0000 (13:30 +0200)] 
Fix unit test failure in dir/formats

options->DirPort is 0 in the unit tests, so
router_get_advertised_dir_port() would return 0 so we wouldn't pick a
dirport. This isn't what we want for the unit tests. Fixes bug
introduced in 95ac3ea5946.

14 years agoAdd info-level log messages during HS-client-state purge
Robert Ransom [Thu, 2 Jun 2011 10:07:09 +0000 (03:07 -0700)] 
Add info-level log messages during HS-client-state purge

I hope these will never be useful, but having them and not needing them is
better than needing them and not having them.

14 years agoRefactor HS client state-clearing code into a separate function
Robert Ransom [Thu, 2 Jun 2011 09:57:29 +0000 (02:57 -0700)] 
Refactor HS client state-clearing code into a separate function

14 years agoClear last_hid_serv_requests on SIGNAL NEWNYM
Robert Ransom [Thu, 2 Jun 2011 09:46:04 +0000 (02:46 -0700)] 
Clear last_hid_serv_requests on SIGNAL NEWNYM

Fixes bug #3309.

14 years agoMake last_hid_serv_requests functions less fragile
Robert Ransom [Thu, 2 Jun 2011 09:24:18 +0000 (02:24 -0700)] 
Make last_hid_serv_requests functions less fragile

Previously, Tor would dereference a NULL pointer and crash if
lookup_last_hid_serv_request were called before the first call to
directory_clean_last_hid_serv_requests.  As far as I can tell, that's
currently impossible, but I want that undocumented invariant to go away
in case I^Wwe break it someday.

14 years agoUnbreak the build
Robert Ransom [Wed, 1 Jun 2011 16:39:27 +0000 (09:39 -0700)] 
Unbreak the build

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Wed, 1 Jun 2011 15:11:31 +0000 (11:11 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoFix compile error in procmon.c
Gisle [Wed, 1 Jun 2011 15:11:12 +0000 (11:11 -0400)] 
Fix compile error in procmon.c

An elusive compile-error (MingW-gcc v4.50 on Win_XP); a missing
comma (!) and a typo ('err_msg' at line 277 changed to 'errmsg').
Aso changed the format for 'err_code' at line 293 into a "%ld" to suppress
a warning. How did this go unnoticed for ~1 month? Btw. This is my 1st ever
'git commit', so it better work.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Wed, 1 Jun 2011 15:08:28 +0000 (11:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoReport wrong key sizes correctly
Nick Mathewson [Wed, 1 Jun 2011 15:07:08 +0000 (11:07 -0400)] 
Report wrong key sizes correctly

When we introduced NEED_KEY_1024 in routerparse.c back in
0.2.0.1-alpha, I forgot to add a *8 when logging the length of a
bad-length key.

Bugfix for 3318 on 0.2.0.1-alpha.

14 years agofix a bridge edge case similar to 2511
Roger Dingledine [Wed, 1 Jun 2011 00:43:55 +0000 (20:43 -0400)] 
fix a bridge edge case similar to 2511

If you had configured a bridge but then switched to a different bridge
via the controller, you would still be willing to use the old one.

14 years agostop asserting at boot
Roger Dingledine [Tue, 31 May 2011 03:50:37 +0000 (23:50 -0400)] 
stop asserting at boot

The patch for 3228 made us try to run init_keys() before we had loaded
our state file, resulting in an assert inside init_keys. We had moved
it too early in the function.

Now it's later in the function, but still above the accounting calls.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 30 May 2011 20:14:45 +0000 (16:14 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoMerge branch 'bug3216_v2' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 20:12:53 +0000 (16:12 -0400)] 
Merge branch 'bug3216_v2' into maint-0.2.2

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 30 May 2011 19:51:46 +0000 (15:51 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoMerge branch 'bug3289' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 19:50:35 +0000 (15:50 -0400)] 
Merge branch 'bug3289' into maint-0.2.2

14 years agoWarn when two hs use the same directory
Sebastian Hahn [Sat, 28 May 2011 22:54:59 +0000 (00:54 +0200)] 
Warn when two hs use the same directory

This simple implementation has a few issues, but it should do for
0.2.2.x. We will want to revisit this later and make it smarter.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 30 May 2011 19:41:46 +0000 (15:41 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

The conflicts were mainly caused by the routerinfo->node transition.

Conflicts:
src/or/circuitbuild.c
src/or/command.c
src/or/connection_edge.c
src/or/directory.c
src/or/dirserv.c
src/or/relay.c
src/or/rendservice.c
src/or/routerlist.c

14 years agominor cleanups while reviewing 3216
Roger Dingledine [Mon, 30 May 2011 19:31:06 +0000 (15:31 -0400)] 
minor cleanups while reviewing 3216

14 years agowhitespace fixes
Nick Mathewson [Mon, 30 May 2011 19:21:06 +0000 (15:21 -0400)] 
whitespace fixes

14 years agoMerge branch 'bug3045' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 19:18:59 +0000 (15:18 -0400)] 
Merge branch 'bug3045' into maint-0.2.2

Conflicts:
src/or/circuitbuild.c

14 years agoImprove comments and defensive programming for 3045
Nick Mathewson [Mon, 30 May 2011 19:15:10 +0000 (15:15 -0400)] 
Improve comments and defensive programming for 3045

The comment fixes are trivial.  The defensive programming trick is to
tolerate receiving NULL inputs on the describe functions. That should
never actually happen, but it seems like the likeliest mistake for us
to make in the future.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 30 May 2011 18:58:26 +0000 (14:58 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/common/compat.c
src/or/main.c

14 years agoMerge remote-tracking branch 'public/bug3270' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 18:49:49 +0000 (14:49 -0400)] 
Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 30 May 2011 16:43:25 +0000 (12:43 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoMerge branch 'bug3228_squashed' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 16:42:08 +0000 (12:42 -0400)] 
Merge branch 'bug3228_squashed' into maint-0.2.2

14 years agoReinit keys at the start of options_act().
Nick Mathewson [Mon, 23 May 2011 20:38:35 +0000 (16:38 -0400)] 
Reinit keys at the start of options_act().

Previously we did this nearer to the end (in the old_options &&
transition_affects_workers() block).  But other stuff cares about
keys being consistent with options... particularly anything which
tries to access a key, which can die in assert_identity_keys_ok().

Fixes bug 3228; bugfix on 0.2.2.18-alpha.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 30 May 2011 16:33:54 +0000 (12:33 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/circuituse.c

14 years agoMerge branch 'bug1297a' into maint-0.2.2
Nick Mathewson [Mon, 30 May 2011 16:25:07 +0000 (12:25 -0400)] 
Merge branch 'bug1297a' into maint-0.2.2

14 years agoUse the normal four-hop CBT for client intro circuits
Robert Ransom [Sun, 29 May 2011 15:21:43 +0000 (08:21 -0700)] 
Use the normal four-hop CBT for client intro circuits

Fixes another part of bug 1297.

14 years agoSet timestamp_dirty on HS circuits as circuit_expire_building requires
Robert Ransom [Sun, 29 May 2011 15:03:41 +0000 (08:03 -0700)] 
Set timestamp_dirty on HS circuits as circuit_expire_building requires

Fixes part of #1297; bugfix on 48e0228f1e031a709c1deb149c7dfd187c3609cf,
when circuit_expire_building was changed to assume that timestamp_dirty
was set when a circuit changed purpose to _C_REND_READY.  (It wasn't.)

14 years agoMerge branch 'maint-0.2.2'
Roger Dingledine [Sun, 29 May 2011 23:11:07 +0000 (19:11 -0400)] 
Merge branch 'maint-0.2.2'

14 years agoanswer an XXX nickm asked in aa950e6c4
Roger Dingledine [Sun, 29 May 2011 22:52:37 +0000 (18:52 -0400)] 
answer an XXX nickm asked in aa950e6c4

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Sat, 28 May 2011 06:13:25 +0000 (02:13 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Sat, 28 May 2011 06:13:14 +0000 (02:13 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoFix typo in changes/bug2574. Thanks, rransom
Nick Mathewson [Sat, 28 May 2011 06:13:04 +0000 (02:13 -0400)] 
Fix typo in changes/bug2574. Thanks, rransom

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Sat, 28 May 2011 06:09:48 +0000 (02:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/eventdns.c

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Sat, 28 May 2011 06:08:39 +0000 (02:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoMerge branch 'bug2574' into maint-0.2.1
Nick Mathewson [Sat, 28 May 2011 06:07:48 +0000 (02:07 -0400)] 
Merge branch 'bug2574' into maint-0.2.1

14 years agoFix a -Wunused-but-set-variable instance in master
Nick Mathewson [Sat, 28 May 2011 05:57:38 +0000 (01:57 -0400)] 
Fix a -Wunused-but-set-variable instance in master

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Sat, 28 May 2011 05:55:34 +0000 (01:55 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoDon't try to build descriptors when router_get_advertised_or_port()==0
Nick Mathewson [Tue, 24 May 2011 15:55:08 +0000 (11:55 -0400)] 
Don't try to build descriptors when router_get_advertised_or_port()==0

The previous attempt was incomplete: it told us not to publish a
descriptor, but didn't stop us from generating one.  Now we treat an
absent OR port the same as not knowing our address.  (This means
that when we _do_ get an OR port, we need to mark the descriptor
dirty.)

More attempt to fix bug3216.

14 years agoDon't build descriptors if ORPort auto is set and we have no OR listener
Nick Mathewson [Wed, 18 May 2011 01:42:35 +0000 (21:42 -0400)] 
Don't build descriptors if ORPort auto is set and we have no OR listener

This situation can happen easily if you set 'ORPort auto' and
'AccountingMax'.  Doing so means that when you have no ORPort, you
won't be able to set an ORPort in a descriptor, so instead you would
just generate lots of invalid descriptors, freaking out all the time.

Possible fix for 3216; fix on 0.2.2.26-beta.

14 years agoWork correctly if your nameserver is ::1
Nick Mathewson [Mon, 23 May 2011 21:42:38 +0000 (17:42 -0400)] 
Work correctly if your nameserver is ::1

We had all the code in place to handle this right... except that we
were unconditionally opening a PF_INET socket instead of looking at
sa_family.  Ow.

Fixes bug 2574; not a bugfix on any particular version, since this
never worked before.

14 years agoFix GCC 4.6's new -Wunused-but-set-variable warnings.
Nick Mathewson [Mon, 23 May 2011 21:04:38 +0000 (17:04 -0400)] 
Fix GCC 4.6's new -Wunused-but-set-variable warnings.

Most instances were dead code; for those, I removed the assignments.
Some were pieces of info we don't currently plan to use, but which
we might in the future.  For those, I added an explicit cast-to-void
to indicate that we know that the thing's unused.  Finally, one was
a case where we were testing the wrong variable in a unit test.
That one I fixed.

This resolves bug 3208.

14 years agoRemove the -F option from tor-resolve.
Nick Mathewson [Mon, 23 May 2011 20:59:41 +0000 (16:59 -0400)] 
Remove the -F option from tor-resolve.

It used to mean "Force": it would tell tor-resolve to ask tor to
resolve an address even if it ended with .onion.  But when
AutomapHostsOnResolve was added, automatically refusing to resolve
.onion hosts stopped making sense.  So in 0.2.1.16-rc (commit
298dc95dfd8), we made tor-resolve happy to resolve anything.

The -F option stayed in, though, even though it didn't do anything.
Oddly, it never got documented.

Found while fixing GCC 4.6 "set, unused variable" warnings.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 23 May 2011 06:16:25 +0000 (02:16 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

14 years agoUnbreak the build on libevent 1.x systems
Robert Ransom [Mon, 23 May 2011 05:54:02 +0000 (22:54 -0700)] 
Unbreak the build on libevent 1.x systems

14 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 23 May 2011 05:23:53 +0000 (01:23 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/common/Makefile.am
src/or/control.c

14 years agoMerge branch 'feature3049-v2' into maint-0.2.2
Nick Mathewson [Mon, 23 May 2011 05:19:04 +0000 (01:19 -0400)] 
Merge branch 'feature3049-v2' into maint-0.2.2

Conflicts:
src/common/Makefile.am

14 years agoThe first argument for a libevent callback should be evutil_socket_t
Nick Mathewson [Mon, 23 May 2011 05:12:00 +0000 (01:12 -0400)] 
The first argument for a libevent callback should be evutil_socket_t

14 years agoAppease make check-spaces wrt procmon.h
Nick Mathewson [Mon, 23 May 2011 05:10:49 +0000 (01:10 -0400)] 
Appease make check-spaces wrt procmon.h

14 years agoUse a 64-bit type to hold sockets on win64.
Nick Mathewson [Mon, 23 May 2011 04:17:48 +0000 (00:17 -0400)] 
Use a 64-bit type to hold sockets on win64.

On win64, sockets are of type UINT_PTR; on win32 they're u_int;
elsewhere they're int.  The correct windows way to check a socket for
being set is to compare it with INVALID_SOCKET; elsewhere you see if
it is negative.

On Libevent 2, all callbacks take sockets as evutil_socket_t; we've
been passing them int.

This patch should fix compilation and correctness when built for
64-bit windows.  Fixes bug 3270.

14 years agonaked constants are ugly
Roger Dingledine [Sat, 21 May 2011 22:55:23 +0000 (18:55 -0400)] 
naked constants are ugly

14 years agofinish a comment nickm started in 8ebceeb3
Roger Dingledine [Sat, 21 May 2011 22:34:55 +0000 (18:34 -0400)] 
finish a comment nickm started in 8ebceeb3

14 years agoMerge branch 'maint-0.2.2'
Roger Dingledine [Sat, 21 May 2011 22:14:16 +0000 (18:14 -0400)] 
Merge branch 'maint-0.2.2'

14 years agoremove some (confusing) dead code
Roger Dingledine [Sat, 21 May 2011 20:12:37 +0000 (16:12 -0400)] 
remove some (confusing) dead code