[or-cvs] Backport END_STREAM_REASON_TORPROTOCOL handling.

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv22565/src/or

Modified Files:
      Tag: tor-0_0_9-patches
	or.h relay.c 
Log Message:
Backport END_STREAM_REASON_TORPROTOCOL handling.

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.508.2.14
retrieving revision 1.508.2.15
diff -u -d -r1.508.2.14 -r1.508.2.15
--- or.h	1 Mar 2005 22:13:04 -0000	1.508.2.14
+++ or.h	1 Mar 2005 22:43:41 -0000	1.508.2.15
@@ -403,6 +403,7 @@
 #define END_STREAM_REASON_INTERNAL 10
 #define END_STREAM_REASON_RESOURCELIMIT 11
 #define END_STREAM_REASON_CONNRESET 12
+#define END_STREAM_REASON_TORPROTOCOL 13
 
 #define RESOLVED_TYPE_IPV4 4
 #define RESOLVED_TYPE_IPV6 6

Index: relay.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -u -d -r1.32.2.1 -r1.32.2.2
--- relay.c	1 Mar 2005 22:13:04 -0000	1.32.2.1
+++ relay.c	1 Mar 2005 22:43:41 -0000	1.32.2.2
@@ -472,6 +472,7 @@
     case END_STREAM_REASON_INTERNAL:       return "internal error at server";
     case END_STREAM_REASON_RESOURCELIMIT:  return "server out of resources";
     case END_STREAM_REASON_CONNRESET:      return "connection reset";
+    case END_STREAM_REASON_TORPROTOCOL:    return "Tor protocol error";
     default:
       log_fn(LOG_WARN,"Reason for ending (%d) not recognized.",*payload);
       return "unknown";