[or-cvs] r16651: {tor} get rid of some magic constants i found while walking jake t (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-08-25 03:06:55 -0400 (Mon, 25 Aug 2008)
New Revision: 16651

Modified:
   tor/trunk/src/or/connection_edge.c
Log:
get rid of some magic constants i found while walking
jake through socks4 and socks5 failure codes


Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2008-08-25 06:21:34 UTC (rev 16650)
+++ tor/trunk/src/or/connection_edge.c	2008-08-25 07:06:55 UTC (rev 16651)
@@ -28,6 +28,9 @@
 #define TRANS_PF
 #endif
 
+#define SOCKS4_GRANTED          90
+#define SOCKS4_REJECT           91
+
 /** List of exit_redirect_t for every configured RedirectExit. */
 static smartlist_t *redirect_exit_list = NULL;
 
@@ -2298,12 +2301,12 @@
   if (conn->socks_request->socks_version == 4) {
     buf[0] = 0x00; /* version */
     if (answer_type == RESOLVED_TYPE_IPV4 && answer_len == 4) {
-      buf[1] = 90; /* "Granted" */
+      buf[1] = SOCKS4_GRANTED;
       set_uint16(buf+2, 0);
       memcpy(buf+4, answer, 4); /* address */
       replylen = SOCKS4_NETWORK_LEN;
-    } else {
-      buf[1] = 91; /* "error" */
+    } else { /* "error" */
+      buf[1] = SOCKS4_REJECT;
       memset(buf+2, 0, 6);
       replylen = SOCKS4_NETWORK_LEN;
     }
@@ -2382,8 +2385,6 @@
   }
   if (conn->socks_request->socks_version == 4) {
     memset(buf,0,SOCKS4_NETWORK_LEN);
-#define SOCKS4_GRANTED          90
-#define SOCKS4_REJECT           91
     buf[1] = (status==SOCKS5_SUCCEEDED ? SOCKS4_GRANTED : SOCKS4_REJECT);
     /* leave version, destport, destip zero */
     connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, TO_CONN(conn));