Add support for knowing multiple HTTP DirPorts for an authority.

(These aren't yet set or used.)

1 files changed, 29 insertions, 0 deletions

diff --git a/src/feature/nodelist/dirlist.h b/src/feature/nodelist/dirlist.h
index ae3debf4e5..70bbb780d1 100644
--- a/src/feature/nodelist/dirlist.h
+++ b/src/feature/nodelist/dirlist.h
@@ -11,6 +11,28 @@
 #ifndef TOR_DIRLIST_H
 #define TOR_DIRLIST_H
 
+typedef struct auth_dirport_t auth_dirport_t;
+/**
+ * Different usages for an authority's HTTP directory port.
+ *
+ * Historically, only legacy ports existed; proposal 330 added multiple types
+ * of dirport to better enable authorities to offload work and resist DoS
+ * attacks.
+ **/
+typedef enum auth_dirport_usage_t {
+  /** Flag for an authority's dirport that is intended for misc/legacy
+   * usage. May be used when no other dirport is available. */
+  AUTH_USAGE_LEGACY,
+  /** Flag for an authority's dirport that is intended for descriptor uploads
+   * only. */
+  AUTH_USAGE_UPLOAD,
+  /** Flag for an authority's dirport that is intended for voting only */
+  AUTH_USAGE_VOTING,
+  /** Flag for an authority's dirport that is intended for relay downloads
+   * only. */
+  AUTH_USAGE_DOWNLOAD,
+} auth_dirport_usage_t;
+
 int get_n_authorities(dirinfo_type_t type);
 const smartlist_t *router_get_trusted_dir_servers(void);
 const smartlist_t *router_get_fallback_dir_servers(void);
@@ -28,6 +50,10 @@ MOCK_DECL(dir_server_t *, trusteddirserver_get_by_v3_auth_digest,
 MOCK_DECL(int, router_digest_is_trusted_dir_type,
         (const char *digest, dirinfo_type_t type));
 
+const tor_addr_port_t *trusted_dir_server_get_dirport(const dir_server_t *ds,
+                                                  auth_dirport_usage_t usage,
+                                                  int addr_family);
+
 bool router_addr_is_trusted_dir_type(const tor_addr_t *addr,
                                      dirinfo_type_t type);
 #define router_addr_is_trusted_dir(d) \
@@ -41,6 +67,9 @@ dir_server_t *trusted_dir_server_new(const char *nickname, const char *address,
                        const tor_addr_port_t *addrport_ipv6,
                        const char *digest, const char *v3_auth_digest,
                        dirinfo_type_t type, double weight);
+void trusted_dir_server_add_dirport(dir_server_t *ds,
+                                    auth_dirport_usage_t usage,
+                                    const tor_addr_port_t *dirport);
 dir_server_t *fallback_dir_server_new(const tor_addr_t *addr,
                                       uint16_t dir_port, uint16_t or_port,
                                       const tor_addr_port_t *addrport_ipv6,