[or-cvs] synchronize to the version i"ve been giving people to test

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.seul.org:/home/arma/work/onion/cvs/src/or

Modified Files:
	connection_ap.c onion.c or.h 
Log Message:
synchronize to the version i've been giving people to test


Index: connection_ap.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_ap.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- connection_ap.c	17 Sep 2002 08:14:37 -0000	1.11
+++ connection_ap.c	19 Sep 2002 20:13:27 -0000	1.12
@@ -48,8 +48,11 @@
     conn->ss_received = sizeof(ss_t);
     log(LOG_DEBUG,"ap_handshake_process_ss(): Successfully read ss.");
 
-    if ((conn->ss.version == 0) || (conn->ss.version != VERSION)) { /* unsupported version */
-      log(LOG_DEBUG,"ap_handshake_process_ss(): ss: Unsupported version.");
+    if ((conn->ss.version == 0) || (conn->ss.version != OR_VERSION)) { /* unsupported version */
+      log(LOG_NOTICE,"ap_handshake_process_ss(): ss: Unsupported version '%c'.",conn->ss.version);
+      if(tolower(conn->ss.version) == 'g') {
+        log(LOG_NOTICE,"ap_handshake_process_ss(): are you using the onion proxy as a web proxy?");
+      }
       return -1;
     }
     if (conn->ss.addr_fmt != SS_ADDR_FMT_ASCII_HOST_PORT) { /* unrecognized address format */

Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- onion.c	4 Sep 2002 06:29:28 -0000	1.14
+++ onion.c	19 Sep 2002 20:13:27 -0000	1.15
@@ -221,7 +221,7 @@
       /* 0 bit */
       layer->zero = 0;
       /* version */
-      layer->version = VERSION;
+      layer->version = OR_VERSION;
       /* Back F + Forw F both use DES OFB*/
       layer->backf = ONION_DEFAULT_CIPHER;
       layer->forwf = ONION_DEFAULT_CIPHER;

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- or.h	17 Sep 2002 08:14:37 -0000	1.21
+++ or.h	19 Sep 2002 20:13:27 -0000	1.22
@@ -6,7 +6,6 @@
 #define __OR_H
 
 #include "orconfig.h"
-#undef VERSION
 
 #include <stdio.h>
 #include <stdlib.h>