096cbfb8b0
Merge remote-tracking branch 'tor-github/pr/1480'
2019-11-01 09:35:17 -04:00
cfc60e566c
circ: Add an handle to circuit_t
...
Closes #32343
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-30 16:12:56 -04:00
48781c32ca
ewma: Move private struct into header private section
...
Facilitate testing.
Part of #32196 .
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-28 13:17:11 -04:00
7678022e85
cmux: Move circuitmux_s object into header in private section
...
Step needed in order to access members of the object for unit tests.
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-28 13:17:11 -04:00
4c95022658
core: Add missing include in destroy_cell_queue_st.h
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-28 13:17:11 -04:00
b98631d280
Merge branch 'tor-github/pr/1476'
2019-10-28 08:47:57 -04:00
5f299feb82
doxygen: add @file declarations for src/core/crypto
...
If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.
2019-10-26 11:39:17 -04:00
ff7a70ca09
doxygen: add @file declarations for src/core/or
...
If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.
2019-10-26 11:37:25 -04:00
943fd734f9
doxygen: add @file declarations for src/core/mainloop
...
If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.
2019-10-26 11:26:06 -04:00
4d4a3eeeb1
doxygen: add @file declarations for src/core/proto
...
If a file doesn't use the file command (either \file or @file),
Doxygen won't try to process it.
These declarations also turned up a doxygen warning for
proto_socks.c; I fixed that too.
2019-10-26 11:21:25 -04:00
16dffa523e
Rename confparse.[ch] identifiers to confmgt.[ch] identifiers.
...
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
confparse.h confmgt.h \
confparse.c confmgt.c \
CONFPARSE_PRIVATE CONFMGT_PRIVATE \
TOR_CONFPARSE_H TOR_CONFMGT_H
2019-10-26 10:09:03 -04:00
20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447'
2019-10-24 10:00:47 +10:00
1cdc030c3d
Merge branch 'maint-0.4.2'
2019-10-22 14:47:28 -04:00
2ed194c9a9
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2
2019-10-22 14:46:10 -04:00
931a5db2a7
Re-run make autostyle.
2019-10-22 09:40:31 -04:00
b2d487ae22
Merge branch 'ticket31705_v2' into ticket31705_v2_merged
...
Conflicts:
src/feature/dirparse/authcert_parse.c
src/feature/dirparse/ns_parse.c
src/feature/hs/hs_service.c
src/lib/conf/conftesting.h
src/lib/log/log.h
src/lib/thread/threads.h
src/test/test_options.c
These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
2019-10-22 09:39:06 -04:00
d9bad0203b
Disable a couple of iterator macros when COCCI is defined.
2019-10-22 09:32:13 -04:00
67247fa9ac
Use various COCCI tests to get mainloop.c to parse.
2019-10-22 09:32:13 -04:00
b867e97ce6
With COCCI defined, avoid PERIODIC_EVENT.
...
Coccinelle doesn't understand the particular pattern of token
pasting we have going on here.
2019-10-22 09:32:05 -04:00
65e80ce646
Merge branch 'from_setconf_removal_squashed'
2019-10-22 07:50:42 -04:00
7dc78aca29
Merge remote-tracking branch 'tor-github/pr/1430'
2019-10-21 12:43:26 -04:00
a7ccd9a997
respect accountingmax during soft hibernation
...
Relays now respect their AccountingMax bandwidth again. When relays
entered "soft" hibernation (which typically starts when we've hit
90% of our AccountingMax), we had stopped checking whether we should
enter hard hibernation. Soft hibernation refuses new connections and
new circuits, but the existing circuits can continue, meaning that
relays could have exceeded their configured AccountingMax.
This commit rolls back some of the cpu-saving fixes, where we tried
to avoid calling so many of our events while we're off the network.
That's because PERIODIC_EVENT_FLAG_NEED_NET checks net_is_disabled(),
which returns true even if we're only in soft hibernation.
Fixes bug 32108; bugfix on 0.4.0.1-alpha.
2019-10-21 04:14:42 -04:00
77c85360f6
Merge branch 'maint-0.4.2'
2019-10-21 13:28:04 +10:00
3539fdfd7a
Merge remote-tracking branch 'tor-github/pr/1168'
2019-10-21 13:09:48 +10:00
04e9e74f1d
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2
2019-10-21 13:07:39 +10:00
57e86a6d74
relay: Implement HAVE_MODULE_RELAY for routermode.c
...
Part of 32123.
2019-10-20 19:26:48 +10:00
7944b55ad1
feature: Move proxy_mode() into new files
...
proxy_mode() was in routermode.[ch], but it's actually a client
mode. Move it into client/proxymode.[ch].
Part of 32123.
2019-10-20 17:52:38 +10:00
1697019d5f
core: tabify a line in include.am
2019-10-18 16:56:50 +10:00
db18ff9120
Move code to add default log into quiet_level.c
...
I'm about to unify the code for handling this between main.c and
config.c.
2019-10-17 12:48:39 -04:00
800b823c29
Merge branch 'cmdline_refactor'
2019-10-17 12:01:45 -04:00
d97d7f0e48
Use an enum for quiet_level.
2019-10-17 12:01:40 -04:00
4a8d491322
mainloop: Disable periodic events before a destroy
...
When tearing down all periodic events during shutdown, disable them first so
their enable flag is updated.
This allows the tor_api.h to relaunch tor properly after a clean shutdown.
Fixes #32058
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-17 10:11:32 -04:00
39cf575ed4
Merge remote-tracking branch 'tor-github/pr/1416'
2019-10-17 08:25:11 -04:00
ba44423cfc
address_set.c: doxygen comment repair.
2019-10-16 11:15:25 -04:00
a54c98007a
channel.h: fix various doxygen warnings
...
There were a bunch of items where the doxygen comments were
formatted incorrectly (with /* instead of /**)
2019-10-16 11:11:43 -04:00
87afe5c260
Rename authcert_members.i to .h, and have it define a macro.
...
Including a file in the middle of a declaration seems to confuse
Doxygen, and Coccinelle doesn't much like it either.l
2019-10-16 10:53:01 -04:00
f9fac733b9
Doxygen: Fix things that looked like links.
...
Doxygen thinks that saying #foo is linking to a "foo" anchor
someplace.
2019-10-16 08:44:35 -04:00
591420df20
Doxygen: fix unrecognized commands.
...
Doxygen seems to interpret anything starting with \ as a command,
even when we don't mean it that way.
2019-10-16 08:39:41 -04:00
98735c40b6
Doxygen: fix warnings about mismatched HTML tags.
2019-10-16 08:27:03 -04:00
9201bbd96c
Replace a unicode character which doxygen cannot handle.
...
Merging without review, as this is an editorial fix in a comment.
2019-10-14 14:05:50 -04:00
99809834a7
Merge branch 'bug30344_squashed_035'
2019-10-09 16:26:31 -04:00
841cff6e4f
Stop libevent from reading data from closed connections.
...
Code adapted from Rob's proposed patch in #30344 .
Also add a comment in connection_mark_for_close_internal_() on why we should
not be adding extra code there without a very good reason.
2019-10-09 16:24:49 -04:00
c42a79499a
Extract the enumeration that tells Tor what command it is running.
2019-10-08 12:59:18 -04:00
014abf86e5
Merge branch 'tor-github/pr/1344'
2019-10-02 10:37:49 -04:00
53116ca0b7
Re-run "make autostyle" with improved annotate_ifdef_directives
2019-09-30 08:57:37 -04:00
37c616aeaf
Merge branch 'bug31466_035' into bug31466_042
2019-09-18 15:48:25 -04:00
bf4a27c0ea
Merge branch 'bug31466_029' into bug31466_035_tmp
2019-09-18 15:42:40 -04:00
2d744de355
Correct a comment in channel_tls_process_cell.
2019-09-17 11:42:19 -04:00
7f5c6a603c
Move PROCESS_CELL macros outside of channel_tls_process_cell().
...
These macros are used in multiple functions, and as such really
don't belong within a single function.
Also #undef them once we are done with them.
This change makes practracker pass again.
2019-09-17 11:40:14 -04:00
4d7ce27105
Merge branch 'bug31107_041' into bug31107_master
2019-09-17 09:16:53 -04:00
Nick Mathewson
David Goulet
teor
Roger Dingledine
George Kadianakis