diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/version.h | 9 | ||||
| -rw-r--r-- | src/config/oprc | 2 | ||||
| -rw-r--r-- | src/httpap/httpap.c | 6 | ||||
| -rw-r--r-- | src/or/connection_ap.c | 7 | ||||
| -rw-r--r-- | src/or/onion.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 1 | ||||
| -rw-r--r-- | src/smtpap/smtpap.c | 6 |
7 files changed, 21 insertions, 12 deletions
diff --git a/src/common/version.h b/src/common/version.h index fa9b87e34c..ee541b6e01 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -8,8 +8,11 @@ /* * Changes : * $Log$ - * Revision 1.1 2002/06/26 22:45:50 arma - * Initial revision + * Revision 1.2 2002/09/19 20:13:23 arma + * synchronize to the version i've been giving people to test + * + * Revision 1.1.1.1 2002/06/26 22:45:50 arma + * initial commit: current code * * Revision 1.3 2002/04/02 14:27:11 badbytes * Final finishes. @@ -23,6 +26,6 @@ */ #ifndef __VERSION_H -#define VERSION 2 +#define OR_VERSION 2 #define __VERSION_H #endif diff --git a/src/config/oprc b/src/config/oprc index a913420465..a078e2d67c 100644 --- a/src/config/oprc +++ b/src/config/oprc @@ -1,7 +1,7 @@ # Configuration file for or # List of routers -RouterFile ../config/routers.or +RouterFile ../config/routers.op # Private key #PrivateKeyFile moria1-private diff --git a/src/httpap/httpap.c b/src/httpap/httpap.c index 8aa515e621..5aeb5cb718 100644 --- a/src/httpap/httpap.c +++ b/src/httpap/httpap.c @@ -8,6 +8,9 @@ /* * Changes : * $Log$ + * Revision 1.10 2002/09/19 20:13:27 arma + * synchronize to the version i've been giving people to test + * * Revision 1.9 2002/09/10 13:32:27 nickm * "You got BSD in my MacOS!" "You got MacOS in my BSD!" Anyway, MacOS works again. * @@ -57,7 +60,6 @@ */ #include "orconfig.h" -#undef VERSION #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> @@ -259,7 +261,7 @@ int handle_connection(int new_sock, struct hostent *local, struct sockaddr_in re } /* create a standard structure */ - ss.version = VERSION; + ss.version = OR_VERSION; ss.protocol = SS_PROTOCOL_HTTP; ss.retry_count = 0; ss.addr_fmt = SS_ADDR_FMT_ASCII_HOST_PORT; diff --git a/src/or/connection_ap.c b/src/or/connection_ap.c index 732af7b067..50b4438d84 100644 --- a/src/or/connection_ap.c +++ b/src/or/connection_ap.c @@ -48,8 +48,11 @@ int ap_handshake_process_ss(connection_t *conn) { 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 */ diff --git a/src/or/onion.c b/src/or/onion.c index 996d56a5cd..52b785bb09 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -221,7 +221,7 @@ unsigned char *create_onion(routerinfo_t **rarray, int rarray_len, unsigned int /* 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; diff --git a/src/or/or.h b/src/or/or.h index e1b7f8fd37..2c2b63166e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -6,7 +6,6 @@ #define __OR_H #include "orconfig.h" -#undef VERSION #include <stdio.h> #include <stdlib.h> diff --git a/src/smtpap/smtpap.c b/src/smtpap/smtpap.c index 2bb8e5acb4..0f0a65bc3e 100644 --- a/src/smtpap/smtpap.c +++ b/src/smtpap/smtpap.c @@ -8,6 +8,9 @@ /* * Changes : * $Log$ + * Revision 1.7 2002/09/19 20:13:27 arma + * synchronize to the version i've been giving people to test + * * Revision 1.6 2002/09/10 13:32:27 nickm * "You got BSD in my MacOS!" "You got MacOS in my BSD!" Anyway, MacOS works again. * @@ -126,7 +129,6 @@ */ #include "orconfig.h" -#undef VERSION #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> @@ -749,7 +751,7 @@ int handle_connection(int s, struct hostent *local, struct sockaddr_in remote, u else { /* fill in the standard structure */ - ss.version = VERSION; + ss.version = OR_VERSION; ss.protocol= SS_PROTOCOL_SMTP; ss.retry_count = 0; ss.addr_fmt = SS_ADDR_FMT_ASCII_HOST_PORT; |