[or-cvs] [tor/master 33/40] Create rendmid.h

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Fri, 23 Jul 2010 22:03:33 +0200
Subject: Create rendmid.h
Commit: 52e6e915fbc5f019a6aec3afa3c88a415777d830

---
 src/or/or.h         |   10 ----------
 src/or/rendcommon.c |    1 +
 src/or/rendmid.c    |    1 +
 src/or/rendmid.h    |   25 +++++++++++++++++++++++++
 4 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 src/or/rendmid.h

diff --git a/src/or/or.h b/src/or/or.h
index d3539c7..3e7fe23 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 a8862ae..fc43f11 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 393347b..48cb10f 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 0000000..92df878
--- /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
+
-- 
1.7.1