mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-23 06:24:59 +02:00
118d8ffdcb
Instead of answering GETINFO requests about our geoip usage only after running for 24 hours, this patch makes us answer GETINFO requests immediately. We still round and quantize as before. Implements bug2711. Also, refactor the heck out of the bridge usage formatting code. No longer should we need to do a generate-parse-and-regenerate cycle to get the controller string, and that lets us simplify the code a lot.
58 lines
2.0 KiB
C
58 lines
2.0 KiB
C
/* Copyright (c) 2001 Matej Pfajfar.
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
|
* Copyright (c) 2007-2011, The Tor Project, Inc. */
|
|
/* See LICENSE for licensing information */
|
|
|
|
/**
|
|
* \file geoip.h
|
|
* \brief Header file for geoip.c.
|
|
**/
|
|
|
|
#ifndef _TOR_GEOIP_H
|
|
#define _TOR_GEOIP_H
|
|
|
|
#ifdef GEOIP_PRIVATE
|
|
int geoip_parse_entry(const char *line);
|
|
#endif
|
|
int should_record_bridge_info(or_options_t *options);
|
|
int geoip_load_file(const char *filename, or_options_t *options);
|
|
int geoip_get_country_by_ip(uint32_t ipaddr);
|
|
int geoip_get_n_countries(void);
|
|
const char *geoip_get_country_name(country_t num);
|
|
int geoip_is_loaded(void);
|
|
country_t geoip_get_country(const char *countrycode);
|
|
|
|
void geoip_note_client_seen(geoip_client_action_t action,
|
|
uint32_t addr, time_t now);
|
|
void geoip_remove_old_clients(time_t cutoff);
|
|
|
|
void geoip_note_ns_response(geoip_client_action_t action,
|
|
geoip_ns_response_t response);
|
|
char *geoip_get_client_history(geoip_client_action_t action);
|
|
char *geoip_get_request_history(geoip_client_action_t action);
|
|
int getinfo_helper_geoip(control_connection_t *control_conn,
|
|
const char *question, char **answer,
|
|
const char **errmsg);
|
|
void geoip_free_all(void);
|
|
|
|
void geoip_start_dirreq(uint64_t dirreq_id, size_t response_size,
|
|
geoip_client_action_t action, dirreq_type_t type);
|
|
void geoip_change_dirreq_state(uint64_t dirreq_id, dirreq_type_t type,
|
|
dirreq_state_t new_state);
|
|
|
|
void geoip_dirreq_stats_init(time_t now);
|
|
time_t geoip_dirreq_stats_write(time_t now);
|
|
void geoip_dirreq_stats_term(void);
|
|
void geoip_entry_stats_init(time_t now);
|
|
time_t geoip_entry_stats_write(time_t now);
|
|
void geoip_entry_stats_term(void);
|
|
void geoip_bridge_stats_init(time_t now);
|
|
time_t geoip_bridge_stats_write(time_t now);
|
|
void geoip_bridge_stats_term(void);
|
|
const char *geoip_get_bridge_stats_extrainfo(time_t);
|
|
char *geoip_get_bridge_stats_controller(time_t);
|
|
|
|
#endif
|
|
|