summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2018-05-16Add comments explaining when a connected cell has an UNSPEC addrNick Mathewson
Should prevent other bugs like 26117.
2018-05-15Bug 26117: Move CIRC_BW field accounting.Mike Perry
Previously, we used the AF_UNSPEC check to represent valid connected cell data as a result of the lack of return. This was incorrect.
2018-05-16Merge branch 'maint-0.3.3'Nick Mathewson
2018-05-16Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-05-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-05-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-14Add a missing return after marking a stream for bad connected cellNick Mathewson
Fixes bug 26072; bugfix on 0.2.4.7-alpha.
2018-05-14Merge branch 'bug25903_v5_squashed'Nick Mathewson
2018-05-14Bug 25903: TestsMike Perry
2018-05-14Use router_get_my_routerinfo_with_err to implement the old versionNick Mathewson
Having one function implemented in terms of the other should keep them from diverging. follow-up on #25852
2018-05-14Merge remote-tracking branch 'rl1987/bug25852_take2'Nick Mathewson
2018-05-11Merge remote-tracking branch 'catalyst-github/bug25756'Nick Mathewson
2018-05-11get rid of whitespace before #ifdef'sRoger Dingledine
i don't know if whitespace is ok to have before preprocessing directives on all platforms, but anyway we almost never have it, so now things are more uniform.
2018-05-11control: Mask the event(s) before using ANY_EVENT_IS_INTERESTING()David Goulet
Before this commit, the control events were never triggered. It was introduced with commit 0c19ce7bdece5906e035e71d3fb682632c8bb9cb. Fixes #26082 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-10Merge remote-tracking branch 'public/bug25981'Nick Mathewson
2018-05-10Tweak error handling for #25852rl1987
2018-05-10Avoid confusion with errno from libcrl1987
2018-05-10Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-05-10Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-05-10Merge branch 'maint-0.3.3'Nick Mathewson
2018-05-10hs-v3: Add an extra white-space when parsing descriptorDavid Goulet
The specification describes the signature token to be right after a newline (\n) then the token "signature" and then a white-space followed by the encoded signature. This commit makes sure that when we parse the signature from the descriptor, we are always looking for that extra white-space at the end of the token. It will allow us also to support future fields that might start with "signature". Fixes #26069 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-10Merge branch 'ticket26063_squashed'Nick Mathewson
2018-05-10Make _with_err return routerinfo, like old function doesrl1987
2018-05-10Merge branch 'ticket26064'Nick Mathewson
2018-05-10Enable/disable per-second callback as needed.Nick Mathewson
There are three cases where this can happen: changes in our controller events, changes in our DisableNetwork setting, and changes in our hibernation state. Closes ticket 26063.
2018-05-10Add a new function to enable/disable the per-second timer as neededNick Mathewson
We're about to use this to turn off the per-second timer when the network is disabled and there aren't any per-second controller events enabled.
2018-05-10Merge remote-tracking branch 'dgoulet/ticket26062_034_01'Nick Mathewson
2018-05-10Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-05-10Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-05-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-05-09Bug 25903: Report new CIRC_BW fields to control port.Mike Perry
2018-05-09Bug 25903: Perform accounting for new CIRC_BW fields.Mike Perry
Two new values in each direction. DELIVERED counts valid end-to-end circuit data that is accepted by our end and OVERHEAD counts the slack unused data in each of the relay command cells for those accepted cells. Control port changes are in the next commit.
2018-05-09Merge branch 'ticket26016'Nick Mathewson
2018-05-09Merge branch 'ticket26009'Nick Mathewson
2018-05-09spelling fixNick Mathewson
2018-05-09Fix some clang warningsNick Mathewson
2018-05-09Mark the 1-per-sec update_current_time() call as redundant.Nick Mathewson
We still do this time update here, since we do it from all callbacks, but it is no longer a reason to keep the once-per-second callback enabled. Closes ticket 26009.
2018-05-09Distinguish true clock jumps from idlenessNick Mathewson
Since we're going to be disabling the second-elapsed callback, we're going to sometimes have long periods when no events file, and so the current second is not updated. Handle that by having a better means to detect "clock jumps" as opposed to "being idle for a while". Tolerate far more of the latter. Part of #26009.
2018-05-09Give responsibility for waking up from DORMANT to a mainloop eventNick Mathewson
Closes ticket 26064.
2018-05-09Having a ControlPort open doesn't mean we are a clientDavid Goulet
The any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-09Having a ControlPort open doesn't mean we are a clientDavid Goulet
The options_any_client_port_set() returns true if the ControlPort is set which is wrong because we can have that port open but still not behave as a tor client (like many relays for instance). Fixes #26062 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-09config: Move any_client_port_set() to config.cDavid Goulet
This functions is now used outside of networkstatus.c and makes more sense to be in config.c. It is also renamed to options_any_client_port_set() for the config.c namespace. No code behavior change. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-05-09Use net_is_completely_disabled() in connection.cNick Mathewson
This fixes the XXXX case that we had before, and also enforces the rule that we won't open connections when we're in hard hibernation.
2018-05-09Add a new net_is_completely_disabled() functionNick Mathewson
2018-05-09Comment-only fix: annotate we_are_hibernating() usageNick Mathewson
Everywhere we use we_are_hibernating(), remind the reader what it means. (Also, add an XXXX to note a DisableNetwork usage to change later.)
2018-05-09Add we_are_fully_hibernating() to distinguish hibernation statesNick Mathewson
We want to tell "shut down" from "shutting down".
2018-05-09Give control.c responsibility for its own once-a-second eventsNick Mathewson
Now it has a function that can tell the rest of Tor whether any once-a-second controller item should fire, and a function to fire all the once-a-second events.
2018-05-09Add a macro to simplify control_update_global_event_mask().Nick Mathewson
2018-05-09Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-05-09Merge branch 'maint-0.3.3'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion