nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-05 18:53:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,820 Commits 53 Branches 630 Tags 125 MiB
ebd99314cf
Commit Graph

17820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
d2d7cab5b8 Merge remote-tracking branch 'asn/bug6779' 2012-09-06 10:12:15 -04:00
Nick Mathewson
deee0b67c3 Merge remote-tracking branch 'asn/bug6765' 2012-09-06 10:12:11 -04:00
George Kadianakis
93c38b679f Log more information when we fail to terminate a process. 2012-09-06 17:03:11 +03:00
Nick Mathewson
5d162d5a7b Fix a dependency: sha256.c influences crypto.o, not crypto.c 2012-09-06 10:03:06 -04:00
Nick Mathewson
91fed2c703 Fix a build-warning when building out-of-tree 
We were trying to incorporate all headers in common_sha1.i, not just
the src/common ones.

This is part of bug 6778; fix on 0.2.4.1-alpha
 2012-09-06 09:56:48 -04:00
Roger Dingledine
00120544a4 fix punctuation in logs 2012-09-06 01:35:05 -04:00
Nick Mathewson
5d679caa32 Fix warning when implicitly casting strlen(microdesc) to int 
Harmless unless we somehow generate a microdesc of more than INT_MAX
bytes.
 2012-09-05 20:49:25 -04:00
Roger Dingledine
a504a81d22 bump to 0.2.4.1-alpha-dev 2012-09-05 20:05:50 -04:00
Roger Dingledine
237129847b bump to 0.2.4.1-alpha 2012-09-05 19:12:22 -04:00
Roger Dingledine
606157ea62 finish changelog mucking for 0.2.4.1-alpha 2012-09-05 19:05:41 -04:00
George Kadianakis
8284c2bcba Use tor_malloc_zero() in var_cell_new(). 
This is just a precaution; we seem to be using var_cell_t.payload and
var_cell_t.payload_len correctly at the moment.
 2012-09-06 01:22:32 +03:00
Roger Dingledine
b00b8272da make AuthDirHasIPv6Connectivity match the man page 
we can turn it into an autobool later if we have some way for it
to make a decision.

(patch possibly got lost when nickm merged #6770; or maybe nickm meant
for it to be this way. i'm not sure.)
 2012-09-05 18:17:41 -04:00
Roger Dingledine
325f33047a and fold it into master too 2012-09-05 17:23:08 -04:00
Roger Dingledine
6f82ae44cb Merge branch 'maint-0.2.3' 2012-09-05 16:41:43 -04:00
Roger Dingledine
97dbff51e6 Update the minimum bandwidth for a public relay 
The current cutoff is 30KB, but in reality a useful cutoff is probably
more like 50KB or 100KB.
 2012-09-05 16:40:57 -04:00
Nick Mathewson
f8c1ab7bbf Merge remote-tracking branch 'origin/maint-0.2.3' 2012-09-05 16:25:13 -04:00
Linus Nordberg
0770e4ccdb Whitespace fixes. 2012-09-05 19:40:15 +02:00
Nick Mathewson
9d9ca264ec Avoid segfault if EntryGuardPathBias precedes EntryGuard 
Fix for bug 6774; bugfix on 0.2.3.17-beta.
 2012-09-05 13:27:54 -04:00
George Kadianakis
4edc57caa5 Figure out ORPort and DirPort even when 'auto' is used. 
Use router_get_advertised_{dir,or}_port() functions instead of
get_primary_{dir,or}_port().
 2012-09-05 20:17:25 +03:00
Nick Mathewson
116c8409ba Merge remote-tracking branch 'linus/bug6770_3' 
Conflicts:
	doc/tor.1.txt
	src/or/config.c
 2012-09-05 11:35:26 -04:00
George Kadianakis
b9551fd074 Fix some bugs that did not allow compilation on Windows. 2012-09-05 18:23:29 +03:00
George Kadianakis
44fe717524 General tweaks and fixes for Nick's comments. 
* Add changes/ files.
* Edit the tor-fw-helper manpage.
* Fix check-spaces.
* Add prototype for get_list_of_ports_to_forward().
* Fix tor_parse_long() TCP port range.
* Improve doc. of tor_check_port_forwarding().
* Check for overflows in tor_check_port_forwarding().
* Demote successful port forwarding to LOG_INFO.

Conflicts:
	src/common/address.c
	src/or/circuitbuild.c
 2012-09-05 18:23:28 +03:00
George Kadianakis
443260ffd8 Tweak code and pump the tor-fw-helper version. 
Conflicts:
	src/or/circuitbuild.h
 2012-09-05 18:09:45 +03:00
George Kadianakis
da16c425ef Start passing ports to tor_check_port_forwarding(). 
Conflicts:
	src/or/transports.c
 2012-09-05 18:08:18 +03:00
George Kadianakis
cd05f35d2c Refactor tor to support the new tor-fw-helper protocol. 
Add handle_fw_helper_output(), a function responsible for parsing the
output of tor-fw-helper. Refactor tor_check_port_forwarding() and
run_scheduled_events() accordingly too.

We now issue warnings when we get control output from tor-fw-helper,
and we log the verbose output of tor-fw-helper in LOG_INFO.

Conflicts:
	src/common/util.c
 2012-09-05 18:04:34 +03:00
George Kadianakis
64b2a64310 Use get_lines_from_handle() in configure_proxy(). 2012-09-05 18:02:27 +03:00
George Kadianakis
03e89f0b72 Introduce get_lines_from_handle(). 
get_lines_from_handle() is a multiplatform function which drains lines
from a stream and stuffs it into a smartlist. It's useful for
line-based protocols, like the one managed proxy and the tor-fw-helper
protocols.
 2012-09-05 18:02:27 +03:00
George Kadianakis
e8be040016 All loging messages are now sent to stderr. 
stdout should be clean for control messages.
 2012-09-05 18:02:27 +03:00
George Kadianakis
b9e160446a Refactor our backends' interface. 2012-09-05 18:02:27 +03:00
George Kadianakis
c5778553dc Further implement tor-fw-helper's TCP port forwarding system. 2012-09-05 18:02:27 +03:00
George Kadianakis
d7261fb7f1 Implement the new TCP port parsing logic in tor-fw-helper. 2012-09-05 18:02:27 +03:00
George Kadianakis
d19a78744e Refactor tor-fw-helper port forwarding logic. 
Make it port-purpose-agnostic; that is it should treat each port as
equal, and not expect to get a DirPort and an ORPort.
 2012-09-05 18:02:26 +03:00
Linus Nordberg
f7c97cd40b Remove AuthDirPublishIPv6 and let AuthDirHasIPv6Connectivity fill its function. 
See #4771 for rationale.

Note that this patch does not take suggested changes in #4470 into
account and keeps treating AuthDirHasIPv6Connectivity as an
AUTOBOOL. Thus, bug fixes for that are included here as well.

This is a fix on master, unreleased as of now.
 2012-09-05 13:35:39 +02:00
Linus Nordberg
0e53742a85 Make AuthDirHasIPv6Connectivity a BOOL. 
This is a fix of unreleased tor. It solves ticket #6770.
 2012-09-05 12:47:01 +02:00
Roger Dingledine
c77d1b7bda fold in the changes files 
in-progress due to various bugs i uncovered in the ipv6 config option
meanings.
 2012-09-05 04:46:44 -04:00
Roger Dingledine
67065c3c06 minor typos i found while constructing the changelog 2012-09-05 04:46:27 -04:00
Roger Dingledine
746c4b3cdd forward-port the 0.2.3.21-rc changelog 2012-09-04 20:59:56 -04:00
Roger Dingledine
de6a538b9c one more already-merged changes file 2012-09-04 20:23:46 -04:00
Roger Dingledine
031da8dd34 remove the changes files that are merged into 0.2.3.21-rc 2012-09-04 20:11:19 -04:00
Nick Mathewson
4d87919ba6 Merge remote-tracking branch 'origin/maint-0.2.3' 2012-09-04 18:34:39 -04:00
Nick Mathewson
acfd487e7d Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3 2012-09-04 18:33:56 -04:00
Nick Mathewson
d7a646edcf Merge branch 'bug5535_only_rebased' 2012-09-04 18:24:20 -04:00
Nick Mathewson
ec94d0307e Merge remote-tracking branch 'linus/bug6363_only-ln' 2012-09-04 18:23:18 -04:00
Linus Nordberg
d34c690e54 Allocate vote_microdesc_hash_t using tor_malloc_zero(). 
In case the struct grows in the future. Shouldn't be too expensive.
 2012-09-04 20:19:41 +02:00
Linus Nordberg
8ef395d6a9 Whitespace. 2012-09-04 20:19:40 +02:00
Linus Nordberg
b337aa4c0e Remove spurious debug log printout. 2012-09-04 19:27:05 +02:00
Linus Nordberg
730dd9a6d0 Remove trailing semicolon from #define TOR_ADDR_NULL. 
Can it ever help? I can only see harm. What am I missing?
 2012-09-04 13:05:23 -04:00
Linus Nordberg
d827a5495a Take microdesc into account when deciding about preferred OR port. 2012-09-04 12:57:22 -04:00
Linus Nordberg
8b081231b5 Make node_ipv6_preferred() take microdescs into account. 
Also, make node_get_prim_orport() indicate in its return value whether
a valid OR port was copied or not.

Maybe we should make it legal to pass ap_out==NULL?
 2012-09-04 12:57:22 -04:00
Linus Nordberg
3746215350 Take microdesc IPv6 address into account when setting node->ipv6_preferred. 
Also, do this only for clients, explicitly.

Also, give the flag a value every time we set consensus. We used to
touch it only when ClientPreferIPv6ORPort was set, which was wrong.
 2012-09-04 12:57:21 -04:00