diff options
Diffstat (limited to 'src/or/channeltls.c')
| -rw-r--r-- | src/or/channeltls.c | 128 |
1 files changed, 69 insertions, 59 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 54d94f6109..85dfe0c0f1 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1,4 +1,4 @@ -/* * Copyright (c) 2012-2017, The Tor Project, Inc. */ +/* * Copyright (c) 2012-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -38,27 +38,38 @@ #define CHANNELTLS_PRIVATE -#include "or.h" -#include "channel.h" -#include "channeltls.h" -#include "circuitmux.h" -#include "circuitmux_ewma.h" -#include "command.h" -#include "config.h" -#include "connection.h" -#include "connection_or.h" -#include "control.h" -#include "entrynodes.h" -#include "link_handshake.h" -#include "relay.h" -#include "rephist.h" -#include "router.h" -#include "routerlist.h" -#include "scheduler.h" -#include "torcert.h" -#include "networkstatus.h" -#include "channelpadding_negotiation.h" -#include "channelpadding.h" +#include "or/or.h" +#include "or/channel.h" +#include "or/channeltls.h" +#include "or/circuitmux.h" +#include "or/circuitmux_ewma.h" +#include "or/command.h" +#include "or/config.h" +#include "or/connection.h" +#include "or/connection_or.h" +#include "or/control.h" +#include "or/entrynodes.h" +#include "trunnel/link_handshake.h" +#include "or/relay.h" +#include "or/rephist.h" +#include "or/router.h" +#include "or/routerlist.h" +#include "or/scheduler.h" +#include "or/torcert.h" +#include "or/networkstatus.h" +#include "trunnel/channelpadding_negotiation.h" +#include "or/channelpadding.h" + +#include "or/cell_st.h" +#include "or/cell_queue_st.h" +#include "or/extend_info_st.h" +#include "or/or_connection_st.h" +#include "or/or_handshake_certs_st.h" +#include "or/or_handshake_state_st.h" +#include "or/routerinfo_st.h" +#include "or/var_cell_st.h" + +#include "lib/tls/tortls.h" /** How many CELL_PADDING cells have we received, ever? */ uint64_t stats_n_padding_cells_processed = 0; @@ -183,19 +194,19 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, log_debug(LD_CHANNEL, "In channel_tls_connect() for channel %p " - "(global id " U64_FORMAT ")", + "(global id %"PRIu64 ")", tlschan, - U64_PRINTF_ARG(chan->global_identifier)); + (chan->global_identifier)); if (is_local_addr(addr)) { log_debug(LD_CHANNEL, - "Marking new outgoing channel " U64_FORMAT " at %p as local", - U64_PRINTF_ARG(chan->global_identifier), chan); + "Marking new outgoing channel %"PRIu64 " at %p as local", + (chan->global_identifier), chan); channel_mark_local(chan); } else { log_debug(LD_CHANNEL, - "Marking new outgoing channel " U64_FORMAT " at %p as remote", - U64_PRINTF_ARG(chan->global_identifier), chan); + "Marking new outgoing channel %"PRIu64 " at %p as remote", + (chan->global_identifier), chan); channel_mark_remote(chan); } @@ -211,8 +222,8 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, } log_debug(LD_CHANNEL, - "Got orconn %p for channel with global id " U64_FORMAT, - tlschan->conn, U64_PRINTF_ARG(chan->global_identifier)); + "Got orconn %p for channel with global id %"PRIu64, + tlschan->conn, (chan->global_identifier)); goto done; @@ -262,8 +273,8 @@ channel_tls_start_listener(void) channel_tls_listener = listener; log_debug(LD_CHANNEL, - "Starting TLS channel listener %p with global id " U64_FORMAT, - listener, U64_PRINTF_ARG(listener->global_identifier)); + "Starting TLS channel listener %p with global id %"PRIu64, + listener, (listener->global_identifier)); channel_listener_register(listener); } else listener = channel_tls_listener; @@ -292,9 +303,9 @@ channel_tls_free_all(void) */ old_listener = channel_tls_listener; log_debug(LD_CHANNEL, - "Closing channel_tls_listener with ID " U64_FORMAT + "Closing channel_tls_listener with ID %"PRIu64 " at %p.", - U64_PRINTF_ARG(old_listener->global_identifier), + (old_listener->global_identifier), old_listener); channel_listener_unregister(old_listener); channel_listener_mark_for_close(old_listener); @@ -326,13 +337,13 @@ channel_tls_handle_incoming(or_connection_t *orconn) if (is_local_addr(&(TO_CONN(orconn)->addr))) { log_debug(LD_CHANNEL, - "Marking new incoming channel " U64_FORMAT " at %p as local", - U64_PRINTF_ARG(chan->global_identifier), chan); + "Marking new incoming channel %"PRIu64 " at %p as local", + (chan->global_identifier), chan); channel_mark_local(chan); } else { log_debug(LD_CHANNEL, - "Marking new incoming channel " U64_FORMAT " at %p as remote", - U64_PRINTF_ARG(chan->global_identifier), chan); + "Marking new incoming channel %"PRIu64 " at %p as remote", + (chan->global_identifier), chan); channel_mark_remote(chan); } @@ -422,8 +433,8 @@ channel_tls_describe_transport_method(channel_t *chan) if (buf) tor_free(buf); tor_asprintf(&buf, - "TLS channel (connection " U64_FORMAT ")", - U64_PRINTF_ARG(id)); + "TLS channel (connection %"PRIu64 ")", + (id)); rv = buf; } else { @@ -484,8 +495,8 @@ channel_tls_get_overhead_estimate_method(channel_t *chan) } log_debug(LD_CHANNEL, - "Estimated overhead ratio for TLS chan " U64_FORMAT " is %f", - U64_PRINTF_ARG(chan->global_identifier), overhead); + "Estimated overhead ratio for TLS chan %"PRIu64 " is %f", + (chan->global_identifier), overhead); return overhead; } @@ -616,8 +627,8 @@ channel_tls_has_queued_writes_method(channel_t *chan) if (!(tlschan->conn)) { log_info(LD_CHANNEL, "something called has_queued_writes on a tlschan " - "(%p with ID " U64_FORMAT " but no conn", - chan, U64_PRINTF_ARG(chan->global_identifier)); + "(%p with ID %"PRIu64 " but no conn", + chan, (chan->global_identifier)); } outbuf_len = (tlschan->conn != NULL) ? @@ -684,8 +695,8 @@ channel_tls_matches_extend_info_method(channel_t *chan, if (!(tlschan->conn)) { log_info(LD_CHANNEL, "something called matches_extend_info on a tlschan " - "(%p with ID " U64_FORMAT " but no conn", - chan, U64_PRINTF_ARG(chan->global_identifier)); + "(%p with ID %"PRIu64 " but no conn", + chan, (chan->global_identifier)); return 0; } @@ -714,8 +725,8 @@ channel_tls_matches_target_method(channel_t *chan, if (!(tlschan->conn)) { log_info(LD_CHANNEL, "something called matches_target on a tlschan " - "(%p with ID " U64_FORMAT " but no conn", - chan, U64_PRINTF_ARG(chan->global_identifier)); + "(%p with ID %"PRIu64 " but no conn", + chan, (chan->global_identifier)); return 0; } @@ -797,8 +808,8 @@ channel_tls_write_cell_method(channel_t *chan, cell_t *cell) } else { log_info(LD_CHANNEL, "something called write_cell on a tlschan " - "(%p with ID " U64_FORMAT " but no conn", - chan, U64_PRINTF_ARG(chan->global_identifier)); + "(%p with ID %"PRIu64 " but no conn", + chan, (chan->global_identifier)); } return written; @@ -830,8 +841,8 @@ channel_tls_write_packed_cell_method(channel_t *chan, } else { log_info(LD_CHANNEL, "something called write_packed_cell on a tlschan " - "(%p with ID " U64_FORMAT " but no conn", - chan, U64_PRINTF_ARG(chan->global_identifier)); + "(%p with ID %"PRIu64 " but no conn", + chan, (chan->global_identifier)); return -1; } @@ -859,8 +870,8 @@ channel_tls_write_var_cell_method(channel_t *chan, var_cell_t *var_cell) } else { log_info(LD_CHANNEL, "something called write_var_cell on a tlschan " - "(%p with ID " U64_FORMAT " but no conn", - chan, U64_PRINTF_ARG(chan->global_identifier)); + "(%p with ID %"PRIu64 " but no conn", + chan, (chan->global_identifier)); } return written; @@ -1332,15 +1343,15 @@ channel_tls_update_marks(or_connection_t *conn) if (is_local_addr(&(TO_CONN(conn)->addr))) { if (!channel_is_local(chan)) { log_debug(LD_CHANNEL, - "Marking channel " U64_FORMAT " at %p as local", - U64_PRINTF_ARG(chan->global_identifier), chan); + "Marking channel %"PRIu64 " at %p as local", + (chan->global_identifier), chan); channel_mark_local(chan); } } else { if (channel_is_local(chan)) { log_debug(LD_CHANNEL, - "Marking channel " U64_FORMAT " at %p as remote", - U64_PRINTF_ARG(chan->global_identifier), chan); + "Marking channel %"PRIu64 " at %p as remote", + (chan->global_identifier), chan); channel_mark_remote(chan); } } @@ -2445,4 +2456,3 @@ channel_tls_process_authenticate_cell(var_cell_t *cell, channel_tls_t *chan) #undef ERR } - |