From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sun, 7 Dec 2014 13:47:09 +0000 (+0200)
Subject: Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
X-Git-Tag: tor-0.2.6.2-alpha~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c239eccc973042cbaec16fd48a457f44aeafc24;p=thirdparty%2Ftor.git

Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
---

diff --git a/changes/bug13840 b/changes/bug13840
new file mode 100644
index 0000000000..a7204e4a9c
--- /dev/null
+++ b/changes/bug13840
@@ -0,0 +1,3 @@
+  o Code simplifications and refactoring:
+    - In connection_exit_begin_conn(), use END_CIRC_REASON_TORPROTOCOL
+      constant instead of hardcoded value. Fixes issue 13840.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 14b391180e..9ace375d74 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2461,7 +2461,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
 
   relay_header_unpack(&rh, cell->payload);
   if (rh.length > RELAY_PAYLOAD_SIZE)
-    return -1;
+    return -END_CIRC_REASON_TORPROTOCOL;
 
   /* Note: we have to use relay_send_command_from_edge here, not
    * connection_edge_end or connection_edge_send_command, since those require
@@ -2479,7 +2479,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
 
   r = begin_cell_parse(cell, &bcell, &end_reason);
   if (r < -1) {
-    return -1;
+    return -END_CIRC_REASON_TORPROTOCOL;
   } else if (r == -1) {
     tor_free(bcell.address);
     relay_send_end_cell_from_edge(rh.stream_id, circ, end_reason, NULL);