Merge tag 'upstream/1.0.0'

Upstream version 1.0.0

1 files changed, 4 insertions, 2 deletions

diff --git a/src/bitz/worker.h b/src/bitz/worker.h
index 69edbca..25b7bac 100644
--- a/src/bitz/worker.h
+++ b/src/bitz/worker.h
@@ -20,7 +20,7 @@
 #ifndef BITZ_WORKER_H
 #define BITZ_WORKER_H
 
-#include <socket/socket.h>
+#include <psocksxx/tcpnsockstream.h>
 
 #include "common.h"
 
@@ -32,12 +32,14 @@ namespace bitz {
 		Worker();
 		virtual ~Worker();
 
-		virtual void run( socketlibrary::TCPServerSocket * server_sock, unsigned int max_requests ) throw();
+		virtual void run( psocksxx::tcpnsockstream * server_sock,
+				unsigned int max_requests, unsigned int comm_timeout = 0 ) throw();
 
 	private:
 		req_handlers_t    _req_handlers;
 
 		virtual void load_req_handlers() throw();
+		virtual unsigned int serve_client( psocksxx::nsockstream * client_sock, unsigned int max_requests ) throw();
 
 	};