mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 13:43:47 +01:00
56c0baa523
For everything we declare that starts with _, make it end with _ instead. This is a machine-generated patch. To make it, start by getting the list of reserved identifiers using: git ls-tree -r --name-only HEAD | grep '\.[ch]$' | \ xargs ctags --c-kinds=defglmpstuvx -o - | grep '^_' | \ cut -f 1 | sort| uniq You might need gnu ctags. Then pipe the output through this script: ============================== use strict; BEGIN { print "#!/usr/bin/perl -w -i -p\n\n"; } chomp; next if ( /^__attribute__/ or /^__func__/ or /^_FILE_OFFSET_BITS/ or /^_FORTIFY_SOURCE/ or /^_GNU_SOURCE/ or /^_WIN32/ or /^_DARWIN_UNLIMITED/ or /^_FILE_OFFSET_BITS/ or /^_LARGEFILE64_SOURCE/ or /^_LFS64_LARGEFILE/ or /^__cdecl/ or /^__attribute__/ or /^__func__/ or /^_WIN32_WINNT/); my $ident = $_; my $better = $ident; $better =~ s/^_//; $better = "${better}_"; print "s/(?<![A-Za-z0-9_])$ident(?![A-Za-z0-9_])/$better/g;\n"; ============================== Then run the resulting script on all the files you want to change. (That is, all the C except that in src/ext.) The resulting script was: ============================== s/(?<![A-Za-z0-9_])_address(?![A-Za-z0-9_])/address_/g; s/(?<![A-Za-z0-9_])_aes_fill_buf(?![A-Za-z0-9_])/aes_fill_buf_/g; s/(?<![A-Za-z0-9_])_AllowInvalid(?![A-Za-z0-9_])/AllowInvalid_/g; s/(?<![A-Za-z0-9_])_AP_CONN_STATE_MAX(?![A-Za-z0-9_])/AP_CONN_STATE_MAX_/g; s/(?<![A-Za-z0-9_])_AP_CONN_STATE_MIN(?![A-Za-z0-9_])/AP_CONN_STATE_MIN_/g; s/(?<![A-Za-z0-9_])_assert_cache_ok(?![A-Za-z0-9_])/assert_cache_ok_/g; s/(?<![A-Za-z0-9_])_A_UNKNOWN(?![A-Za-z0-9_])/A_UNKNOWN_/g; s/(?<![A-Za-z0-9_])_base(?![A-Za-z0-9_])/base_/g; s/(?<![A-Za-z0-9_])_BridgePassword_AuthDigest(?![A-Za-z0-9_])/BridgePassword_AuthDigest_/g; s/(?<![A-Za-z0-9_])_buffer_stats_compare_entries(?![A-Za-z0-9_])/buffer_stats_compare_entries_/g; s/(?<![A-Za-z0-9_])_chan_circid_entries_eq(?![A-Za-z0-9_])/chan_circid_entries_eq_/g; s/(?<![A-Za-z0-9_])_chan_circid_entry_hash(?![A-Za-z0-9_])/chan_circid_entry_hash_/g; s/(?<![A-Za-z0-9_])_check_no_tls_errors(?![A-Za-z0-9_])/check_no_tls_errors_/g; s/(?<![A-Za-z0-9_])_c_hist_compare(?![A-Za-z0-9_])/c_hist_compare_/g; s/(?<![A-Za-z0-9_])_circ(?![A-Za-z0-9_])/circ_/g; s/(?<![A-Za-z0-9_])_circuit_get_global_list(?![A-Za-z0-9_])/circuit_get_global_list_/g; s/(?<![A-Za-z0-9_])_circuit_mark_for_close(?![A-Za-z0-9_])/circuit_mark_for_close_/g; s/(?<![A-Za-z0-9_])_CIRCUIT_PURPOSE_C_MAX(?![A-Za-z0-9_])/CIRCUIT_PURPOSE_C_MAX_/g; s/(?<![A-Za-z0-9_])_CIRCUIT_PURPOSE_MAX(?![A-Za-z0-9_])/CIRCUIT_PURPOSE_MAX_/g; s/(?<![A-Za-z0-9_])_CIRCUIT_PURPOSE_MIN(?![A-Za-z0-9_])/CIRCUIT_PURPOSE_MIN_/g; s/(?<![A-Za-z0-9_])_CIRCUIT_PURPOSE_OR_MAX(?![A-Za-z0-9_])/CIRCUIT_PURPOSE_OR_MAX_/g; s/(?<![A-Za-z0-9_])_CIRCUIT_PURPOSE_OR_MIN(?![A-Za-z0-9_])/CIRCUIT_PURPOSE_OR_MIN_/g; s/(?<![A-Za-z0-9_])_cmp_int_strings(?![A-Za-z0-9_])/cmp_int_strings_/g; s/(?<![A-Za-z0-9_])_compare_cached_resolves_by_expiry(?![A-Za-z0-9_])/compare_cached_resolves_by_expiry_/g; s/(?<![A-Za-z0-9_])_compare_digests(?![A-Za-z0-9_])/compare_digests_/g; s/(?<![A-Za-z0-9_])_compare_digests256(?![A-Za-z0-9_])/compare_digests256_/g; s/(?<![A-Za-z0-9_])_compare_dir_src_ents_by_authority_id(?![A-Za-z0-9_])/compare_dir_src_ents_by_authority_id_/g; s/(?<![A-Za-z0-9_])_compare_duration_idx(?![A-Za-z0-9_])/compare_duration_idx_/g; s/(?<![A-Za-z0-9_])_compare_int(?![A-Za-z0-9_])/compare_int_/g; s/(?<![A-Za-z0-9_])_compare_networkstatus_v2_published_on(?![A-Za-z0-9_])/compare_networkstatus_v2_published_on_/g; s/(?<![A-Za-z0-9_])_compare_old_routers_by_identity(?![A-Za-z0-9_])/compare_old_routers_by_identity_/g; s/(?<![A-Za-z0-9_])_compare_orports(?![A-Za-z0-9_])/compare_orports_/g; s/(?<![A-Za-z0-9_])_compare_pairs(?![A-Za-z0-9_])/compare_pairs_/g; s/(?<![A-Za-z0-9_])_compare_routerinfo_by_id_digest(?![A-Za-z0-9_])/compare_routerinfo_by_id_digest_/g; s/(?<![A-Za-z0-9_])_compare_routerinfo_by_ip_and_bw(?![A-Za-z0-9_])/compare_routerinfo_by_ip_and_bw_/g; s/(?<![A-Za-z0-9_])_compare_signed_descriptors_by_age(?![A-Za-z0-9_])/compare_signed_descriptors_by_age_/g; s/(?<![A-Za-z0-9_])_compare_string_ptrs(?![A-Za-z0-9_])/compare_string_ptrs_/g; s/(?<![A-Za-z0-9_])_compare_strings_for_pqueue(?![A-Za-z0-9_])/compare_strings_for_pqueue_/g; s/(?<![A-Za-z0-9_])_compare_strs(?![A-Za-z0-9_])/compare_strs_/g; s/(?<![A-Za-z0-9_])_compare_tor_version_str_ptr(?![A-Za-z0-9_])/compare_tor_version_str_ptr_/g; s/(?<![A-Za-z0-9_])_compare_vote_rs(?![A-Za-z0-9_])/compare_vote_rs_/g; s/(?<![A-Za-z0-9_])_compare_votes_by_authority_id(?![A-Za-z0-9_])/compare_votes_by_authority_id_/g; s/(?<![A-Za-z0-9_])_compare_without_first_ch(?![A-Za-z0-9_])/compare_without_first_ch_/g; s/(?<![A-Za-z0-9_])_connection_free(?![A-Za-z0-9_])/connection_free_/g; s/(?<![A-Za-z0-9_])_connection_mark_and_flush(?![A-Za-z0-9_])/connection_mark_and_flush_/g; s/(?<![A-Za-z0-9_])_connection_mark_for_close(?![A-Za-z0-9_])/connection_mark_for_close_/g; s/(?<![A-Za-z0-9_])_connection_mark_unattached_ap(?![A-Za-z0-9_])/connection_mark_unattached_ap_/g; s/(?<![A-Za-z0-9_])_connection_write_to_buf_impl(?![A-Za-z0-9_])/connection_write_to_buf_impl_/g; s/(?<![A-Za-z0-9_])_ConnLimit(?![A-Za-z0-9_])/ConnLimit_/g; s/(?<![A-Za-z0-9_])_CONN_TYPE_MAX(?![A-Za-z0-9_])/CONN_TYPE_MAX_/g; s/(?<![A-Za-z0-9_])_CONN_TYPE_MIN(?![A-Za-z0-9_])/CONN_TYPE_MIN_/g; s/(?<![A-Za-z0-9_])_CONTROL_CONN_STATE_MAX(?![A-Za-z0-9_])/CONTROL_CONN_STATE_MAX_/g; s/(?<![A-Za-z0-9_])_CONTROL_CONN_STATE_MIN(?![A-Za-z0-9_])/CONTROL_CONN_STATE_MIN_/g; s/(?<![A-Za-z0-9_])_CPUWORKER_STATE_MAX(?![A-Za-z0-9_])/CPUWORKER_STATE_MAX_/g; s/(?<![A-Za-z0-9_])_CPUWORKER_STATE_MIN(?![A-Za-z0-9_])/CPUWORKER_STATE_MIN_/g; s/(?<![A-Za-z0-9_])_crypto_dh_get_dh(?![A-Za-z0-9_])/crypto_dh_get_dh_/g; s/(?<![A-Za-z0-9_])_crypto_global_initialized(?![A-Za-z0-9_])/crypto_global_initialized_/g; s/(?<![A-Za-z0-9_])_crypto_new_pk_from_rsa(?![A-Za-z0-9_])/crypto_new_pk_from_rsa_/g; s/(?<![A-Za-z0-9_])_crypto_pk_get_evp_pkey(?![A-Za-z0-9_])/crypto_pk_get_evp_pkey_/g; s/(?<![A-Za-z0-9_])_crypto_pk_get_rsa(?![A-Za-z0-9_])/crypto_pk_get_rsa_/g; s/(?<![A-Za-z0-9_])_DIR_CONN_STATE_MAX(?![A-Za-z0-9_])/DIR_CONN_STATE_MAX_/g; s/(?<![A-Za-z0-9_])_DIR_CONN_STATE_MIN(?![A-Za-z0-9_])/DIR_CONN_STATE_MIN_/g; s/(?<![A-Za-z0-9_])_DIR_PURPOSE_MAX(?![A-Za-z0-9_])/DIR_PURPOSE_MAX_/g; s/(?<![A-Za-z0-9_])_DIR_PURPOSE_MIN(?![A-Za-z0-9_])/DIR_PURPOSE_MIN_/g; s/(?<![A-Za-z0-9_])_dirreq_map_get(?![A-Za-z0-9_])/dirreq_map_get_/g; s/(?<![A-Za-z0-9_])_dirreq_map_put(?![A-Za-z0-9_])/dirreq_map_put_/g; s/(?<![A-Za-z0-9_])_dns_randfn(?![A-Za-z0-9_])/dns_randfn_/g; s/(?<![A-Za-z0-9_])_dummy(?![A-Za-z0-9_])/dummy_/g; s/(?<![A-Za-z0-9_])_edge(?![A-Za-z0-9_])/edge_/g; s/(?<![A-Za-z0-9_])_END_CIRC_REASON_MAX(?![A-Za-z0-9_])/END_CIRC_REASON_MAX_/g; s/(?<![A-Za-z0-9_])_END_CIRC_REASON_MIN(?![A-Za-z0-9_])/END_CIRC_REASON_MIN_/g; s/(?<![A-Za-z0-9_])_EOF(?![A-Za-z0-9_])/EOF_/g; s/(?<![A-Za-z0-9_])_ERR(?![A-Za-z0-9_])/ERR_/g; s/(?<![A-Za-z0-9_])_escaped_val(?![A-Za-z0-9_])/escaped_val_/g; s/(?<![A-Za-z0-9_])_evdns_log(?![A-Za-z0-9_])/evdns_log_/g; s/(?<![A-Za-z0-9_])_evdns_nameserver_add_impl(?![A-Za-z0-9_])/evdns_nameserver_add_impl_/g; s/(?<![A-Za-z0-9_])_EVENT_MAX(?![A-Za-z0-9_])/EVENT_MAX_/g; s/(?<![A-Za-z0-9_])_EVENT_MIN(?![A-Za-z0-9_])/EVENT_MIN_/g; s/(?<![A-Za-z0-9_])_ExcludeExitNodesUnion(?![A-Za-z0-9_])/ExcludeExitNodesUnion_/g; s/(?<![A-Za-z0-9_])_EXIT_CONN_STATE_MAX(?![A-Za-z0-9_])/EXIT_CONN_STATE_MAX_/g; s/(?<![A-Za-z0-9_])_EXIT_CONN_STATE_MIN(?![A-Za-z0-9_])/EXIT_CONN_STATE_MIN_/g; s/(?<![A-Za-z0-9_])_EXIT_PURPOSE_MAX(?![A-Za-z0-9_])/EXIT_PURPOSE_MAX_/g; s/(?<![A-Za-z0-9_])_EXIT_PURPOSE_MIN(?![A-Za-z0-9_])/EXIT_PURPOSE_MIN_/g; s/(?<![A-Za-z0-9_])_extrainfo_free(?![A-Za-z0-9_])/extrainfo_free_/g; s/(?<![A-Za-z0-9_])_find_by_keyword(?![A-Za-z0-9_])/find_by_keyword_/g; s/(?<![A-Za-z0-9_])_free_cached_dir(?![A-Za-z0-9_])/free_cached_dir_/g; s/(?<![A-Za-z0-9_])_free_cached_resolve(?![A-Za-z0-9_])/free_cached_resolve_/g; s/(?<![A-Za-z0-9_])_free_duplicate_routerstatus_entry(?![A-Za-z0-9_])/free_duplicate_routerstatus_entry_/g; s/(?<![A-Za-z0-9_])_free_link_history(?![A-Za-z0-9_])/free_link_history_/g; s/(?<![A-Za-z0-9_])_geoip_compare_entries(?![A-Za-z0-9_])/geoip_compare_entries_/g; s/(?<![A-Za-z0-9_])_geoip_compare_key_to_entry(?![A-Za-z0-9_])/geoip_compare_key_to_entry_/g; s/(?<![A-Za-z0-9_])_hex_decode_digit(?![A-Za-z0-9_])/hex_decode_digit_/g; s/(?<![A-Za-z0-9_])_idxplus1(?![A-Za-z0-9_])/idxplus1_/g; s/(?<![A-Za-z0-9_])__libc_enable_secure(?![A-Za-z0-9_])/_libc_enable_secure_/g; s/(?<![A-Za-z0-9_])_log_debug(?![A-Za-z0-9_])/log_debug_/g; s/(?<![A-Za-z0-9_])_log_err(?![A-Za-z0-9_])/log_err_/g; s/(?<![A-Za-z0-9_])_log_fn(?![A-Za-z0-9_])/log_fn_/g; s/(?<![A-Za-z0-9_])_log_fn_function_name(?![A-Za-z0-9_])/log_fn_function_name_/g; s/(?<![A-Za-z0-9_])_log_global_min_severity(?![A-Za-z0-9_])/log_global_min_severity_/g; s/(?<![A-Za-z0-9_])_log_info(?![A-Za-z0-9_])/log_info_/g; s/(?<![A-Za-z0-9_])_log_notice(?![A-Za-z0-9_])/log_notice_/g; s/(?<![A-Za-z0-9_])_log_prefix(?![A-Za-z0-9_])/log_prefix_/g; s/(?<![A-Za-z0-9_])_log_warn(?![A-Za-z0-9_])/log_warn_/g; s/(?<![A-Za-z0-9_])_magic(?![A-Za-z0-9_])/magic_/g; s/(?<![A-Za-z0-9_])_MALLOC_LOCK(?![A-Za-z0-9_])/MALLOC_LOCK_/g; s/(?<![A-Za-z0-9_])_MALLOC_LOCK_INIT(?![A-Za-z0-9_])/MALLOC_LOCK_INIT_/g; s/(?<![A-Za-z0-9_])_MALLOC_UNLOCK(?![A-Za-z0-9_])/MALLOC_UNLOCK_/g; s/(?<![A-Za-z0-9_])_microdesc_eq(?![A-Za-z0-9_])/microdesc_eq_/g; s/(?<![A-Za-z0-9_])_microdesc_hash(?![A-Za-z0-9_])/microdesc_hash_/g; s/(?<![A-Za-z0-9_])_MIN_TOR_TLS_ERROR_VAL(?![A-Za-z0-9_])/MIN_TOR_TLS_ERROR_VAL_/g; s/(?<![A-Za-z0-9_])_mm_free(?![A-Za-z0-9_])/mm_free_/g; s/(?<![A-Za-z0-9_])_NIL(?![A-Za-z0-9_])/NIL_/g; s/(?<![A-Za-z0-9_])_n_openssl_mutexes(?![A-Za-z0-9_])/n_openssl_mutexes_/g; s/(?<![A-Za-z0-9_])_openssl_dynlock_create_cb(?![A-Za-z0-9_])/openssl_dynlock_create_cb_/g; s/(?<![A-Za-z0-9_])_openssl_dynlock_destroy_cb(?![A-Za-z0-9_])/openssl_dynlock_destroy_cb_/g; s/(?<![A-Za-z0-9_])_openssl_dynlock_lock_cb(?![A-Za-z0-9_])/openssl_dynlock_lock_cb_/g; s/(?<![A-Za-z0-9_])_openssl_locking_cb(?![A-Za-z0-9_])/openssl_locking_cb_/g; s/(?<![A-Za-z0-9_])_openssl_mutexes(?![A-Za-z0-9_])/openssl_mutexes_/g; s/(?<![A-Za-z0-9_])_option_abbrevs(?![A-Za-z0-9_])/option_abbrevs_/g; s/(?<![A-Za-z0-9_])_option_vars(?![A-Za-z0-9_])/option_vars_/g; s/(?<![A-Za-z0-9_])_OR_CONN_STATE_MAX(?![A-Za-z0-9_])/OR_CONN_STATE_MAX_/g; s/(?<![A-Za-z0-9_])_OR_CONN_STATE_MIN(?![A-Za-z0-9_])/OR_CONN_STATE_MIN_/g; s/(?<![A-Za-z0-9_])_OutboundBindAddressIPv4(?![A-Za-z0-9_])/OutboundBindAddressIPv4_/g; s/(?<![A-Za-z0-9_])_OutboundBindAddressIPv6(?![A-Za-z0-9_])/OutboundBindAddressIPv6_/g; s/(?<![A-Za-z0-9_])_PDS_PREFER_TUNNELED_DIR_CONNS(?![A-Za-z0-9_])/PDS_PREFER_TUNNELED_DIR_CONNS_/g; s/(?<![A-Za-z0-9_])_port(?![A-Za-z0-9_])/port_/g; s/(?<![A-Za-z0-9_])__progname(?![A-Za-z0-9_])/_progname_/g; s/(?<![A-Za-z0-9_])_PublishServerDescriptor(?![A-Za-z0-9_])/PublishServerDescriptor_/g; s/(?<![A-Za-z0-9_])_remove_old_client_helper(?![A-Za-z0-9_])/remove_old_client_helper_/g; s/(?<![A-Za-z0-9_])_rend_cache_entry_free(?![A-Za-z0-9_])/rend_cache_entry_free_/g; s/(?<![A-Za-z0-9_])_routerlist_find_elt(?![A-Za-z0-9_])/routerlist_find_elt_/g; s/(?<![A-Za-z0-9_])_SafeLogging(?![A-Za-z0-9_])/SafeLogging_/g; s/(?<![A-Za-z0-9_])_SHORT_FILE_(?![A-Za-z0-9_])/SHORT_FILE__/g; s/(?<![A-Za-z0-9_])_state_abbrevs(?![A-Za-z0-9_])/state_abbrevs_/g; s/(?<![A-Za-z0-9_])_state_vars(?![A-Za-z0-9_])/state_vars_/g; s/(?<![A-Za-z0-9_])_t(?![A-Za-z0-9_])/t_/g; s/(?<![A-Za-z0-9_])_t32(?![A-Za-z0-9_])/t32_/g; s/(?<![A-Za-z0-9_])_test_op_ip6(?![A-Za-z0-9_])/test_op_ip6_/g; s/(?<![A-Za-z0-9_])_thread1_name(?![A-Za-z0-9_])/thread1_name_/g; s/(?<![A-Za-z0-9_])_thread2_name(?![A-Za-z0-9_])/thread2_name_/g; s/(?<![A-Za-z0-9_])_thread_test_func(?![A-Za-z0-9_])/thread_test_func_/g; s/(?<![A-Za-z0-9_])_thread_test_mutex(?![A-Za-z0-9_])/thread_test_mutex_/g; s/(?<![A-Za-z0-9_])_thread_test_start1(?![A-Za-z0-9_])/thread_test_start1_/g; s/(?<![A-Za-z0-9_])_thread_test_start2(?![A-Za-z0-9_])/thread_test_start2_/g; s/(?<![A-Za-z0-9_])_thread_test_strmap(?![A-Za-z0-9_])/thread_test_strmap_/g; s/(?<![A-Za-z0-9_])_tor_calloc(?![A-Za-z0-9_])/tor_calloc_/g; s/(?<![A-Za-z0-9_])_TOR_CHANNEL_INTERNAL(?![A-Za-z0-9_])/TOR_CHANNEL_INTERNAL_/g; s/(?<![A-Za-z0-9_])_TOR_CIRCUITMUX_EWMA_C(?![A-Za-z0-9_])/TOR_CIRCUITMUX_EWMA_C_/g; s/(?<![A-Za-z0-9_])_tor_free(?![A-Za-z0-9_])/tor_free_/g; s/(?<![A-Za-z0-9_])_tor_malloc(?![A-Za-z0-9_])/tor_malloc_/g; s/(?<![A-Za-z0-9_])_tor_malloc_zero(?![A-Za-z0-9_])/tor_malloc_zero_/g; s/(?<![A-Za-z0-9_])_tor_memdup(?![A-Za-z0-9_])/tor_memdup_/g; s/(?<![A-Za-z0-9_])_tor_realloc(?![A-Za-z0-9_])/tor_realloc_/g; s/(?<![A-Za-z0-9_])_tor_strdup(?![A-Za-z0-9_])/tor_strdup_/g; s/(?<![A-Za-z0-9_])_tor_strndup(?![A-Za-z0-9_])/tor_strndup_/g; s/(?<![A-Za-z0-9_])_TOR_TLS_SYSCALL(?![A-Za-z0-9_])/TOR_TLS_SYSCALL_/g; s/(?<![A-Za-z0-9_])_TOR_TLS_ZERORETURN(?![A-Za-z0-9_])/TOR_TLS_ZERORETURN_/g; s/(?<![A-Za-z0-9_])__USE_ISOC99(?![A-Za-z0-9_])/_USE_ISOC99_/g; s/(?<![A-Za-z0-9_])_UsingTestNetworkDefaults(?![A-Za-z0-9_])/UsingTestNetworkDefaults_/g; s/(?<![A-Za-z0-9_])_val(?![A-Za-z0-9_])/val_/g; s/(?<![A-Za-z0-9_])_void_for_alignment(?![A-Za-z0-9_])/void_for_alignment_/g; ==============================
351 lines
12 KiB
C
351 lines
12 KiB
C
/* Copyright (c) 2007-2012, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
/**
|
|
* \file dnsserv.c \brief Implements client-side DNS proxy server code. Note:
|
|
* this is the DNS Server code, not the Server DNS code. Confused? This code
|
|
* runs on client-side, and acts as a DNS server. The code in dns.c, on the
|
|
* other hand, runs on Tor servers, and acts as a DNS client.
|
|
**/
|
|
|
|
#include "or.h"
|
|
#include "dnsserv.h"
|
|
#include "config.h"
|
|
#include "connection.h"
|
|
#include "connection_edge.h"
|
|
#include "control.h"
|
|
#include "main.h"
|
|
#include "policies.h"
|
|
#ifdef HAVE_EVENT2_DNS_H
|
|
#include <event2/dns.h>
|
|
#include <event2/dns_compat.h>
|
|
/* XXXX this implies we want an improved evdns */
|
|
#include <event2/dns_struct.h>
|
|
#else
|
|
#include "eventdns.h"
|
|
#endif
|
|
|
|
/** Helper function: called by evdns whenever the client sends a request to our
|
|
* DNSPort. We need to eventually answer the request <b>req</b>.
|
|
*/
|
|
static void
|
|
evdns_server_callback(struct evdns_server_request *req, void *data_)
|
|
{
|
|
const listener_connection_t *listener = data_;
|
|
entry_connection_t *entry_conn;
|
|
edge_connection_t *conn;
|
|
int i = 0;
|
|
struct evdns_server_question *q = NULL;
|
|
struct sockaddr_storage addr;
|
|
struct sockaddr *sa;
|
|
int addrlen;
|
|
tor_addr_t tor_addr;
|
|
uint16_t port;
|
|
int err = DNS_ERR_NONE;
|
|
char *q_name;
|
|
|
|
tor_assert(req);
|
|
|
|
log_info(LD_APP, "Got a new DNS request!");
|
|
|
|
req->flags |= 0x80; /* set RA */
|
|
|
|
/* First, check whether the requesting address matches our SOCKSPolicy. */
|
|
if ((addrlen = evdns_server_request_get_requesting_addr(req,
|
|
(struct sockaddr*)&addr, (socklen_t)sizeof(addr))) < 0) {
|
|
log_warn(LD_APP, "Couldn't get requesting address.");
|
|
evdns_server_request_respond(req, DNS_ERR_SERVERFAILED);
|
|
return;
|
|
}
|
|
(void) addrlen;
|
|
sa = (struct sockaddr*) &addr;
|
|
if (tor_addr_from_sockaddr(&tor_addr, sa, &port)<0) {
|
|
log_warn(LD_APP, "Requesting address wasn't recognized.");
|
|
evdns_server_request_respond(req, DNS_ERR_SERVERFAILED);
|
|
return;
|
|
}
|
|
|
|
if (!socks_policy_permits_address(&tor_addr)) {
|
|
log_warn(LD_APP, "Rejecting DNS request from disallowed IP.");
|
|
evdns_server_request_respond(req, DNS_ERR_REFUSED);
|
|
return;
|
|
}
|
|
|
|
/* Now, let's find the first actual question of a type we can answer in this
|
|
* DNS request. It makes us a little noncompliant to act like this; we
|
|
* should fix that eventually if it turns out to make a difference for
|
|
* anybody. */
|
|
if (req->nquestions == 0) {
|
|
log_info(LD_APP, "No questions in DNS request; sending back nil reply.");
|
|
evdns_server_request_respond(req, 0);
|
|
return;
|
|
}
|
|
if (req->nquestions > 1) {
|
|
log_info(LD_APP, "Got a DNS request with more than one question; I only "
|
|
"handle one question at a time for now. Skipping the extras.");
|
|
}
|
|
for (i = 0; i < req->nquestions; ++i) {
|
|
if (req->questions[i]->dns_question_class != EVDNS_CLASS_INET)
|
|
continue;
|
|
switch (req->questions[i]->type) {
|
|
case EVDNS_TYPE_A:
|
|
case EVDNS_TYPE_PTR:
|
|
q = req->questions[i];
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
if (!q) {
|
|
log_info(LD_APP, "None of the questions we got were ones we're willing "
|
|
"to support. Sending NOTIMPL.");
|
|
evdns_server_request_respond(req, DNS_ERR_NOTIMPL);
|
|
return;
|
|
}
|
|
if (q->type != EVDNS_TYPE_A) {
|
|
tor_assert(q->type == EVDNS_TYPE_PTR);
|
|
}
|
|
|
|
/* Make sure the name isn't too long: This should be impossible, I think. */
|
|
if (err == DNS_ERR_NONE && strlen(q->name) > MAX_SOCKS_ADDR_LEN-1)
|
|
err = DNS_ERR_FORMAT;
|
|
|
|
if (err != DNS_ERR_NONE) {
|
|
/* We got an error? Then send back an answer immediately; we're done. */
|
|
evdns_server_request_respond(req, err);
|
|
return;
|
|
}
|
|
|
|
/* Make a new dummy AP connection, and attach the request to it. */
|
|
entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET);
|
|
conn = ENTRY_TO_EDGE_CONN(entry_conn);
|
|
TO_CONN(conn)->state = AP_CONN_STATE_RESOLVE_WAIT;
|
|
conn->is_dns_request = 1;
|
|
|
|
tor_addr_copy(&TO_CONN(conn)->addr, &tor_addr);
|
|
TO_CONN(conn)->port = port;
|
|
TO_CONN(conn)->address = tor_dup_addr(&tor_addr);
|
|
|
|
if (q->type == EVDNS_TYPE_A)
|
|
entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE;
|
|
else
|
|
entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;
|
|
|
|
strlcpy(entry_conn->socks_request->address, q->name,
|
|
sizeof(entry_conn->socks_request->address));
|
|
|
|
entry_conn->socks_request->listener_type = listener->base_.type;
|
|
entry_conn->dns_server_request = req;
|
|
entry_conn->isolation_flags = listener->isolation_flags;
|
|
entry_conn->session_group = listener->session_group;
|
|
entry_conn->nym_epoch = get_signewnym_epoch();
|
|
|
|
if (connection_add(ENTRY_TO_CONN(entry_conn)) < 0) {
|
|
log_warn(LD_APP, "Couldn't register dummy connection for DNS request");
|
|
evdns_server_request_respond(req, DNS_ERR_SERVERFAILED);
|
|
connection_free(ENTRY_TO_CONN(entry_conn));
|
|
return;
|
|
}
|
|
|
|
control_event_stream_status(entry_conn, STREAM_EVENT_NEW, 0);
|
|
|
|
/* Now, unless a controller asked us to leave streams unattached,
|
|
* throw the connection over to get rewritten (which will
|
|
* answer it immediately if it's in the cache, or completely bogus, or
|
|
* automapped), and then attached to a circuit. */
|
|
log_info(LD_APP, "Passing request for %s to rewrite_and_attach.",
|
|
escaped_safe_str_client(q->name));
|
|
q_name = tor_strdup(q->name); /* q could be freed in rewrite_and_attach */
|
|
connection_ap_rewrite_and_attach_if_allowed(entry_conn, NULL, NULL);
|
|
/* Now, the connection is marked if it was bad. */
|
|
|
|
log_info(LD_APP, "Passed request for %s to rewrite_and_attach_if_allowed.",
|
|
escaped_safe_str_client(q_name));
|
|
tor_free(q_name);
|
|
}
|
|
|
|
/** Helper function: called whenever the client sends a resolve request to our
|
|
* controller. We need to eventually answer the request <b>req</b>.
|
|
* Returns 0 if the controller will be getting (or has gotten) an event in
|
|
* response; -1 if we couldn't launch the request.
|
|
*/
|
|
int
|
|
dnsserv_launch_request(const char *name, int reverse)
|
|
{
|
|
entry_connection_t *entry_conn;
|
|
edge_connection_t *conn;
|
|
char *q_name;
|
|
|
|
/* Make a new dummy AP connection, and attach the request to it. */
|
|
entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET);
|
|
conn = ENTRY_TO_EDGE_CONN(entry_conn);
|
|
conn->base_.state = AP_CONN_STATE_RESOLVE_WAIT;
|
|
|
|
if (reverse)
|
|
entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE_PTR;
|
|
else
|
|
entry_conn->socks_request->command = SOCKS_COMMAND_RESOLVE;
|
|
|
|
conn->is_dns_request = 1;
|
|
|
|
strlcpy(entry_conn->socks_request->address, name,
|
|
sizeof(entry_conn->socks_request->address));
|
|
|
|
entry_conn->socks_request->listener_type = CONN_TYPE_CONTROL_LISTENER;
|
|
entry_conn->original_dest_address = tor_strdup(name);
|
|
entry_conn->session_group = SESSION_GROUP_CONTROL_RESOLVE;
|
|
entry_conn->nym_epoch = get_signewnym_epoch();
|
|
entry_conn->isolation_flags = ISO_DEFAULT;
|
|
|
|
if (connection_add(TO_CONN(conn))<0) {
|
|
log_warn(LD_APP, "Couldn't register dummy connection for RESOLVE request");
|
|
connection_free(TO_CONN(conn));
|
|
return -1;
|
|
}
|
|
|
|
/* Now, unless a controller asked us to leave streams unattached,
|
|
* throw the connection over to get rewritten (which will
|
|
* answer it immediately if it's in the cache, or completely bogus, or
|
|
* automapped), and then attached to a circuit. */
|
|
log_info(LD_APP, "Passing request for %s to rewrite_and_attach.",
|
|
escaped_safe_str_client(name));
|
|
q_name = tor_strdup(name); /* q could be freed in rewrite_and_attach */
|
|
connection_ap_rewrite_and_attach_if_allowed(entry_conn, NULL, NULL);
|
|
/* Now, the connection is marked if it was bad. */
|
|
|
|
log_info(LD_APP, "Passed request for %s to rewrite_and_attach_if_allowed.",
|
|
escaped_safe_str_client(q_name));
|
|
tor_free(q_name);
|
|
return 0;
|
|
}
|
|
|
|
/** If there is a pending request on <b>conn</b> that's waiting for an answer,
|
|
* send back an error and free the request. */
|
|
void
|
|
dnsserv_reject_request(entry_connection_t *conn)
|
|
{
|
|
if (conn->dns_server_request) {
|
|
evdns_server_request_respond(conn->dns_server_request,
|
|
DNS_ERR_SERVERFAILED);
|
|
conn->dns_server_request = NULL;
|
|
}
|
|
}
|
|
|
|
/** Look up the original name that corresponds to 'addr' in req. We use this
|
|
* to preserve case in order to facilitate people using 0x20-hacks to avoid
|
|
* DNS poisoning. */
|
|
static const char *
|
|
evdns_get_orig_address(const struct evdns_server_request *req,
|
|
int rtype, const char *addr)
|
|
{
|
|
int i, type;
|
|
|
|
switch (rtype) {
|
|
case RESOLVED_TYPE_IPV4:
|
|
type = EVDNS_TYPE_A;
|
|
break;
|
|
case RESOLVED_TYPE_HOSTNAME:
|
|
type = EVDNS_TYPE_PTR;
|
|
break;
|
|
case RESOLVED_TYPE_IPV6:
|
|
type = EVDNS_TYPE_AAAA;
|
|
break;
|
|
default:
|
|
tor_fragile_assert();
|
|
return addr;
|
|
}
|
|
|
|
for (i = 0; i < req->nquestions; ++i) {
|
|
const struct evdns_server_question *q = req->questions[i];
|
|
if (q->type == type && !strcasecmp(q->name, addr))
|
|
return q->name;
|
|
}
|
|
return addr;
|
|
}
|
|
|
|
/** Tell the dns request waiting for an answer on <b>conn</b> that we have an
|
|
* answer of type <b>answer_type</b> (RESOLVE_TYPE_IPV4/IPV6/ERR), of length
|
|
* <b>answer_len</b>, in <b>answer</b>, with TTL <b>ttl</b>. Doesn't do
|
|
* any caching; that's handled elsewhere. */
|
|
void
|
|
dnsserv_resolved(entry_connection_t *conn,
|
|
int answer_type,
|
|
size_t answer_len,
|
|
const char *answer,
|
|
int ttl)
|
|
{
|
|
struct evdns_server_request *req = conn->dns_server_request;
|
|
const char *name;
|
|
int err = DNS_ERR_NONE;
|
|
if (!req)
|
|
return;
|
|
name = evdns_get_orig_address(req, answer_type,
|
|
conn->socks_request->address);
|
|
|
|
/* XXXX Re-do; this is dumb. */
|
|
if (ttl < 60)
|
|
ttl = 60;
|
|
|
|
/* The evdns interface is: add a bunch of reply items (corresponding to one
|
|
* or more of the questions in the request); then, call
|
|
* evdns_server_request_respond. */
|
|
if (answer_type == RESOLVED_TYPE_IPV6) {
|
|
log_info(LD_APP, "Got an IPv6 answer; that's not implemented.");
|
|
err = DNS_ERR_NOTIMPL;
|
|
} else if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4 &&
|
|
conn->socks_request->command == SOCKS_COMMAND_RESOLVE) {
|
|
evdns_server_request_add_a_reply(req,
|
|
name,
|
|
1, answer, ttl);
|
|
} else if (answer_type == RESOLVED_TYPE_HOSTNAME &&
|
|
answer_len < 256 &&
|
|
conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) {
|
|
char *ans = tor_strndup(answer, answer_len);
|
|
evdns_server_request_add_ptr_reply(req, NULL,
|
|
name,
|
|
ans, ttl);
|
|
tor_free(ans);
|
|
} else if (answer_type == RESOLVED_TYPE_ERROR) {
|
|
err = DNS_ERR_NOTEXIST;
|
|
} else { /* answer_type == RESOLVED_TYPE_ERROR_TRANSIENT */
|
|
err = DNS_ERR_SERVERFAILED;
|
|
}
|
|
|
|
evdns_server_request_respond(req, err);
|
|
|
|
conn->dns_server_request = NULL;
|
|
}
|
|
|
|
/** Set up the evdns server port for the UDP socket on <b>conn</b>, which
|
|
* must be an AP_DNS_LISTENER */
|
|
void
|
|
dnsserv_configure_listener(connection_t *conn)
|
|
{
|
|
listener_connection_t *listener_conn;
|
|
tor_assert(conn);
|
|
tor_assert(SOCKET_OK(conn->s));
|
|
tor_assert(conn->type == CONN_TYPE_AP_DNS_LISTENER);
|
|
|
|
listener_conn = TO_LISTENER_CONN(conn);
|
|
listener_conn->dns_server_port =
|
|
tor_evdns_add_server_port(conn->s, 0, evdns_server_callback,
|
|
listener_conn);
|
|
}
|
|
|
|
/** Free the evdns server port for <b>conn</b>, which must be an
|
|
* AP_DNS_LISTENER. */
|
|
void
|
|
dnsserv_close_listener(connection_t *conn)
|
|
{
|
|
listener_connection_t *listener_conn;
|
|
tor_assert(conn);
|
|
tor_assert(conn->type == CONN_TYPE_AP_DNS_LISTENER);
|
|
|
|
listener_conn = TO_LISTENER_CONN(conn);
|
|
|
|
if (listener_conn->dns_server_port) {
|
|
evdns_close_server_port(listener_conn->dns_server_port);
|
|
listener_conn->dns_server_port = NULL;
|
|
}
|
|
}
|
|
|