Browse Source

Create reasons.h

Sebastian Hahn 14 years ago
parent
commit
cc060ea220
9 changed files with 36 additions and 15 deletions
  1. 1 0
      src/or/buffers.c
  2. 1 0
      src/or/connection.c
  3. 1 0
      src/or/connection_edge.c
  4. 1 0
      src/or/connection_or.c
  5. 1 0
      src/or/control.c
  6. 0 15
      src/or/or.h
  7. 1 0
      src/or/reasons.c
  8. 29 0
      src/or/reasons.h
  9. 1 0
      src/or/relay.c

+ 1 - 0
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

+ 1 - 0
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"

+ 1 - 0
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"

+ 1 - 0
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"
 

+ 1 - 0
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"
 

+ 0 - 15
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;

+ 1 - 0
src/or/reasons.c

@@ -10,6 +10,7 @@
 
 #include "or.h"
 #include "config.h"
+#include "reasons.h"
 
 /***************************** Edge (stream) reasons **********************/
 

+ 29 - 0
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
+

+ 1 - 0
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"