aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Collapse)AuthorAge
* Convert all include-guard macros to avoid reserved identifiers.Nick Mathewson2012-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C, we technically aren't supposed to define our own things that start with an underscore. This is a purely machine-generated commit. First, I ran this script on all the headers in src/{common,or,test,tools/*}/*.h : ============================== use strict; my %macros = (); my %skipped = (); FILE: for my $fn (@ARGV) { my $f = $fn; if ($fn !~ /^\.\//) { $f = "./$fn"; } $skipped{$fn} = 0; open(F, $fn); while (<F>) { if (/^#ifndef ([A-Za-z0-9_]+)/) { $macros{$fn} = $1; next FILE; } } } print "#!/usr/bin/perl -w -i -p\n\n"; for my $fn (@ARGV) { if (! exists $macros{$fn}) { print "# No macro known for $fn!\n" if (!$skipped{$fn}); next; } if ($macros{$fn} !~ /_H_?$/) { print "# Weird macro for $fn...\n"; } my $goodmacro = uc $fn; $goodmacro =~ s#.*/##; $goodmacro =~ s#[\/\-\.]#_#g; print "s/(?<![A-Za-z0-9_])$macros{$fn}(?![A-Za-z0-9_])/TOR_${goodmacro}/g;\n" } ============================== It produced the following output, which I then re-ran on those same files: ============================== s/(?<![A-Za-z0-9_])_TOR_ADDRESS_H(?![A-Za-z0-9_])/TOR_ADDRESS_H/g; s/(?<![A-Za-z0-9_])_TOR_AES_H(?![A-Za-z0-9_])/TOR_AES_H/g; s/(?<![A-Za-z0-9_])_TOR_COMPAT_H(?![A-Za-z0-9_])/TOR_COMPAT_H/g; s/(?<![A-Za-z0-9_])_TOR_COMPAT_LIBEVENT_H(?![A-Za-z0-9_])/TOR_COMPAT_LIBEVENT_H/g; s/(?<![A-Za-z0-9_])_TOR_CONTAINER_H(?![A-Za-z0-9_])/TOR_CONTAINER_H/g; s/(?<![A-Za-z0-9_])_TOR_CRYPTO_H(?![A-Za-z0-9_])/TOR_CRYPTO_H/g; s/(?<![A-Za-z0-9_])TOR_DI_OPS_H(?![A-Za-z0-9_])/TOR_DI_OPS_H/g; s/(?<![A-Za-z0-9_])_TOR_MEMAREA_H(?![A-Za-z0-9_])/TOR_MEMAREA_H/g; s/(?<![A-Za-z0-9_])_TOR_MEMPOOL_H(?![A-Za-z0-9_])/TOR_MEMPOOL_H/g; s/(?<![A-Za-z0-9_])TOR_PROCMON_H(?![A-Za-z0-9_])/TOR_PROCMON_H/g; s/(?<![A-Za-z0-9_])_TOR_TORGZIP_H(?![A-Za-z0-9_])/TOR_TORGZIP_H/g; s/(?<![A-Za-z0-9_])_TOR_TORINT_H(?![A-Za-z0-9_])/TOR_TORINT_H/g; s/(?<![A-Za-z0-9_])_TOR_LOG_H(?![A-Za-z0-9_])/TOR_TORLOG_H/g; s/(?<![A-Za-z0-9_])_TOR_TORTLS_H(?![A-Za-z0-9_])/TOR_TORTLS_H/g; s/(?<![A-Za-z0-9_])_TOR_UTIL_H(?![A-Za-z0-9_])/TOR_UTIL_H/g; s/(?<![A-Za-z0-9_])_TOR_BUFFERS_H(?![A-Za-z0-9_])/TOR_BUFFERS_H/g; s/(?<![A-Za-z0-9_])_TOR_CHANNEL_H(?![A-Za-z0-9_])/TOR_CHANNEL_H/g; s/(?<![A-Za-z0-9_])_TOR_CHANNEL_TLS_H(?![A-Za-z0-9_])/TOR_CHANNELTLS_H/g; s/(?<![A-Za-z0-9_])_TOR_CIRCUITBUILD_H(?![A-Za-z0-9_])/TOR_CIRCUITBUILD_H/g; s/(?<![A-Za-z0-9_])_TOR_CIRCUITLIST_H(?![A-Za-z0-9_])/TOR_CIRCUITLIST_H/g; s/(?<![A-Za-z0-9_])_TOR_CIRCUITMUX_EWMA_H(?![A-Za-z0-9_])/TOR_CIRCUITMUX_EWMA_H/g; s/(?<![A-Za-z0-9_])_TOR_CIRCUITMUX_H(?![A-Za-z0-9_])/TOR_CIRCUITMUX_H/g; s/(?<![A-Za-z0-9_])_TOR_CIRCUITUSE_H(?![A-Za-z0-9_])/TOR_CIRCUITUSE_H/g; s/(?<![A-Za-z0-9_])_TOR_COMMAND_H(?![A-Za-z0-9_])/TOR_COMMAND_H/g; s/(?<![A-Za-z0-9_])_TOR_CONFIG_H(?![A-Za-z0-9_])/TOR_CONFIG_H/g; s/(?<![A-Za-z0-9_])TOR_CONFPARSE_H(?![A-Za-z0-9_])/TOR_CONFPARSE_H/g; s/(?<![A-Za-z0-9_])_TOR_CONNECTION_EDGE_H(?![A-Za-z0-9_])/TOR_CONNECTION_EDGE_H/g; s/(?<![A-Za-z0-9_])_TOR_CONNECTION_H(?![A-Za-z0-9_])/TOR_CONNECTION_H/g; s/(?<![A-Za-z0-9_])_TOR_CONNECTION_OR_H(?![A-Za-z0-9_])/TOR_CONNECTION_OR_H/g; s/(?<![A-Za-z0-9_])_TOR_CONTROL_H(?![A-Za-z0-9_])/TOR_CONTROL_H/g; s/(?<![A-Za-z0-9_])_TOR_CPUWORKER_H(?![A-Za-z0-9_])/TOR_CPUWORKER_H/g; s/(?<![A-Za-z0-9_])_TOR_DIRECTORY_H(?![A-Za-z0-9_])/TOR_DIRECTORY_H/g; s/(?<![A-Za-z0-9_])_TOR_DIRSERV_H(?![A-Za-z0-9_])/TOR_DIRSERV_H/g; s/(?<![A-Za-z0-9_])_TOR_DIRVOTE_H(?![A-Za-z0-9_])/TOR_DIRVOTE_H/g; s/(?<![A-Za-z0-9_])_TOR_DNS_H(?![A-Za-z0-9_])/TOR_DNS_H/g; s/(?<![A-Za-z0-9_])_TOR_DNSSERV_H(?![A-Za-z0-9_])/TOR_DNSSERV_H/g; s/(?<![A-Za-z0-9_])TOR_EVENTDNS_TOR_H(?![A-Za-z0-9_])/TOR_EVENTDNS_TOR_H/g; s/(?<![A-Za-z0-9_])_TOR_GEOIP_H(?![A-Za-z0-9_])/TOR_GEOIP_H/g; s/(?<![A-Za-z0-9_])_TOR_HIBERNATE_H(?![A-Za-z0-9_])/TOR_HIBERNATE_H/g; s/(?<![A-Za-z0-9_])_TOR_MAIN_H(?![A-Za-z0-9_])/TOR_MAIN_H/g; s/(?<![A-Za-z0-9_])_TOR_MICRODESC_H(?![A-Za-z0-9_])/TOR_MICRODESC_H/g; s/(?<![A-Za-z0-9_])_TOR_NETWORKSTATUS_H(?![A-Za-z0-9_])/TOR_NETWORKSTATUS_H/g; s/(?<![A-Za-z0-9_])_TOR_NODELIST_H(?![A-Za-z0-9_])/TOR_NODELIST_H/g; s/(?<![A-Za-z0-9_])_TOR_NTMAIN_H(?![A-Za-z0-9_])/TOR_NTMAIN_H/g; s/(?<![A-Za-z0-9_])_TOR_ONION_H(?![A-Za-z0-9_])/TOR_ONION_H/g; s/(?<![A-Za-z0-9_])_TOR_OR_H(?![A-Za-z0-9_])/TOR_OR_H/g; s/(?<![A-Za-z0-9_])_TOR_POLICIES_H(?![A-Za-z0-9_])/TOR_POLICIES_H/g; s/(?<![A-Za-z0-9_])_TOR_REASONS_H(?![A-Za-z0-9_])/TOR_REASONS_H/g; s/(?<![A-Za-z0-9_])_TOR_RELAY_H(?![A-Za-z0-9_])/TOR_RELAY_H/g; s/(?<![A-Za-z0-9_])_TOR_RENDCLIENT_H(?![A-Za-z0-9_])/TOR_RENDCLIENT_H/g; s/(?<![A-Za-z0-9_])_TOR_RENDCOMMON_H(?![A-Za-z0-9_])/TOR_RENDCOMMON_H/g; s/(?<![A-Za-z0-9_])_TOR_RENDMID_H(?![A-Za-z0-9_])/TOR_RENDMID_H/g; s/(?<![A-Za-z0-9_])_TOR_RENDSERVICE_H(?![A-Za-z0-9_])/TOR_RENDSERVICE_H/g; s/(?<![A-Za-z0-9_])_TOR_REPHIST_H(?![A-Za-z0-9_])/TOR_REPHIST_H/g; s/(?<![A-Za-z0-9_])_TOR_REPLAYCACHE_H(?![A-Za-z0-9_])/TOR_REPLAYCACHE_H/g; s/(?<![A-Za-z0-9_])_TOR_ROUTER_H(?![A-Za-z0-9_])/TOR_ROUTER_H/g; s/(?<![A-Za-z0-9_])_TOR_ROUTERLIST_H(?![A-Za-z0-9_])/TOR_ROUTERLIST_H/g; s/(?<![A-Za-z0-9_])_TOR_ROUTERPARSE_H(?![A-Za-z0-9_])/TOR_ROUTERPARSE_H/g; s/(?<![A-Za-z0-9_])TOR_ROUTERSET_H(?![A-Za-z0-9_])/TOR_ROUTERSET_H/g; s/(?<![A-Za-z0-9_])TOR_STATEFILE_H(?![A-Za-z0-9_])/TOR_STATEFILE_H/g; s/(?<![A-Za-z0-9_])_TOR_STATUS_H(?![A-Za-z0-9_])/TOR_STATUS_H/g; s/(?<![A-Za-z0-9_])TOR_TRANSPORTS_H(?![A-Za-z0-9_])/TOR_TRANSPORTS_H/g; s/(?<![A-Za-z0-9_])_TOR_TEST_H(?![A-Za-z0-9_])/TOR_TEST_H/g; s/(?<![A-Za-z0-9_])_TOR_FW_HELPER_H(?![A-Za-z0-9_])/TOR_TOR_FW_HELPER_H/g; s/(?<![A-Za-z0-9_])_TOR_FW_HELPER_NATPMP_H(?![A-Za-z0-9_])/TOR_TOR_FW_HELPER_NATPMP_H/g; s/(?<![A-Za-z0-9_])_TOR_FW_HELPER_UPNP_H(?![A-Za-z0-9_])/TOR_TOR_FW_HELPER_UPNP_H/g; ==============================
* Add guard macro for eventdns_tor.hNick Mathewson2012-10-12
|
* Install correct incoming cell handlers on reachability testing channelsAndrea Shepard2012-10-12
| | | | Fix for bug 7086.
* Merge branch 'move_contrib_source' of git://git.torproject.org/nickm/torAndrea Shepard2012-10-11
|\
| * Move all externally maintained source files into src/extNick Mathewson2012-10-11
| | | | | | | | | | | | The rationale for treating these files differently is that we should be checking upstream for changes as applicable, and merging changes upstream as warranted.
* | Make very sure to handle cells in-order on channels.Nick Mathewson2012-10-11
|/ | | | Fix on code for 6465, not yet in any release.
* Merge branch 'bug7011'Nick Mathewson2012-10-10
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/or/circuitbuild.c The conflict was trivial, since no line of code actually changed in both branches: There was a fmt_addr() that turned into fmt_addrport() in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in master.
| * Use fmt_addrport in pt_get_extra_info_descriptor_string.David Fifield2012-10-10
| | | | | | | | | | This patch is by asn. https://trac.torproject.org/projects/tor/ticket/7011#comment:11
| * Use fmt_addrport where appropriate.David Fifield2012-10-10
| | | | | | | | | | | | | | | | | | This is mostly a conversion from this pattern: log("... %s:%d ...", fmt_and_decorate_addr(&addr), port); to this: log("... %s ...", fmt_addrport(&addr, port)); The output is the same in all cases.
| * Use fmt_and_decorate_addr in extra-info "transport" lines.David Fifield2012-10-10
| | | | | | | | | | | | | | Apparently BridgeDB is already expecting transport lines to be formatted thus; see https://trac.torproject.org/projects/tor/ticket/7011#comment:12 ff. It may be that there are no extant IPv6 pluggable transport bridges yet, so this didn't cause a problem.
| * Use fmt_and_decorate_addr in TransportProxy statefile entry.David Fifield2012-10-10
| | | | | | | | | | | | | | | | | | | | | | state_transport_line_is_valid calls tor_addr_port_lookup, which expects brackets around an IPv6 address. Without this, cached transport addresses can't be parsed later: [warn] state: Could not parse addrport. [warn] state: State file seems to be broken. See #7011.
| * Decorate addresses given to a HTTP CONNECT proxy.David Fifield2012-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This affects the Request-URI and the value of the Host header. RFC 2616 doesn't directly address the formatting of IPv6 addresses, but it delegates some productions to RFC 2396 "Uniform Resource Identifiers (URI): Generic Syntax," which is obsoleted by RFC 3986, which requires square brackets for IPv6 addresses in both places. I tested this with HTTPSProxy 127.0.0.1:8000 Bridge <IPv6 bridge> UseBridges 1 and an Ncat HTTP proxy: ncat --proxy-type http -l 8000 -vvv https://tools.ietf.org/html/rfc2616#section-3.2.1 https://tools.ietf.org/html/rfc2616#section-5.1.2 https://tools.ietf.org/html/rfc2616#section-14.23 https://tools.ietf.org/html/rfc3986#section-3.2.2
| * Use fmt_and_decorate_addr in log messages.David Fifield2012-10-10
| |
* | Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/torAndrea Shepard2012-10-10
|\ \ | |/ |/|
| * Remove variables; fix gcc 4.7 warningsNick Mathewson2012-10-10
| | | | | | | | | | My GCC warns when variables are assigned to but never used. There were a few like that in the 6816/6465 branches.
| * Fix formatting in various places after 6465/6816 workAndrea Shepard2012-10-10
| |
| * Make channel_flush_some_cells() compile cleanly on machines with ssize_t ↵Andrea Shepard2012-10-10
| | | | | | | | larger than int per sjumrdoch comment
| * Don't remove circuitmux hash table entries in circuitmux_detach_circuit() ↵Andrea Shepard2012-10-10
| | | | | | | | until after circuitmux_make_circuit_inactive()
| * Fix 'warning: circuit was already inactive' and assert in ↵Andrea Shepard2012-10-10
| | | | | | | | circuitmux_make_circuit_inactive() during circuitmux_detach_all_circuits()
| * Bring summary comment block in circuitmux.c up to dateAndrea Shepard2012-10-10
| |
| * New and improved circuitmux_detach_all_circuits(), now without the stupidAndrea Shepard2012-10-10
| |
| * Correctly set magic numbers on ewma policy data/circuit data when allocatingAndrea Shepard2012-10-10
| |
| * Set circuitmux policy on existing active channels when ewma_enabled changesAndrea Shepard2012-10-10
| |
| * Set circuitmux policy on new channels in channeltls.cAndrea Shepard2012-10-10
| |
| * Implement cell_ewma_enabled()Andrea Shepard2012-10-10
| |
| * Implement channel_set_cmux_policy_everywhere()Andrea Shepard2012-10-10
| |
| * Fix broken circuitmux_move_active_circ_to_tail(); don't assume n_chan is not ↵Andrea Shepard2012-10-10
| | | | | | | | NULL in circuitmux_detach_circuit()
| * Allow n_chan to be NULL in circuitmux_find_map_entry(); it can be but with ↵Andrea Shepard2012-10-10
| | | | | | | | non-NULL p_chan when extending a circuit
| * Use circuit_get_by_circid_channel_even_if_marked() and fix some asserts in ↵Andrea Shepard2012-10-10
| | | | | | | | circuitmux.c
| * Fix some circuitmux-related asserts in relay.cAndrea Shepard2012-10-10
| |
| * Fix detach when setting circuit ID to 0 bug in ↵Andrea Shepard2012-10-10
| | | | | | | | circuit_set_circid_chan_helper() and add circuit_get_by_circid_channel_even_if_marked()
| * Detach circuits from circuitmux early when freeing channel so they can find ↵Andrea Shepard2012-10-10
| | | | | | | | the channel by ID
| * Handle closing circuits correctly with circuitmux_tAndrea Shepard2012-10-10
| |
| * Add a bunch of paranoid-mode expensive asserts incircuitmux.cAndrea Shepard2012-10-10
| |
| * Adjust the circuitmux_t counter correctly in circuitmux_notify_xmit_cells()Andrea Shepard2012-10-10
| |
| * Fix circuitmux attach/detach logic in circuit_set_circid_chan_helper(); it's ↵Andrea Shepard2012-10-10
| | | | | | | | possible for id to be zero (not assigned yet) and shouldn't be attached then
| * Update circuitmux-related TODOs in channeltls.cAndrea Shepard2012-10-10
| |
| * Fix comment on circuit_t.n_hop and remove circuitmux TODO in or.hAndrea Shepard2012-10-10
| |
| * Move all EWMA code into circuitmux.c and implement circuitmux_policy_t ↵Andrea Shepard2012-10-10
| | | | | | | | methods using it
| * Add circuitmux.h, circuitmux_ewma.h includes now necessary in networkstatus.cAndrea Shepard2012-10-10
| |
| * Remove cell_ewma_t from or.h and from circuit_t/or_circuit_t; all that goes ↵Andrea Shepard2012-10-10
| | | | | | | | to the new circuitmux_ewma.c now
| * Add circuitmux.h, circuitmux_ewma.h includes now necessary in config.cAndrea Shepard2012-10-10
| |
| * Remove EWMA code from relay.{c,h}; it goes to a circuitmux policy nowAndrea Shepard2012-10-10
| |
| * Remove ewma setup code in init_circuit_base()/or_circuit_new() of ↵Andrea Shepard2012-10-10
| | | | | | | | circuitlist.c; it gets allocated when the circuit is attached to a circuitmux_t with that policy now
| * Add upcasts for circuitmux_policy_data_t and circuitmux_policy_circ_data_t ↵Andrea Shepard2012-10-10
| | | | | | | | to circuitmux.h
| * Add initial circuitmux_ewma.{c,h}Andrea Shepard2012-10-10
| |
| * Implement circuitmux_assert_okay() and helper functions in circuitmux.cAndrea Shepard2012-10-10
| |
| * Implement circuitmux_get_first_active_circuit() in circuitmux.c; add ↵Andrea Shepard2012-10-10
| | | | | | | | pick_active_circuit() to circuitmux_policy_t in circuitmux.h
| * Add comment for circuitmux_notify_xmit_cells() in circuitmux.cAndrea Shepard2012-10-10
| |
| * Add comment for circuitmux_move_active_circ_to_tail() in circuitmux.cAndrea Shepard2012-10-10
| |
generated by cgit v1.2.3 (git 2.25.4) at 2024-09-29 04:47:57 +0000