aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.c
Commit message (Expand)AuthorAge
...
* | | Merge branch 'bug933_nm_rebased_v2'•••Conflicts: src/test/test.c Nick Mathewson2011-11-30
|\ \ \
| * | | Add some post-comma spaces to please arma•••Incidentally, we've got 30969 lines in master with a comma in them, of which 1995 have a comma followed by a non-newline, non-space character. So about 93% of our commas are right, but we have a substantial number of "crowded" lines. Nick Mathewson2011-11-30
| * | | Refactor addressmap_match_superdomains and representation of wildcards•••In this new representation for wildcarded addresses, there are no longer any 'magic addresses': rather, "a.b c.d", "*.a.b c.d" and "*.a.b *.c.d" are all represented by a mapping from "a.b" to "c.d". we now distinguish them by setting bits in the addressmap_entry_t structure, where src_wildcard is set if the source address had a wildcard, and dst_wildcard is set if the target address had a wildcard. This lets the case where "*.a.b *.c.d" or "*.a.b c.d" remap the address "a.b" get handled trivially, and lets us simplify and improve the addressmap_match_superdomains implementation: we can now have it run in O(parts of address) rather than O(entries in addressmap). Nick Mathewson2011-11-30
* | | | First chunk of support for bridges on IPv6•••Comments below focus on changes, see diff for added code. New type tor_addr_port_t holding an IP address and a TCP/UDP port. New flag in routerinfo_t, ipv6_preferred. This should go in the node_t instead but not now. Replace node_get_addr() with - node_get_prim_addr() for primary address, i.e. IPv4 for now - node_get_pref_addr() for preferred address, IPv4 or IPv6. Rename node_get_addr_ipv4h() node_get_prim_addr_ipv4h() for consistency. The primary address will not allways be an IPv4 address. Same for node_get_orport() -> node_get_prim_orport(). Rewrite node_is_a_configured_bridge() to take all OR ports into account. Extend argument list to extend_info_from_node and extend_info_from_router with a flag indicating if we want to use the routers primary address or the preferred address. Use the preferred address in as few situtations as possible for allowing clients to connect to bridges over IPv6. Linus Nordberg2011-11-30
* | | | Add 'config-defaults-file' to getinfo_items table•••Bugfix on commit 230422b955e1708f27f42cdd25e8b21a33fdd3dd, not yet in any release; fixes bug #4605. Robert Ransom2011-11-29
* | | | Support for a defaults torrc file.•••This will mainly help distributors by giving a way to set system or package defaults that a user can override, and that a later package can replace. No promises about the particular future location or semantics for this: we will probably want to tweak it some before 0.2.3.x-rc The file is searched for in CONFDIR/torrc-defaults , which can be overridden with the "--defaults-torrc" option on the command line. Nick Mathewson2011-11-27
* | | | Add the ability to append and clear linelist options from cmdline•••This will be important for getting stuff to work right across zones. Nick Mathewson2011-11-27
| |/ / |/| |
* | | Eat all whitespace after a control commandSebastian Hahn2011-11-16
* | | allow manual control port authenticate via netcatRoger Dingledine2011-11-16
* | | Add some XXXesRobert Ransom2011-11-07
* | | Add GETINFO md/id/* and md/name/* items for relay microdescsRobert Ransom2011-11-07
* | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: configure.in src/or/circuitbuild.c Nick Mathewson2011-09-09
|\ \ \ | |/ / |/| / | |/
| * Use %f with printf-style formatting, not %lf•••For printf, %f and %lf are synonymous, since floats are promoted to doubles when passed as varargs. It's only for scanf that we need to say "%lf" for doubles and "%f" for floats. Apparenly, some older compilers think it's naughty to say %lf and like to spew warnings about it. Found by grarpamp. Nick Mathewson2011-08-30
* | Merge remote-tracking branch 'public/split_entry_conn'•••Conflicts: src/or/connection.c src/or/connection_edge.c src/or/connection_edge.h src/or/dnsserv.c Some of these were a little tricky, since they touched code that changed because of the prop171 fixes. Nick Mathewson2011-09-07
|\ \
| * | Move entry-only fields from edge_connection_t to entry_connection_t•••Also, refactor the code accordingly. Nick Mathewson2011-07-21
* | | Die if tor_vasprintf fails in connection_printf_to_buf•••tor_asprintf already asserts if it fails. Robert Ransom2011-09-07
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-08-15
|\ \ \ | | |/ | |/|
| * | Remove extra quotation marks around the result of esc_for_logRobert Ransom2011-08-15
* | | Whitespace tweaksNick Mathewson2011-08-10
* | | Fix condition reported by nickm.Kamran Riaz Khan2011-08-10
* | | Return if CONF_CHANGED isn't interesting.Kamran Riaz Khan2011-08-10
* | | Use smartlist_asprintf_add() to improve readability.Kamran Riaz Khan2011-08-10
* | | Minor code readability fix.Kamran Riaz Khan2011-08-09
* | | Minor comment fix.Kamran Riaz Khan2011-08-08
* | | Refactor to do CONF_CHANGED event formatting inside control.cKamran Riaz Khan2011-08-08
* | | Emits CONF_CHANGED events whenever Tor's configuration values change.Kamran Riaz Khan2011-08-08
| |/ |/|
* | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: src/or/control.c Nick Mathewson2011-07-14
|\|
| * Improve error msg on failed getinfo fingerprintNick Mathewson2011-07-14
| * Change GETINFO fingerprint to look at server_mode, not my_descriptor•••It's possible for us to be a server and have a fingerprint without having yet generated a descriptor. Fixes bug 3577; bugfix on 0.2.0.1-alpha Nick Mathewson2011-07-13
* | Report the states of failed TLS connections from bootstrap_problemNick Mathewson2011-07-11
* | Make handle_control_setevents table-drivenRobert Ransom2011-06-25
* | Merge branch 'bug3465-022' into bug3465-023•••* bug3465-022: Add BUILDTIMEOUT_SET to the result of GETINFO events/names Correct a comment Fix minor comment issues Robert Ransom2011-06-25
|\|
| * Add BUILDTIMEOUT_SET to the result of GETINFO events/namesRobert Ransom2011-06-25
* | Add, use a bufferevent-safe connection_flush()•••A couple of places in control.c were using connection_handle_write() to flush important stuff (the response to a SIGNAL command, an ERR-level status event) before Tor went down. But connection_handle_write() isn't meaningful for bufferevents, so we'd crash. This patch adds a new connection_flush() that works for all connection backends, and makes control.c use that instead. Fix for bug 3367; bugfix on 0.2.3.1-alpha. Nick Mathewson2011-06-21
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-06-17
|\|
| * Merge branch 'bug3407' into maint-0.2.2Nick Mathewson2011-06-17
| |\
| | * Make send_control_event_impl's behaviour saneRobert Ransom2011-06-17
| | * Fix comment typoRobert Ransom2011-06-17
| | * Make connection_printf_to_buf's behaviour saneRobert Ransom2011-06-17
| | * Correct some outdated commentsRobert Ransom2011-05-24
* | | Make the get_options() return const•••This lets us make a lot of other stuff const, allows the compiler to generate (slightly) better code, and will make me get slightly fewer patches from folks who stick mutable stuff into or_options_t. const: because not every input is an output! Nick Mathewson2011-06-14
* | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: src/common/compat.c src/or/main.c Nick Mathewson2011-05-30
|\| |
| * | Merge remote-tracking branch 'public/bug3270' into maint-0.2.2Nick Mathewson2011-05-30
| |\ \
| | * | 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. Nick Mathewson2011-05-23
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-28
|\| | |
| * | | 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. Nick Mathewson2011-05-23
| | |/ | |/|
* | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: src/common/Makefile.am src/or/control.c Nick Mathewson2011-05-23
|\| |
| * | Merge branch 'feature3049-v2' into maint-0.2.2•••Conflicts: src/common/Makefile.am Nick Mathewson2011-05-23
| |\ \ | | |/ | |/|
| | * Split out owning-controller-loss shutdown code into a functionRobert Ransom2011-05-20
| | * Implement TAKEOWNERSHIP commandRobert Ransom2011-05-20