aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-15 17:49:18 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-15 17:52:40 -0400
commit959f850056f5f6a7ebbe7ec0e56da239e4f7de3e (patch)
tree2646e6357706c283db3d3890d68965768fb6b78c /src/or/config.h
parent91b52a259a271df7ceeea6d8bf7adbd4d7e15a6c (diff)
downloadtor-959f850056f5f6a7ebbe7ec0e56da239e4f7de3e.tar
tor-959f850056f5f6a7ebbe7ec0e56da239e4f7de3e.tar.gz
Raise the part of torrc mapaddress handling that knows wildcards
This patch extracts the inner part of config_register_addressmaps -- the part that knows about detecting wildcard addresses addresses -- and makes it into a new function. The new function is deliberately not moved or reindented, so that the diff is smaller. I need this to fix bug 6244.
Diffstat (limited to 'src/or/config.h')
-rw-r--r--src/or/config.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/config.h b/src/or/config.h
index ce7e31974..48f4e8630 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -96,6 +96,12 @@ or_options_t *options_new(void);
#endif
void config_register_addressmaps(const or_options_t *options);
+/* XXXX024 move to connection_edge.h */
+int addressmap_register_auto(const char *from, const char *to,
+ time_t expires,
+ addressmap_entry_source_t addrmap_source,
+ const char **msg);
+
#endif