diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-10-28 08:47:57 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-10-28 08:47:57 -0400 |
| commit | b98631d28082fd17a7568d693ebe97b4986fce56 (patch) | |
| tree | 55b32b992e1e6fcf9883d40c0653994be227b709 /src/feature/control | |
| parent | 25d66a33911df8561765b58b08d691b4afd36344 (diff) | |
| parent | bc4b9d7df48106cb4cba4c3a288510038d7faea3 (diff) | |
| download | tor-b98631d28082fd17a7568d693ebe97b4986fce56.tar.gz tor-b98631d28082fd17a7568d693ebe97b4986fce56.zip | |
Merge branch 'tor-github/pr/1476'
Diffstat (limited to 'src/feature/control')
| -rw-r--r-- | src/feature/control/control_connection_st.h | 5 | ||||
| -rw-r--r-- | src/feature/control/fmt_serverstatus.c | 5 | ||||
| -rw-r--r-- | src/feature/control/getinfo_geoip.c | 9 | ||||
| -rw-r--r-- | src/feature/control/getinfo_geoip.h | 5 |
4 files changed, 24 insertions, 0 deletions
diff --git a/src/feature/control/control_connection_st.h b/src/feature/control/control_connection_st.h index c9164f03b3..8ecce5ee69 100644 --- a/src/feature/control/control_connection_st.h +++ b/src/feature/control/control_connection_st.h @@ -4,6 +4,11 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * @file control_connection_st.h + * @brief Controller connection structure. + **/ + #ifndef CONTROL_CONNECTION_ST_H #define CONTROL_CONNECTION_ST_H diff --git a/src/feature/control/fmt_serverstatus.c b/src/feature/control/fmt_serverstatus.c index 33c5ba1336..92db70758f 100644 --- a/src/feature/control/fmt_serverstatus.c +++ b/src/feature/control/fmt_serverstatus.c @@ -3,6 +3,11 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * @file fmt_serverstatus.c + * @brief Format relay info for a controller. + **/ + #include "core/or/or.h" #include "feature/control/fmt_serverstatus.h" diff --git a/src/feature/control/getinfo_geoip.c b/src/feature/control/getinfo_geoip.c index d188725fa3..4636ede039 100644 --- a/src/feature/control/getinfo_geoip.c +++ b/src/feature/control/getinfo_geoip.c @@ -1,3 +1,12 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file getinfo_geoip.c + * @brief GEOIP-related contoller GETINFO commands. + **/ #include "core/or/or.h" #include "core/mainloop/connection.h" diff --git a/src/feature/control/getinfo_geoip.h b/src/feature/control/getinfo_geoip.h index 94759d0d18..f6bc86cb53 100644 --- a/src/feature/control/getinfo_geoip.h +++ b/src/feature/control/getinfo_geoip.h @@ -4,6 +4,11 @@ * Copyright (c) 2007-2019, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * @file getinfo_geoip.h + * @brief Header for getinfo_geoip.c + **/ + #ifndef TOR_GETINFO_GEOIP_H #define TOR_GETINFO_GEOIP_H |