aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-07-23 22:03:33 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-07-27 10:00:45 +0200
commit52e6e915fbc5f019a6aec3afa3c88a415777d830 (patch)
tree9df0cbe305ca7f94c005513da9ae6e4256fc24a2 /src/or
parentb0cd4551abb1105542b366e6cd23cfa2fb1003ce (diff)
downloadtor-52e6e915fbc5f019a6aec3afa3c88a415777d830.tar
tor-52e6e915fbc5f019a6aec3afa3c88a415777d830.tar.gz
Create rendmid.h
Diffstat (limited to 'src/or')
-rw-r--r--src/or/or.h10
-rw-r--r--src/or/rendcommon.c1
-rw-r--r--src/or/rendmid.c1
-rw-r--r--src/or/rendmid.h25
4 files changed, 27 insertions, 10 deletions
diff --git a/src/or/or.h b/src/or/or.h
index d3539c756..3e7fe2310 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3432,16 +3432,6 @@ typedef struct rend_cache_entry_t {
rend_service_descriptor_t *parsed; /**< Parsed value of 'desc' */
} rend_cache_entry_t;
-/********************************* rendmid.c *******************************/
-int rend_mid_establish_intro(or_circuit_t *circ, const char *request,
- size_t request_len);
-int rend_mid_introduce(or_circuit_t *circ, const char *request,
- size_t request_len);
-int rend_mid_establish_rendezvous(or_circuit_t *circ, const char *request,
- size_t request_len);
-int rend_mid_rendezvous(or_circuit_t *circ, const char *request,
- size_t request_len);
-
/********************************* routerlist.c ***************************/
/** Represents information about a single trusted directory server. */
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index a8862ae44..fc43f11bb 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -13,6 +13,7 @@
#include "config.h"
#include "rendclient.h"
#include "rendcommon.h"
+#include "rendmid.h"
#include "rendservice.h"
#include "routerlist.h"
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 393347b6d..48cb10f52 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -11,6 +11,7 @@
#include "circuitlist.h"
#include "config.h"
#include "relay.h"
+#include "rendmid.h"
/** Respond to an ESTABLISH_INTRO cell by checking the signed data and
* setting the circuit's purpose and service pk digest.
diff --git a/src/or/rendmid.h b/src/or/rendmid.h
new file mode 100644
index 000000000..92df878fe
--- /dev/null
+++ b/src/or/rendmid.h
@@ -0,0 +1,25 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file geoip.h
+ * \brief Header file for geoip functions
+ **/
+
+#ifndef _TOR_GEOIP_H
+#define _TOR_GEOIP_H
+
+int rend_mid_establish_intro(or_circuit_t *circ, const char *request,
+ size_t request_len);
+int rend_mid_introduce(or_circuit_t *circ, const char *request,
+ size_t request_len);
+int rend_mid_establish_rendezvous(or_circuit_t *circ, const char *request,
+ size_t request_len);
+int rend_mid_rendezvous(or_circuit_t *circ, const char *request,
+ size_t request_len);
+
+#endif
+