[or-cvs] [tor/master 31/40] Create reasons.h

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Fri, 23 Jul 2010 21:08:30 +0200
Subject: Create reasons.h
Commit: cc060ea220128e55bbef3990239d20a6bb604d44

---
 src/or/buffers.c         |    1 +
 src/or/connection.c      |    1 +
 src/or/connection_edge.c |    1 +
 src/or/connection_or.c   |    1 +
 src/or/control.c         |    1 +
 src/or/or.h              |   15 ---------------
 src/or/reasons.c         |    1 +
 src/or/reasons.h         |   29 +++++++++++++++++++++++++++++
 src/or/relay.c           |    1 +
 9 files changed, 36 insertions(+), 15 deletions(-)
 create mode 100644 src/or/reasons.h

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 20e4d20..3ba2760 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -17,6 +17,7 @@
 #include "connection_edge.h"
 #include "connection_or.h"
 #include "control.h"
+#include "reasons.h"
 #include "../common/util.h"
 #include "../common/torlog.h"
 #ifdef HAVE_UNISTD_H
diff --git a/src/or/connection.c b/src/or/connection.c
index e4d158a..c58eb9c 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -28,6 +28,7 @@
 #include "geoip.h"
 #include "main.h"
 #include "policies.h"
+#include "reasons.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "router.h"
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index ebc9ec5..bf0fe7b 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -24,6 +24,7 @@
 #include "hibernate.h"
 #include "main.h"
 #include "policies.h"
+#include "reasons.h"
 #include "rendclient.h"
 #include "rendcommon.h"
 #include "rendservice.h"
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 8ec5290..c4db543 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -22,6 +22,7 @@
 #include "geoip.h"
 #include "main.h"
 #include "networkstatus.h"
+#include "reasons.h"
 #include "router.h"
 #include "routerlist.h"
 
diff --git a/src/or/control.c b/src/or/control.c
index 1853048..ffcbcfd 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -27,6 +27,7 @@
 #include "main.h"
 #include "networkstatus.h"
 #include "policies.h"
+#include "reasons.h"
 #include "router.h"
 #include "routerlist.h"
 
diff --git a/src/or/or.h b/src/or/or.h
index 2f2c300..3823e31 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3309,21 +3309,6 @@ typedef enum {
   ADDR_POLICY_PROBABLY_REJECTED=2
 } addr_policy_result_t;
 
-/********************************* reasons.c ***************************/
-
-const char *stream_end_reason_to_control_string(int reason);
-const char *stream_end_reason_to_string(int reason);
-socks5_reply_status_t stream_end_reason_to_socks5_response(int reason);
-uint8_t errno_to_stream_end_reason(int e);
-
-const char *orconn_end_reason_to_control_string(int r);
-int tls_error_to_orconn_end_reason(int e);
-int errno_to_orconn_end_reason(int e);
-
-const char *circuit_end_reason_to_control_string(int reason);
-const char *socks4_response_code_to_string(uint8_t code);
-const char *socks5_response_code_to_string(uint8_t code);
-
 /********************************* relay.c ***************************/
 
 extern uint64_t stats_n_relay_cells_relayed;
diff --git a/src/or/reasons.c b/src/or/reasons.c
index 569e253..2dd5fe9 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -10,6 +10,7 @@
 
 #include "or.h"
 #include "config.h"
+#include "reasons.h"
 
 /***************************** Edge (stream) reasons **********************/
 
diff --git a/src/or/reasons.h b/src/or/reasons.h
new file mode 100644
index 0000000..08e9c00
--- /dev/null
+++ b/src/or/reasons.h
@@ -0,0 +1,29 @@
+/* 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 reasons.h
+ * \brief Header file for reasons.c
+ **/
+
+#ifndef _TOR_REASONS_H
+#define _TOR_REASONS_H
+
+const char *stream_end_reason_to_control_string(int reason);
+const char *stream_end_reason_to_string(int reason);
+socks5_reply_status_t stream_end_reason_to_socks5_response(int reason);
+uint8_t errno_to_stream_end_reason(int e);
+
+const char *orconn_end_reason_to_control_string(int r);
+int tls_error_to_orconn_end_reason(int e);
+int errno_to_orconn_end_reason(int e);
+
+const char *circuit_end_reason_to_control_string(int reason);
+const char *socks4_response_code_to_string(uint8_t code);
+const char *socks5_response_code_to_string(uint8_t code);
+
+#endif
+
diff --git a/src/or/relay.c b/src/or/relay.c
index f0801bf..9fd7573 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -25,6 +25,7 @@
 #include "mempool.h"
 #include "networkstatus.h"
 #include "policies.h"
+#include "reasons.h"
 #include "rendcommon.h"
 #include "routerlist.h"
 
-- 
1.7.1