Initial hacking for proposal 186.

This code handles the new ORPort options, and incidentally makes all
remaining port types use the new port configuration systems.

There are some rough edges!  It doesn't do well in the case where your
Address says one thing but you say to Advertise another ORPort.  It
doesn't handle AllAddrs.  It doesn't actually advertise anything besides
the first listed advertised IPv4 ORPort and DirPort.  It doesn't do
port forwarding to them either.

It's not tested either, it needs more documentation, and it probably
forgets to put the milk back in the refrigerator.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/or/config.h b/src/or/config.h
index e1fc5cfe9a..a202bffa50 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -64,7 +64,12 @@ or_state_t *get_or_state(void);
 int did_last_state_file_write_fail(void);
 int or_state_save(time_t now);
 
-const smartlist_t *get_configured_client_ports(void);
+const smartlist_t *get_configured_ports(void);
+int get_first_advertised_v4_port_by_type(int listener_type);
+#define get_primary_or_port() \
+  (get_first_advertised_v4_port_by_type(CONN_TYPE_OR_LISTENER))
+#define get_primary_dir_port() \
+  (get_first_advertised_v4_port_by_type(CONN_TYPE_DIR_LISTENER))
 
 int options_need_geoip_info(const or_options_t *options,
                             const char **reason_out);