Nick Mathewson
b94cb401d2
Coverity complained that we were not checking this return value
2014-12-22 11:13:11 -05:00
Nick Mathewson
13f26f41e4
Fix some coverity issues in the unit tests
2014-12-22 11:13:01 -05:00
Nick Mathewson
1c05dfd0b6
Merge branch 'ticket7356_squashed'
2014-12-21 14:48:53 -05:00
rl1987
af1469b9a3
Fixing mistake in comment.
2014-12-21 14:48:39 -05:00
rl1987
f6cc4d35b0
Using channel state lookup macros in connection_or.c.
2014-12-21 14:48:39 -05:00
rl1987
fc7d5e598b
Using CHANNEL_FINISHED macro in connection.c
2014-12-21 14:48:38 -05:00
rl1987
551221bad6
Using channel state lookup macros in circuitlist.c.
2014-12-21 14:48:38 -05:00
rl1987
7473160765
Using CHANNEL_IS_OPEN macro in circuitbuild.c
2014-12-21 14:48:38 -05:00
rl1987
5a7dd44d6e
Using channel state lookup macros in circuitbias.c.
2014-12-21 14:48:38 -05:00
rl1987
668edc5132
Using channel state lookup macros in channeltls.c
2014-12-21 14:48:38 -05:00
rl1987
032d44226e
Use channel state lookup macros in channel.c
2014-12-21 14:48:38 -05:00
rl1987
b884ae6d98
Using macros and inline function for quick lookup of channel state.
2014-12-21 14:48:38 -05:00
Nick Mathewson
647a90b9b3
Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'
2014-12-21 13:37:40 -05:00
teor
e40591827e
Make log bufer 10k, not 9.78k.
2014-12-21 13:36:06 -05:00
teor
769fc5af09
Fix a comment in tor_addr_parse
2014-12-21 13:35:42 -05:00
teor
6fad395300
Fix clang warning, IPv6 address comment, buffer size typo
...
The address of an array in the middle of a structure will
always be non-NULL. clang recognises this and complains.
Disable the tautologous and redundant check to silence
this warning.
Fixes bug 14001.
2014-12-21 13:35:03 -05:00
teor
d93516c445
Fix transparent proxy checks to allow OS X to use ipfw or pf
...
OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent
proxy option checks to allow for both ipfw and pf on OS X.
Fixes bug 14002.
2014-12-20 22:28:58 +11:00
Nick Mathewson
3d85df9569
LLONG_MIN => INT64_MIN.
2014-12-19 14:12:35 -05:00
Nick Mathewson
357191a095
Define an int64_min when it is missing
2014-12-19 14:12:22 -05:00
Karsten Loesing
816e6f2eac
Fix unit test.
...
Looks like we forgot to update unit tests when we switched from 32-bit to
64-bit ints while tweaking 7cd53b7
2014-12-19 18:37:43 +01:00
Nick Mathewson
64787e99fa
Merge branch 'asn-karsten-task-13192-5-squashed'
2014-12-19 10:35:47 -05:00
George Kadianakis
14e83e626b
Add two hidden-service related statistics.
...
The two statistics are:
1. number of RELAY cells observed on successfully established
rendezvous circuits; and
2. number of .onion addresses observed as hidden-service
directory.
Both statistics are accumulated over 24 hours, obfuscated by rounding
up to the next multiple of a given number and adding random noise,
and written to local file stats/hidserv-stats.
Notably, no statistics will be gathered on clients or services, but
only on relays.
2014-12-19 10:35:25 -05:00
Nick Mathewson
eee248bc59
Merge remote-tracking branch 'dgoulet/bug13936_025_v2'
2014-12-19 09:38:46 -05:00
David Goulet
3d83907ab1
Fix: call circuit_has_opened() for rendezvous circuit
...
In circuit_get_open_circ_or_launch(), for a rendezvous circuit,
rend_client_rendcirc_has_opened() but circuit_has_opened() is preferred here
since it will call the right function for a specific circuit purpose.
Furthermore, a controller event is triggered where the former did not.
Signed-off-by: David Goulet <dgoulet@ev0ke.net >
2014-12-17 16:06:53 -05:00
Nick Mathewson
f7e8bc2b4b
fix a long line
2014-12-12 08:54:07 -05:00
Nick Mathewson
915c9a517e
Merge remote-tracking branch 'meejah/ticket-13941-b'
2014-12-12 08:53:14 -05:00
Nick Mathewson
7c5d888977
Tweak 13942 fix
2014-12-12 08:49:52 -05:00
meejah
85bfad1875
Pre-check hidden-service-dir permissions/ownership
...
See ticket #13942 where Tor dies if you feed it a hidden service
directory with the wrong owner via SETCONF.
2014-12-11 18:46:56 -07:00
meejah
76753efd7b
Fix 13941: make calling log_new_relay_greeting() optional.
...
Specifically, only if we're creating secret_id_key do we log the
greeting (and then only if the key is actually created).
2014-12-11 18:43:51 -07:00
Karsten Loesing
7cd53b75c1
Add better support to obfuscate statistics.
2014-12-10 11:16:26 +01:00
Roger Dingledine
b73a7600af
when somebody uploads too much, say who tried it
2014-12-10 01:10:44 -05:00
rl1987
9c239eccc9
Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
2014-12-07 15:47:09 +02:00
Nick Mathewson
3c0e09ef81
Add fakechans.h to noinst_headers
2014-12-04 09:19:44 -05:00
Nick Mathewson
58df153163
Fix more 64/32 warnings in test_channel.c
2014-12-04 09:16:49 -05:00
Nick Mathewson
11c044e46a
Initialize libevent in circuitmux/destroy_cell_queue test
2014-12-04 09:11:13 -05:00
George Kadianakis
447ece46f5
Constify crypto_pk_get_digest().
2014-12-02 12:15:11 +00:00
Nick Mathewson
11b652acb3
Fix some 32-bit build issues in the tests
...
When comparing 64-bit types, you need to use tt_[ui]64_op().
Found by Jenkins
2014-11-28 10:06:10 -05:00
Nick Mathewson
430f5852ac
Fix a signed/unsigned comparison warning in scheduler_run
2014-11-28 09:18:17 -05:00
Nick Mathewson
0bfadbf4b9
Fix a memory leak in rend_services_introduce
...
This is CID 1256187 ; bug not in any released tor.
2014-11-27 23:24:03 -05:00
Nick Mathewson
49976fabc4
Fix a likely bug found by coverity in test_scheduler.c.
...
Andrea, do you agree with this?
This is CID 1256186
2014-11-27 23:21:46 -05:00
Nick Mathewson
e2641484a7
One more, appease "make check-spaces"
2014-11-27 22:57:04 -05:00
Nick Mathewson
b1e1b439b8
Fix some issues with the scheduler configuration options
...
1) Set them to the values that (according to Rob) avoided performance
regressions. This means that the scheduler won't get much exercise
until we implement KIST or something like it.
2) Rename the options to end with a __, since I think they might be
going away, and nobody should mess with them.
3) Use the correct types for the option variables. MEMUNIT needs to be a
uint64_t; UINT needs to be (I know, I know!) an int.
4) Validate the values in options_validate(); do the switch in
options_act(). This way, setting the option to an invalid value on
a running Tor will get backed out.
2014-11-27 22:51:13 -05:00
Nick Mathewson
0e0dc7d787
Fix a 64-bit clang warning
2014-11-27 22:42:03 -05:00
Nick Mathewson
a28df3fb67
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
...
Conflicts:
src/or/or.h
src/test/Makefile.nmake
2014-11-27 22:39:46 -05:00
Nick Mathewson
3d2366c676
Merge remote-tracking branch 'public/bug13126'
...
Conflicts:
src/or/or.h
2014-11-26 09:03:30 -05:00
Nick Mathewson
3a91a08e21
Merge branch 'feature9503_squashed'
2014-11-25 12:49:09 -05:00
rl1987
bf67a60b86
Sending response to SIGNAL HEARTBEAT controller command.
2014-11-25 12:48:41 -05:00
rl1987
8c135062e5
Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat.
2014-11-25 12:48:41 -05:00
Nick Mathewson
b4ead16d57
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-24 09:19:22 -05:00
Nick Mathewson
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
Nick Mathewson
rl1987
teor
Karsten Loesing
George Kadianakis
David Goulet
meejah
Roger Dingledine