nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

conn->socks_version is obsolete

Browse Source 
svn:r787
This commit is contained in:
Roger Dingledine 2003-11-11 04:13:37 +00:00
parent 2a3479af5f
commit 84884a79c0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/connection_edge.c
View File

@ -528,7 +528,6 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
log_fn(LOG_DEBUG,"entered."); log_fn(LOG_DEBUG,"entered.");
sockshere = fetch_from_buf_socks(conn->inbuf, socks); sockshere = fetch_from_buf_socks(conn->inbuf, socks);
conn->socks_version = socks->socks_version;
if(sockshere == -1 || sockshere == 0) { if(sockshere == -1 || sockshere == 0) {
if(socks->replylen) { /* we should send reply back */ if(socks->replylen) { /* we should send reply back */
log_fn(LOG_DEBUG,"reply is already set for us. Using it."); log_fn(LOG_DEBUG,"reply is already set for us. Using it.");
@ -638,7 +637,8 @@ static int connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
connection_write_to_buf(reply, replylen, conn); connection_write_to_buf(reply, replylen, conn);
return flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen); /* try to flush it */ return flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen); /* try to flush it */
} }
if(conn->socks_version == 4) { assert(conn->socks_request);
if(conn->socks_request->socks_version == 4) {
memset(buf,0,SOCKS4_NETWORK_LEN); memset(buf,0,SOCKS4_NETWORK_LEN);
#define SOCKS4_GRANTED 90 #define SOCKS4_GRANTED 90
#define SOCKS4_REJECT 91 #define SOCKS4_REJECT 91
@ -647,7 +647,7 @@ static int connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, conn); connection_write_to_buf(buf, SOCKS4_NETWORK_LEN, conn);
return flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen); /* try to flush it */ return flush_buf(conn->s, conn->outbuf, &conn->outbuf_flushlen); /* try to flush it */
} }
if(conn->socks_version == 5) { if(conn->socks_request->socks_version == 5) {
buf[0] = 5; /* version 5 */ buf[0] = 5; /* version 5 */
#define SOCKS5_SUCCESS 0 #define SOCKS5_SUCCESS 0
#define SOCKS5_GENERIC_ERROR 1 #define SOCKS5_GENERIC_ERROR 1

1
src/or/or.h
View File

@ -317,7 +317,6 @@ struct connection_t {
and check in circuit_about_to_close_connection() */ and check in circuit_about_to_close_connection() */
/* Used only by AP connections */ /* Used only by AP connections */
char socks_version;
socks_request_t *socks_request; socks_request_t *socks_request;
}; };