This time SOCKS5 on the correct branch

Author: Devristo

Socks5Connection.cpp

@@ -81,6 +81,7 @@ void Socks5Connection::tryUdpAssociateRequest(struct bufferevent * bev){
 
 	bufferevent_write(bev, static_cast<const void *>(mem), 10);
 	this->setCurrentState(UdpRequestSent);
+	printf("SOCKS5 UDP request sent\n");
 }
 
 void Socks5Connection::setBindAddress(Address address){
@@ -159,7 +160,7 @@ int Socks5Connection::tryReadUdpAssociateResponse(struct bufferevent * bev){
 		this->setBindAddress(bind_address);
 		this->setCurrentState(UdpAssociated);
 
-		printf("Socks5 UDP proxy ready at %s:%d\n", bind_address.ipstr(), bind_address.port());
+		printf("Socks5 UDP proxy ready at %s:%d\n", bind_address.ipstr().c_str(), bind_address.port());
 		this->working_ = true;
 
 //		this->setUDPsocket(AF_INET, SOCK_DGRAM, 0)
@@ -247,14 +248,14 @@ int Socks5Connection::unwrapDatagram(Address & addr, struct evbuffer * evb){
 	addr.set_ipv4(header.address.ipv4());
 	addr.set_port(header.address.port());
 
-	return sizeof(UdpEncapsulationHeader);
+	return udpHeaderRead;
 }
 
 /**
  * Called by libevent when there is data to read.
  */
 void Socks5Connection::buffered_on_read(struct bufferevent *bev, void *cbarg) {
-
+	printf("Got SOCKS5 data\n");
 	Socks5Connection *s5 = static_cast<Socks5Connection *>(cbarg);
 
 	switch(s5->getCurrentState()){
@@ -285,7 +286,7 @@ void Socks5Connection::buffered_on_event(struct bufferevent *bev, short int what
 	// Sock5 server closed the connection!
 	if((what & BEV_EVENT_EOF) ==  BEV_EVENT_EOF){
 		Socks5Connection * s5 = static_cast<Socks5Connection *> (cbarg);
-		s5->setCurrentState(Closed);
+		//s5->setCurrentState(Closed);
 	}
 
 	// Sock5 server closed the connection!
@@ -311,6 +312,7 @@ Socks5Connection::Socks5Connection(): Operational(true){
 }
 
 void Socks5Connection::open(struct event_base *evbase, Address socks5_server){
+	printf("Opening Sock5 tunnel to %s:%d \n", socks5_server.ipstr().c_str(), socks5_server.port());
 	working_ = false;
 
 	struct bufferevent *bev;
@@ -321,14 +323,25 @@ void Socks5Connection::open(struct event_base *evbase, Address socks5_server){
 	bufferevent_setcb(bev, buffered_on_read, buffered_on_write, buffered_on_event, this);
 	bufferevent_enable(bev, EV_READ|EV_WRITE);
 
-	if(bufferevent_socket_connect(bev, (struct sockaddr*)&(socks5_server.addr), addrlen))
-		errorOut("Cannot connect!");
-
+	if(bufferevent_socket_connect(bev, (struct sockaddr*)&(socks5_server.addr), addrlen)){
+		printf("Cannot connect to SOCKS5 proxy at %s\n",socks5_server.ipstr(true).c_str());
+		bufferevent_free(bev);
 
-	sendHandshake(bev);
-	this->setCurrentState(HandshakeSent);
+	    return;
+	} else {
+		sendHandshake(bev);
+		this->setCurrentState(HandshakeSent);
+		printf("SOCKS5 handshake sent");
+	}
 }
 
+Socks5Connection::~Socks5Connection(){
+  if(this->isOpen()){
+    bufferevent_free(bev);
+    this->state = Closed;
+  }
+ }
+
 bool Socks5Connection::isOpen(){
 	return this->getCurrentState() == 4;
 }

Socks5Connection.h

@@ -30,6 +30,8 @@ enum Socks5ConnectionState {
 class Socks5Connection : public Operational{
 public:
 	Socks5Connection();
+	~Socks5Connection();
+
 	void open(struct event_base *evbase, Address socks5_server);
 	bool isOpen();
 
@@ -56,6 +58,7 @@ class Socks5Connection : public Operational{
 	Socks5ConnectionState state;
 	void sendHandshake(struct bufferevent *bev);
 	Address bind_address;
+	struct bufferevent * bev;
 };
 
 typedef Socks5Connection   Socks5Connection;

channel.cpp

@@ -313,6 +313,8 @@ int Channel::SendTo (evutil_socket_t sock, const Address& addr, struct evbuffer
 	if(Channel::socks5_connection.isOpen()){
 		lengthLoss = Channel::socks5_connection.prependHeader(addr, evb);
 		destination = Channel::socks5_connection.getBindAddress();
+	} else if(Channel::socks5_connection.getBindAddress() != Address()){
+		printf("ERROR: Sending to %s:%d WITHOUT socks5\n", destination.ipstr(false).c_str(), destination.port());
 	}
 
     int length = evbuffer_get_length(evb);
@@ -367,15 +369,20 @@ int Channel::RecvFrom (evutil_socket_t sock, Address& addr, struct evbuffer *evb
     global_dgrams_down++;
 
 	// If there is a SOCKS5 connection set we need to unwrap the packet!
-    if(Channel::socks5_connection.isOpen() && addr == Channel::socks5_connection.getBindAddress()){
+    if(addr == Channel::socks5_connection.getBindAddress()){
     	int result = Channel::socks5_connection.unwrapDatagram(addr, evb);
 
-    	printf("Got SOCKS5 packet from %s:%d via proxy at %s:%d\n", addr.ipstr(), addr.port(), Channel::socks5_connection.getBindAddress().ipstr(), Channel::socks5_connection.getBindAddress().port());
+    	// printf("Got SOCKS5 packet from %s:%d via proxy at %s:%d\n", addr.ipstr().c_str(), addr.port(), Channel::socks5_connection.getBindAddress().ipstr().c_str(), Channel::socks5_connection.getBindAddress().port());
 
     	if(result > -1){
     		length -= result;
 
+    //        printf("Got %d byte packet from %s:%d via SOCKS5 proxy at %s:%d\n", length, addr.ipv4str(), addr.port(), socks5_connection.getBindAddress().ipv4str(), socks5_connection.getBindAddress().port());
+    	} else{
+    		printf("Got corrupted SOCKS5 packet from %s:%d\n", socks5_connection.getBindAddress().ipstr(false).c_str(), socks5_connection.getBindAddress().port());
     	}
+	} else if(Channel::socks5_connection.getBindAddress() != Address()){
+          printf("Got %d bytes NON SOCKS5 from %s:%d\n", length, addr.ipstr(false).c_str(), addr.port());
     }
 
     global_raw_bytes_down+=length;

hashtree.h

@@ -46,7 +46,7 @@ struct Sha1Hash {
 // for values up to 8192. Above that you'll have to edit the
 // SWIFT_MAX_SEND_DGRAM_SIZE in swift.h
 //
-#define SWIFT_DEFAULT_CHUNK_SIZE 1024
+#define SWIFT_DEFAULT_CHUNK_SIZE 6144
 
 
 class Storage;

swift.cpp

@@ -185,7 +185,7 @@ int utf8main (int argc, char** argv)
 	Address socks5Address;
 
     int c,n;
-    while ( -1 != (c = getopt_long (argc, argv, ":h:f:d:l:t:D:pg:s:c:o:u:y:z:wBNHmM:e:r:ji:kC:1:2:3:T:G", long_options, 0)) ) {
+    while ( -1 != (c = getopt_long (argc, argv, ":h:f:d:l:t:S:D:pg:s:c:o:u:y:z:wBNHmM:e:r:ji:kC:1:2:3:T:G", long_options, 0)) ) {
         switch (c) {
             case 'h':
                 if (strlen(optarg)!=40)
@@ -197,7 +197,6 @@ int utf8main (int argc, char** argv)
 			case 'S':
 				socks5Address = Address(optarg);
 				Channel::socks5_connection.open(Channel::evbase, socks5Address);
-				printf("Opening Sock5 tunnel to %s:%d \n", socks5Address.ipstr(), socks5Address.port());
 				fflush(stdout); // For testing
 				break;
             case 'f':

swift.h

@@ -659,9 +659,6 @@ namespace swift {
         static tint     epoch, start;
         static uint64_t global_dgrams_up, global_dgrams_down, global_raw_bytes_up, global_raw_bytes_down, global_bytes_up, global_bytes_down;
         static void 	CloseChannelByAddress(const Address &addr);
-
-		friend void     SetSocks5Connection(const Socks5Connection& tracker);
-		void    SetSocks5Connection(const Socks5Connection& tracker);
 
         // SOCKMGMT
         // Arno: channel is also a "singleton" class that manages all sockets
@@ -1142,6 +1139,7 @@ namespace swift {
     /** Set the default tracker that is used when Open is not passed a tracker
         address. */
     void    SetTracker( const Address& tracker);
+    void    SetSocks5Connection(const Socks5Connection& tracker);
     /** Returns size of the file in bytes, 0 if unknown. Might be rounded up
         to a kilobyte before the transmission is complete. */
     uint64_t Size( int td);