diff --git a/slsReceiverSoftware/include/genericSocket.h b/slsReceiverSoftware/include/genericSocket.h
index fd196f8cc..504439e74 100644
--- a/slsReceiverSoftware/include/genericSocket.h
+++ b/slsReceiverSoftware/include/genericSocket.h
@@ -18,7 +18,7 @@
   defined private variables char hostname[1000] and int portno to store connection informations;
 
   defined public functions  int getHostname(char *name) and  int getPortNumber() to retrieve connection informations
-  
+
   added public function int getErrorStatus() returning 1 if socketDescriptor<0
 
   remove exits in the constructors and replace them with socketDescriptor=-1
@@ -26,7 +26,7 @@
   replaced the argument of send/receive data with void (to avoid too much casting or compiler errors/warnings)
 
   added a function which really does not close the socket between send/receive (senddataonly, receivedataonly)
-*/
+ */
 
 #include "ansi.h"
 
@@ -71,765 +71,765 @@ using namespace std;
 
 class genericSocket{
 
- public:
+public:
 
-  /** 
-     Communication protocol 
-*/
-enum communicationProtocol{
-  TCP,  /**< TCP/IP */
-  UDP /**< UDP */
-};
+	/**  Communication protocol	 */
+	enum communicationProtocol{
+		TCP,  	/**< TCP/IP */
+		UDP 	/**< UDP */
+	};
+
+	/**
+	 * The constructor for a client
+	 * @param host_ip_or_name hostname or ip of the client
+	 * @param port_number port number to connect to
+	 * @param p TCP or UDP
+	 * @param ps a single packet size
+	 */
+	genericSocket(const char* const host_ip_or_name,
+			unsigned short int const port_number,
+			communicationProtocol p, int ps = DEFAULT_PACKET_SIZE) :
+				portno(port_number),
+				protocol(p),
+				is_a_server(0),
+				socketDescriptor(-1),
+				file_des(-1),
+				packet_size(ps),
+				nsending(0),
+				nsent(0),
+				total_sent(0),// sender (client): where to? ip
+				header_packet_size(0),
+				actual_udp_socket_buffer_size(0) {
+		memset(&serverAddress, 0, sizeof(serverAddress));
+		memset(&clientAddress, 0, sizeof(clientAddress));
+		memset(lastClientIP,0,INET_ADDRSTRLEN);
+		memset(thisClientIP,0,INET_ADDRSTRLEN);
+		memset(dummyClientIP,0,INET_ADDRSTRLEN);
+		differentClients = 0;
+
+		struct addrinfo *result;
+		if (!ConvertHostnameToInternetAddress(host_ip_or_name, &result)) {
+			serverAddress.sin_family = result->ai_family;
+			memcpy((char *) &serverAddress.sin_addr.s_addr,
+					&((struct sockaddr_in *) result->ai_addr)->sin_addr, sizeof(in_addr_t));
+			freeaddrinfo(result);
+			serverAddress.sin_port = htons(port_number);
+			socketDescriptor=0;
+		}
+		clientAddress_length=sizeof(clientAddress);
+	};
+
+	/**
+	 * The constructor for a server
+	 * throws an exception if
+	 * @param port_number port number to connect to
+	 * @param p TCP or UDP
+	 * @param ps a single packet size
+	 * @param eth interface name or IP address to listen to (if NULL, listen to all interfaces)
+	 */
+	genericSocket(unsigned short int const port_number, communicationProtocol p,
+			int ps = DEFAULT_PACKET_SIZE, const char *eth=NULL, int hsize=0,
+			uint32_t buf_size=SOCKET_BUFFER_SIZE):
+				portno(port_number),
+				protocol(p),
+				is_a_server(1),
+				socketDescriptor(-1),
+				file_des(-1),
+				packet_size(ps),
+				nsending(0),
+				nsent(0),
+				total_sent(0),
+				header_packet_size(hsize),
+				actual_udp_socket_buffer_size(0) {
 
 
+		memset(&serverAddress, 0, sizeof(serverAddress));
+		memset(&clientAddress, 0, sizeof(clientAddress));
+		memset(lastClientIP,0,INET_ADDRSTRLEN);
+		memset(thisClientIP,0,INET_ADDRSTRLEN);
+		memset(dummyClientIP,0,INET_ADDRSTRLEN);
+		differentClients = 0;
 
- genericSocket(const char* const host_ip_or_name, unsigned short int const port_number,
-         communicationProtocol p, int ps = DEFAULT_PACKET_SIZE) :
-     portno(port_number),
-	 protocol(p),
-	 is_a_server(0),
-	 socketDescriptor(-1),
-	 file_des(-1),
-	 packet_size(ps),
-	 nsending(0),
-	 nsent(0),
-	 total_sent(0),// sender (client): where to? ip
-	 header_packet_size(0),
-	 actual_udp_socket_buffer_size(0)
-   { 
-	 memset(&serverAddress, 0, sizeof(serverAddress));
-	 memset(&clientAddress, 0, sizeof(clientAddress));
-	 memset(lastClientIP,0,INET_ADDRSTRLEN);
-	 memset(thisClientIP,0,INET_ADDRSTRLEN);
-	 memset(dummyClientIP,0,INET_ADDRSTRLEN);
-	 differentClients = 0;
+		// same port
+		if(serverAddress.sin_port == htons(port_number)){
+			socketDescriptor = -10;
+			return;
+		}
 
-	 struct addrinfo *result;
-	 if (!ConvertHostnameToInternetAddress(host_ip_or_name, &result)) {
-		 serverAddress.sin_family = result->ai_family;
-		 memcpy((char *) &serverAddress.sin_addr.s_addr, &((struct sockaddr_in *) result->ai_addr)->sin_addr, sizeof(in_addr_t));
-		 freeaddrinfo(result);
-		 serverAddress.sin_port = htons(port_number);
-		 socketDescriptor=0;
-	 }
-	 clientAddress_length=sizeof(clientAddress);
-   }
+		char ip[20];
 
-   
-   int getProtocol(communicationProtocol p) {
-     switch (p) {
-     case TCP:
-       return SOCK_STREAM;
-       break;
-     case UDP:
-       return SOCK_DGRAM;
-       
-     default: 
-         cprintf(RED, "unknown protocol %d\n", p);
-       return -1;
-     }
-   }
-   
-   int getProtocol() {return getProtocol(protocol);};
-   
+		strcpy(ip,"0.0.0.0");
+		clientAddress_length=sizeof(clientAddress);
+		if (eth) {
+			strcpy(ip,nameToIp(string(eth)).c_str());
+			if (string(ip)==string("0.0.0.0"))
+				strcpy(ip,eth);
+		}
+
+		socketDescriptor = socket(AF_INET, getProtocol(),0); //tcp
+
+		if (socketDescriptor < 0) {
+			cprintf(RED, "Can not create socket\n");
+			return;
+		}
+
+		// Set some fields in the serverAddress structure.
+		serverAddress.sin_family = AF_INET;
+		serverAddress.sin_port = htons(port_number);
+		serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
 
 
-
-  /** 
-      The constructor for a server
-      @short the contructor for a server
-      \param port_number port number to listen to
-      \param p TCP or UDP
-      \param eth interface name or IP address to listen to (if NULL, listen to all interfaces)
-
-  */
-  
-   genericSocket(unsigned short int const port_number, communicationProtocol p,
-           int ps = DEFAULT_PACKET_SIZE, const char *eth=NULL, int hsize=0,
-           uint32_t buf_size=SOCKET_BUFFER_SIZE):
-     portno(port_number),
-     protocol(p),
-     is_a_server(1),
-     socketDescriptor(-1),
-     file_des(-1),
-     packet_size(ps),
-	 nsending(0),
-	 nsent(0),
-	 total_sent(0),
-	 header_packet_size(hsize),
-	 actual_udp_socket_buffer_size(0)
-   {
+		if (string(ip)!=string("0.0.0.0")) {
+			if (inet_pton(AF_INET, ip, &(serverAddress.sin_addr)));
+			else
+				serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
+		}
 
 
-	  memset(&serverAddress, 0, sizeof(serverAddress));
-	  memset(&clientAddress, 0, sizeof(clientAddress));
+		// reuse port
+		{
+			int val=1;
+			if (setsockopt(socketDescriptor,SOL_SOCKET,SO_REUSEADDR,
+					&val,sizeof(int)) == -1) {
+				cprintf(RED, "setsockopt REUSEADDR failed\n");
+				socketDescriptor=-1;
+				return;
+			}
+		}
 
-/* // you can specify an IP address: */
-/* // or you can let it automatically select one: */
-/* myaddr.sin_addr.s_addr = INADDR_ANY; */
-		 memset(lastClientIP,0,INET_ADDRSTRLEN);
-		 memset(thisClientIP,0,INET_ADDRSTRLEN);
-		 memset(dummyClientIP,0,INET_ADDRSTRLEN);
-		 differentClients = 0;
+		//increase buffer size if its udp
+		if (p == UDP) {
+			uint32_t desired_size = buf_size;
+			uint32_t real_size = desired_size * 2; // kernel doubles this value for bookkeeping overhead
+			uint32_t ret_size = -1;
+			socklen_t optlen = sizeof(int);
 
-
-
-	 if(serverAddress.sin_port == htons(port_number)){
-		 socketDescriptor = -10;
-		 return;
-	 }
-
-     char ip[20];
-
-     strcpy(ip,"0.0.0.0");
-     clientAddress_length=sizeof(clientAddress);
-     if (eth) {
-       strcpy(ip,nameToIp(string(eth)).c_str());
-       if (string(ip)==string("0.0.0.0"))
-	 strcpy(ip,eth);
-     }
-    
-     // strcpy(hostname,"localhost"); //needed?!?!?!?
-    
-
-     socketDescriptor = socket(AF_INET, getProtocol(),0); //tcp
-
-     if (socketDescriptor < 0) {
-         cprintf(RED, "Can not create socket\n");
-       return;
-     } 
-     
-     // Set some fields in the serverAddress structure.  
-     serverAddress.sin_family = AF_INET;
-     serverAddress.sin_port = htons(port_number);
-     serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
-     
-
-     if (string(ip)!=string("0.0.0.0")) {
-       if (inet_pton(AF_INET, ip, &(serverAddress.sin_addr)));
-       else
-	 serverAddress.sin_addr.s_addr = htonl(INADDR_ANY);
-     }
-
-
-     // reuse port
-     {
-         int val=1;
-         if (setsockopt(socketDescriptor,SOL_SOCKET,SO_REUSEADDR,&val,sizeof(int)) == -1) {
-             cprintf(RED, "setsockopt REUSEADDR failed\n");
-             socketDescriptor=-1;
-             return;
-         }
-     }
-
-     //increase buffer size if its udp
-     if (p == UDP) {
-         uint32_t desired_size = buf_size;
-         uint32_t real_size = desired_size * 2; // kernel doubles this value for bookkeeping overhead
-         uint32_t ret_size = -1;
-         socklen_t optlen = sizeof(int);
-
-        // confirm if sufficient
-         if (getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen) == -1) {
-             FILE_LOG(logWARNING) << "[Port " << port_number << "] Could not get rx socket receive buffer size";
-         } else if (ret_size >= real_size) {
-             actual_udp_socket_buffer_size = ret_size;
+			// confirm if sufficient
+			if (getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen) == -1) {
+				FILE_LOG(logWARNING) << "[Port " << port_number << "] "
+						"Could not get rx socket receive buffer size";
+			} else if (ret_size >= real_size) {
+				actual_udp_socket_buffer_size = ret_size;
 #ifdef VEBOSE
-         FILE_LOG(logINFO) << "[Port " << port_number << "] UDP rx socket buffer size is sufficient (" << ret_size << ")";
+				FILE_LOG(logINFO) << "[Port " << port_number << "] "
+						"UDP rx socket buffer size is sufficient (" << ret_size << ")";
 #endif
-         }
+			}
 
-         // not sufficient, enhance size
-         else {
-             // set buffer size (could not set)
-             if (setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &desired_size, optlen) == -1) {
-                 FILE_LOG(logWARNING) << "[Port " << port_number << "] Could not set rx socket buffer size to "
-                         << desired_size << ". (No Root Privileges?)";
-             }
-             // confirm size
-             else if (getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen) == -1) {
-                 FILE_LOG(logWARNING) << "[Port " << port_number << "] Could not get rx socket buffer size";
-             }
-             else if (ret_size >= real_size) {
-                 actual_udp_socket_buffer_size = ret_size;
-                 FILE_LOG(logINFO) << "[Port " << port_number << "] UDP rx socket buffer size modified to " << ret_size;
-             }
-             // buffer size too large
-             else {
-                 actual_udp_socket_buffer_size = ret_size;
-                 // force a value larger than system limit (if run in a privileged context (capability CAP_NET_ADMIN set))
-                 int ret = setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUFFORCE, &desired_size, optlen);
-                 getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF, &ret_size, &optlen);
-                 if (ret == -1) {
-                     FILE_LOG(logWARNING) << "[Port " << port_number << "] "
-                             "Could not force rx socket buffer size to "
-                             << desired_size << ".\n  Real size: " << ret_size <<
-                             ". (No Root Privileges?)\n"
-                             "  To remove this warning: set rx_udpsocksize from client to <= " <<
-                             (ret_size/2) << " (Real size:" << ret_size << ").";
-                 } else {
-                     FILE_LOG(logINFO) << "[Port " << port_number << "] UDP rx socket buffer size modified to " << ret_size;
-                 }
-             }
-         }
-     }
+			// not sufficient, enhance size
+			else {
+				// set buffer size (could not set)
+				if (setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF,
+						&desired_size, optlen) == -1) {
+					FILE_LOG(logWARNING) << "[Port " << port_number << "] "
+							"Could not set rx socket buffer size to "
+							<< desired_size << ". (No Root Privileges?)";
+				}
+				// confirm size
+				else if (getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF,
+						&ret_size, &optlen) == -1) {
+					FILE_LOG(logWARNING) << "[Port " << port_number << "] "
+							"Could not get rx socket buffer size";
+				}
+				else if (ret_size >= real_size) {
+					actual_udp_socket_buffer_size = ret_size;
+					FILE_LOG(logINFO) << "[Port " << port_number << "] "
+							"UDP rx socket buffer size modified to " << ret_size;
+				}
+				// buffer size too large
+				else {
+					actual_udp_socket_buffer_size = ret_size;
+					// force a value larger than system limit
+					// (if run in a privileged context (capability CAP_NET_ADMIN set))
+					int ret = setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUFFORCE,
+							&desired_size, optlen);
+					getsockopt(socketDescriptor, SOL_SOCKET, SO_RCVBUF,
+							&ret_size, &optlen);
+					if (ret == -1) {
+						FILE_LOG(logWARNING) << "[Port " << port_number << "] "
+								"Could not force rx socket buffer size to "
+								<< desired_size << ".\n  Real size: " << ret_size <<
+								". (No Root Privileges?)\n"
+								"  To remove this warning: set rx_udpsocksize from client to <= " <<
+								(ret_size/2) << " (Real size:" << ret_size << ").";
+					} else {
+						FILE_LOG(logINFO) << "[Port " << port_number << "] "
+								"UDP rx socket buffer size modified to " << ret_size;
+					}
+				}
+			}
+		}
 
 
-     if(bind(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
-         cprintf(RED, "Can not bind socket\n");
-       socketDescriptor=-1;
-       return;
-     }
+		if(bind(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
+			cprintf(RED, "Can not bind socket\n");
+			socketDescriptor=-1;
+			return;
+		}
 
 
-     if (getProtocol()==SOCK_STREAM)
-       listen(socketDescriptor, DEFAULT_BACKLOG); 
+		if (getProtocol()==SOCK_STREAM)
+			listen(socketDescriptor, DEFAULT_BACKLOG);
 
-   }
-  
+	}
 
+	/**
+	 * The destructor: disconnects and close the socket
+	 */
+	~genericSocket() {
+		Disconnect();
+		CloseServerTCPSocketDescriptor();
+		serverAddress.sin_port=-1;
+	};
 
+	/**
+	 * Returns actual udp socket buffer size/2.
+	 * Halving is because of kernel book keeping
+	 * @returns actual udp socket buffer size/2
+	 */
+	int getActualUDPSocketBufferSize(){return actual_udp_socket_buffer_size;};
 
-   /**
-    * Returns actual udp socket buffer size/2.
-    * Halving is because of kernel book keeping
-    */
-   int getActualUDPSocketBufferSize(){
-       return actual_udp_socket_buffer_size;
-   }
+	/**
+	 * Get protocol TCP or UDP
+-    * @returns TCP or UDP
+	 */
+	int getCommunicationProtocol(){return protocol;};
 
+	/**
+	 * Get port number
+	 * @retrns port number
+	 */
+	uint16_t getPortNumber(){return ntohs(serverAddress.sin_port);}
 
+	/**
+	 * Get TCP Server File Descriptor
+	 * @returns TCP Server file descriptor
+	 */
+	int getFileDes(){return file_des;};
 
+	/**
+	 * Get socket descriptor
+	 * @returns socket descriptor
+	 */
+	int getsocketDescriptor(){return socketDescriptor;};
 
+	/**
+	 * Get total bytes sent/received
+	 * Makes sense only for udp socket as there is only receive data
+	 */
+	int getCurrentTotalReceived(){return total_sent;};
 
+	/**
+	 * Get type of protocol based on protocol
+	 * @param p TCP or UDP
+	 * @returns SOCK_STREAM/SOCK_DGRAM or -1
+	 */
+	int getProtocol(communicationProtocol p) {
+		switch (p) {
+		case TCP:
+			return SOCK_STREAM;
+			break;
+		case UDP:
+			return SOCK_DGRAM;
+		default:
+			cprintf(RED, "unknown protocol %d\n", p);
+			return -1;
+		}
+	};
 
+	/**
+	 * Get current protocol type
+	 * @returns SOCK_STREAM/SOCK_DGRAM or -1
+	 */
+	int getProtocol() {return getProtocol(protocol);};
 
-     /** 
-	 The destructor: disconnects and close the socket
-	 @short the destructor 
-	 
+    /**
+     * Get error status
+     * @returns 1 if error
      */
-     ~genericSocket(){				\
-       Disconnect();
-       if (socketDescriptor >= 0){		\
-	 close(socketDescriptor);		\
-       }					\
-       if(is_a_server and getProtocol() == TCP){\
-    	   if(file_des>0)\
-    		   close(file_des);\
-       }
-	   file_des=-1;				\
-       serverAddress.sin_port=-1;	\
-     };
-     
+     int getErrorStatus(){if (socketDescriptor==-10) return -10;
+     else if (socketDescriptor<0) return 1; else return 0;};
 
-/*      /\** @short if client returns hostname for connection */
-/* 	 \param name string to write the hostname to */
-/* 	 \returns 0 if client, 1 if server (in this case ignore name return value) */
+	/**
+	 * Close TCP Server socket descriptor
+	 */
+	void CloseServerTCPSocketDescriptor() {
+		if (getProtocol() == TCP && is_a_server) {
+			if (socketDescriptor >= 0) {
+				close(socketDescriptor);
+				socketDescriptor = -1;
+			}
+		}
+	};
 
-/*      *\/ */
-/*      int getHostname(char *name){ */
-/*        if (is_a_server==0) { */
-/* 	 strcpy(name,getHostname().c_str()); */
-/*        } */
-/*        return is_a_server; */
-/*      }; */
-/*       /\** @short if client returns hostname for connection */
-/* 	 \returns hostname */
+	/**
+	 * Disconnect
+	 */
+	void Disconnect(){
+		if (protocol == TCP && is_a_server) {
+			if (file_des >= 0) {
+				close(file_des);
+				file_des = -1;
+			}
+			return;
+		}
+		if (socketDescriptor >= 0) {
+			close(socketDescriptor);
+			socketDescriptor = -1;
+		}
+	};
 
-/*       *\/ */
-/*      string getHostname(){return string(hostname);}; */
+	/**
+	 * Establishes connection
+	 * @returns 1 if error
+	 */
+	int  Connect(){
 
-/*      /\** @short returns port number for connection */
-/* 	 \returns port number */
-/*      *\/ */
-/*      int getPortNumber(){return portno;}; */
+		if(file_des>0) return file_des;
+		if (protocol==UDP) return -1;
 
-    /** @short returns communication protocol
-	 \returns TCP or UDP
-     */
-     int getCommunicationProtocol(){return protocol;};
-
-
-    /** @short returns error status
-	 \returns 1 if error
-     */
-     int getErrorStatus(){if (socketDescriptor==-10) return -10; else if (socketDescriptor<0) return 1; else return 0;};
-     
-
- /** @short etablishes connection; disconnect should always follow
-	 \returns 1 if error
-     */
-     int  Connect(){
-
-     if(file_des>0) return file_des;
-       if (protocol==UDP) return -1;
-
-     if(is_a_server && protocol==TCP){ //server tcp; the server will wait for the clients connection
-    	 if (socketDescriptor>0) {
-    		 if ((file_des = accept(socketDescriptor,(struct sockaddr *) &clientAddress, &clientAddress_length)) < 0) {
-    		     cprintf(RED, "Error: with server accept, connection refused\n");
-    			 switch(errno) {
-    			 case EWOULDBLOCK:
-    				 printf("ewouldblock eagain\n");
-    				 break;
-    			 case EBADF:
-    				 printf("ebadf\n");
-    				 break;
-    			 case ECONNABORTED:
-    				 printf("econnaborted\n");
-    				 break;
-    			 case EFAULT:
-    				 printf("efault\n");
-    				 break;
-    			 case EINTR:
-    				 printf("eintr\n");
-    				 break;
-    			 case EINVAL:
-    				 printf("einval\n");
-    				 break;
-    			 case EMFILE:
-    				 printf("emfile\n");
-    				 break;
-    			 case ENFILE:
-    				 printf("enfile\n");
-    				 break;
-    			 case ENOTSOCK:
-    				 printf("enotsock\n");
-    				 break;
-    			 case EOPNOTSUPP:
-    				 printf("eOPNOTSUPP\n");
-    				 break;
-    			 case ENOBUFS:
-    				 printf("ENOBUFS\n");
-    				 break;
-    			 case ENOMEM:
-    				 printf("ENOMEM\n");
-    				 break;
-    			 case ENOSR:
-    				 printf("ENOSR\n");
-    				 break;
-    			 case EPROTO:
-    				 printf("EPROTO\n");
-    				 break;
-    			 default:
-    				 printf("unknown error\n");
-    			 }
-    			 socketDescriptor=-1;
-    		 }
-    		 else{
-    			 inet_ntop(AF_INET, &(clientAddress.sin_addr), dummyClientIP, INET_ADDRSTRLEN);
+		if(is_a_server && protocol==TCP){ //server tcp; the server will wait for the clients connection
+			if (socketDescriptor>0) {
+				if ((file_des = accept(socketDescriptor,(struct sockaddr *) &clientAddress, &clientAddress_length)) < 0) {
+					cprintf(RED, "Error: with server accept, connection refused\n");
+					switch(errno) {
+					case EWOULDBLOCK:
+						printf("ewouldblock eagain\n");
+						break;
+					case EBADF:
+						printf("ebadf\n");
+						break;
+					case ECONNABORTED:
+						printf("econnaborted\n");
+						break;
+					case EFAULT:
+						printf("efault\n");
+						break;
+					case EINTR:
+						printf("eintr\n");
+						break;
+					case EINVAL:
+						printf("einval\n");
+						break;
+					case EMFILE:
+						printf("emfile\n");
+						break;
+					case ENFILE:
+						printf("enfile\n");
+						break;
+					case ENOTSOCK:
+						printf("enotsock\n");
+						break;
+					case EOPNOTSUPP:
+						printf("eOPNOTSUPP\n");
+						break;
+					case ENOBUFS:
+						printf("ENOBUFS\n");
+						break;
+					case ENOMEM:
+						printf("ENOMEM\n");
+						break;
+					case ENOSR:
+						printf("ENOSR\n");
+						break;
+					case EPROTO:
+						printf("EPROTO\n");
+						break;
+					default:
+						printf("unknown error\n");
+					}
+				}
+				else{
+					inet_ntop(AF_INET, &(clientAddress.sin_addr), dummyClientIP, INET_ADDRSTRLEN);
 #ifdef VERY_VERBOSE
-    			 cout << "client connected "<< file_des << endl;
+					cout << "client connected "<< file_des << endl;
 #endif
-
-    		 }
-
-    	 }
-    	 // file_des = socketDescriptor;
-
+				}
+			}
 #ifdef VERY_VERBOSE
-    	 cout << "fd " << file_des  << endl;
+			cout << "fd " << file_des  << endl;
 #endif
-     } else {
-    	 if (socketDescriptor<=0)
-    		 socketDescriptor = socket(AF_INET, getProtocol(),0);
-    	 //    SetTimeOut(10);
-    	 if (socketDescriptor < 0){
-    	     cprintf(RED, "Can not create socket\n");
-    		 file_des = socketDescriptor;
-    	 } else {
-    		 if(connect(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
-    		     cprintf(RED, "Can not connect to socket\n");
-    			 file_des = -1;
-    		 } else{
-    			 file_des = socketDescriptor;
-    		 }
-    	 }
+			return file_des;
+		} else {
+			if (socketDescriptor<=0)
+				socketDescriptor = socket(AF_INET, getProtocol(),0);
+			//    SetTimeOut(10);
+			if (socketDescriptor < 0){
+				cprintf(RED, "Can not create socket\n");
+			} else {
+				if(connect(socketDescriptor,(struct sockaddr *) &serverAddress,sizeof(serverAddress))<0){
+					cprintf(RED, "Can not connect to socket\n");
+					return -1;
+				}
+			}
+			return socketDescriptor;
+		}
+	};
 
-     }
-     return file_des;
-     }
+	/**
+	 * Exit server
+	 */
+	void exitServer(){
+		Disconnect();
+		CloseServerTCPSocketDescriptor();
+	};
 
-     uint16_t getPortNumber(){
-    	 return ntohs(serverAddress.sin_port);
-     }
+	/**
+	 * Shut down socket
+	 */
+	void ShutDownSocket(){
+		shutdown(socketDescriptor, SHUT_RDWR);
+		Disconnect();
+	};
 
-     int getFileDes(){return file_des;};
+	/**
+	 * Set the socket timeout ts is in seconds
+	 * @param ts time in seconds
+	 * @returns 0 for success, else -1
+	 */
+	int SetTimeOut(int ts){
+		if (ts<=0)
+			return -1;
 
-     int getsocketDescriptor(){return socketDescriptor;};
+		struct timeval tout;
+		tout.tv_sec  = 0;
+		tout.tv_usec = 0;
+		if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVTIMEO,
+				&tout, sizeof(struct timeval)) <0) {
+			cprintf(RED, "Error in setsockopt SO_RCVTIMEO %d\n", 0);
+		}
+		tout.tv_sec  = ts;
+		tout.tv_usec = 0;
+		if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_SNDTIMEO,
+				&tout, sizeof(struct timeval)) < 0)	{
+			cprintf(RED, "Error in setsockopt SO_SNDTIMEO %d\n", ts);
+		}
+		return 0;
+	};
 
+	/**
+	 * Set packet size
+	 * @param i packet size
+	 * @returns current packet size
+	 */
+	int setPacketSize(int i=-1) { if (i>=0) packet_size=i;return packet_size;};
 
-     void exitServer(){
-    	 if(is_a_server){
-    		  if (socketDescriptor>=0){
-    		    close(socketDescriptor);
-    		    socketDescriptor = -1;
-    		  }
-    	 }
-     }
+	/**
+	 * Convert IP to hostname
+	 * @param ip IP
+	 * @returns hostname
+	 */
+	static string ipToName(string ip) {
+		struct ifaddrs *addrs, *iap;
+		struct sockaddr_in *sa;
 
-     /** @short free connection */
-     void Disconnect(){
-    	 if (protocol==UDP){
-    		 close(socketDescriptor);
-    		 socketDescriptor=-1;
-    	 }
-    	 else{
-    		 if(file_des>=0){ //then was open
-    			 if(is_a_server){
-    				 close(file_des);
-    			 }
-    			 else {
-    				 //while(!shutdown(socketDescriptor, SHUT_RDWR));
-    				 close(socketDescriptor);
-    				 socketDescriptor=-1;
-    			 }
-    			 file_des=-1;
-    		 }
-    	 }
-     }; 
+		char buf[32];
+		const int buf_len = sizeof(buf);
+		memset(buf,0,buf_len);
+		strcpy(buf,"none");
 
+		getifaddrs(&addrs);
+		for (iap = addrs; iap != NULL; iap = iap->ifa_next) {
+			if (iap->ifa_addr && (iap->ifa_flags & IFF_UP) && iap->ifa_addr->sa_family == AF_INET) {
+				sa = (struct sockaddr_in *)(iap->ifa_addr);
+				inet_ntop(iap->ifa_addr->sa_family, (void *)&(sa->sin_addr), buf, buf_len);
+				if (ip==string(buf)) {
+					//printf("%s\n", iap->ifa_name);
+					strcpy(buf,iap->ifa_name);
+					break;
+				}
+			}
+		}
+		freeifaddrs(addrs);
+		return string(buf);
+	};
 
-     void ShutDownSocket(){
-    	 shutdown(socketDescriptor, SHUT_RDWR);
-    	 Disconnect();
-     };
+	/**
+	 * Convert interface to mac address
+	 * @param inf interface
+	 * @returns mac address
+	 */
+	static string nameToMac(string inf) {
+		struct ifreq ifr;
+		int sock, j, k;
+		char mac[32];
+		const int mac_len = sizeof(mac);
+		memset(mac,0,mac_len);
 
+		sock=getSock(inf,&ifr);
 
+		if (-1==ioctl(sock, SIOCGIFHWADDR, &ifr)) {
+			perror("ioctl(SIOCGIFHWADDR) ");
+			return string("00:00:00:00:00:00");
+		}
+		for (j=0, k=0; j<6; j++) {
+			k+=snprintf(mac+k, mac_len-k-1, j ? ":%02X" : "%02X",
+					(int)(unsigned int)(unsigned char)ifr.ifr_hwaddr.sa_data[j]);
+		}
+		mac[mac_len-1]='\0';
 
-     /** Set the socket timeout ts is in seconds */
-     int SetTimeOut(int ts){
+		if(sock!=1){
+			close(sock);
+		}
+		return string(mac);
 
+	};
 
-       if (ts<=0)
-	 return -1;
-       
-       struct timeval tout;
-       tout.tv_sec  = 0;
-       tout.tv_usec = 0;
-       if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_RCVTIMEO, &tout, sizeof(struct timeval)) <0)
-	 {
-           cprintf(RED, "Error in setsockopt SO_RCVTIMEO %d\n", 0);
-	 }
-       tout.tv_sec  = ts;
-       tout.tv_usec = 0;
-       if(::setsockopt(socketDescriptor, SOL_SOCKET, SO_SNDTIMEO, &tout, sizeof(struct timeval)) < 0)
-	 {
-           cprintf(RED, "Error in setsockopt SO_SNDTIMEO %d\n", ts);
-	 }
-       return 0;
-       
+	/**
+	 * Convert hostname to ip
+	 * @param inf hostname
+	 * @returns IP
+	 */
+	static string nameToIp(string inf){
+		struct ifreq ifr;
+		int sock;
+		char *p, addr[32];
+		const int addr_len = sizeof(addr);
+		memset(addr,0,addr_len);
 
-     };
+		sock=getSock(inf,&ifr);
 
-   
-     int setPacketSize(int i=-1) { if (i>=0) packet_size=i;return packet_size;};
+		if (-1==ioctl(sock, SIOCGIFADDR, &ifr)) {
+			perror("ioctl(SIOCGIFADDR) ");
+			return string("0.0.0.0");
+		}
+		p=inet_ntoa(((struct sockaddr_in *)(&ifr.ifr_addr))->sin_addr);
+		strncpy(addr,p,addr_len-1);
+		addr[addr_len-1]='\0';
 
-  
+		if(sock!=1){
+			close(sock);
+		}
+		return string(addr);
 
-     static string ipToName(string ip) {
-       struct ifaddrs *addrs, *iap;
-       struct sockaddr_in *sa;
+	};
 
-       char buf[32];
-       const int buf_len = sizeof(buf);
-       memset(buf,0,buf_len);
-       strcpy(buf,"none");
+	/**
+	 * Get socket
+	 * @param inf hostname
+	 * @param ifr interface request structure
+	 * @returns sock
+	 */
+	static int getSock(string inf, struct ifreq *ifr) {
 
-       getifaddrs(&addrs);
-       for (iap = addrs; iap != NULL; iap = iap->ifa_next) {
-	 if (iap->ifa_addr && (iap->ifa_flags & IFF_UP) && iap->ifa_addr->sa_family == AF_INET) {
-	   sa = (struct sockaddr_in *)(iap->ifa_addr);
-	   inet_ntop(iap->ifa_addr->sa_family, (void *)&(sa->sin_addr), buf, buf_len);
-	   if (ip==string(buf)) {
-	     //printf("%s\n", iap->ifa_name);
-	     strcpy(buf,iap->ifa_name);
-	     break;
-	   }
-	 }
-       }
-       freeifaddrs(addrs);
-       return string(buf);
-     };
-     
-     static string nameToMac(string inf) {
-       struct ifreq ifr;
-       int sock, j, k;
-       char mac[32];
-       const int mac_len = sizeof(mac);
-       memset(mac,0,mac_len);
-       
-       sock=getSock(inf,&ifr);
-       
-       if (-1==ioctl(sock, SIOCGIFHWADDR, &ifr)) {
-	 perror("ioctl(SIOCGIFHWADDR) ");
-	 return string("00:00:00:00:00:00");
-       }
-       for (j=0, k=0; j<6; j++) {
-	 k+=snprintf(mac+k, mac_len-k-1, j ? ":%02X" : "%02X",
-		     (int)(unsigned int)(unsigned char)ifr.ifr_hwaddr.sa_data[j]);
-       }
-       mac[mac_len-1]='\0';
-       
-       if(sock!=1){
-    	   close(sock);
-       }
-       return string(mac);
-       
-     };
-    
+		int sock;
+		sock=socket(PF_INET, SOCK_STREAM, 0);
+		if (-1==sock) {
+			perror("socket() ");
+			return 1;
+		}
+		strncpy(ifr->ifr_name,inf.c_str(),sizeof(ifr->ifr_name)-1);
+		ifr->ifr_name[sizeof(ifr->ifr_name)-1]='\0';
 
-     
-     static string nameToIp(string inf){
-       struct ifreq ifr;
-       int sock;
-       char *p, addr[32];
-       const int addr_len = sizeof(addr);
-       memset(addr,0,addr_len);
-       
-       sock=getSock(inf,&ifr);
-       
-       if (-1==ioctl(sock, SIOCGIFADDR, &ifr)) {
-	 perror("ioctl(SIOCGIFADDR) ");
-	 return string("0.0.0.0");
-       }
-       p=inet_ntoa(((struct sockaddr_in *)(&ifr.ifr_addr))->sin_addr);
-       strncpy(addr,p,addr_len-1);
-       addr[addr_len-1]='\0';
-       
-       if(sock!=1){
-    	   close(sock);
-       }
-       return string(addr);
-       
-     };
-     
-     static int getSock(string inf, struct ifreq *ifr) {
-   
-       int sock;
-       sock=socket(PF_INET, SOCK_STREAM, 0);
-       if (-1==sock) {
-        perror("socket() ");
-        return 1;
-       }
-       strncpy(ifr->ifr_name,inf.c_str(),sizeof(ifr->ifr_name)-1);
-       ifr->ifr_name[sizeof(ifr->ifr_name)-1]='\0';
-       
-       return sock;
+		return sock;
+	};
 
-     };
+	/**
+	 * Convert Hostname to Internet address info structure
+	 * One must use freeaddrinfo(res) after using it
+	 * @param hostname hostname
+	 * @param res address of pointer to address info structure
+	 * @return 1 for fail, 0 for success
+	 */
+	// Do not make this static (for multi threading environment)
+	int ConvertHostnameToInternetAddress (const char* const hostname, struct addrinfo **res) {
+		// criteria in selecting socket address structures returned by res
+		struct addrinfo hints;
+		memset (&hints, 0, sizeof (hints));
+		hints.ai_family = AF_INET;
+		hints.ai_socktype = SOCK_STREAM;
+		// get host info into res
+		int errcode = getaddrinfo (hostname, NULL, &hints, res);
+		if (errcode != 0) {
+			cprintf (RED,"Error: Could not convert %s hostname to internet address (zmq):"
+					"%s\n", hostname, gai_strerror(errcode));
+		} else {
+			if (*res == NULL) {
+				cprintf (RED,"Error: Could not convert %s hostname to internet address (zmq): "
+						"gettaddrinfo returned null\n", hostname);
+			} else{
+				return 0;
+			}
+		}
+		cprintf(RED, "Error: Could not convert hostname to internet address\n");
+		return 1;
+	};
 
+	/**
+	 * Convert Internet Address structure pointer to ip string (char*)
+	 * Clears the internet address structure as well
+	 * @param res pointer to internet address structure
+	 * @param ip pointer to char array to store result in
+	 * @param ipsize size available in ip buffer
+	 * @return 1 for fail, 0 for success
+	 */
+	// Do not make this static (for multi threading environment)
+	int ConvertInternetAddresstoIpString (struct addrinfo *res, char* ip, const int ipsize) {
+		if (inet_ntop (res->ai_family, &((struct sockaddr_in *) res->ai_addr)->sin_addr, ip, ipsize) != NULL) {
+			freeaddrinfo(res);
+			return 0;
+		}
+		cprintf(RED, "Error: Could not convert internet address to ip string\n");
+		return 1;
+	}
 
- 	/**
- 	 * Convert Hostname to Internet address info structure
- 	 * One must use freeaddrinfo(res) after using it
- 	 * @param hostname hostname
- 	 * @param res address of pointer to address info structure
- 	 * @return 1 for fail, 0 for success
- 	 */
-     // Do not make this static (for multi threading environment)
-     int ConvertHostnameToInternetAddress (const char* const hostname, struct addrinfo **res) {
-    	// criteria in selecting socket address structures returned by res
- 		struct addrinfo hints;
- 		memset (&hints, 0, sizeof (hints));
- 		 hints.ai_family = AF_INET;
- 		 hints.ai_socktype = SOCK_STREAM;
- 		 // get host info into res
- 		 int errcode = getaddrinfo (hostname, NULL, &hints, res);
- 		 if (errcode != 0) {
- 			 cprintf (RED,"Error: Could not convert %s hostname to internet address (zmq):"
- 					 "%s\n", hostname, gai_strerror(errcode));
- 		 } else {
- 			 if (*res == NULL) {
- 				 cprintf (RED,"Error: Could not convert %s hostname to internet address (zmq): "
- 						 "gettaddrinfo returned null\n", hostname);
- 			 } else{
- 				 return 0;
- 			 }
- 		 }
- 		cprintf(RED, "Error: Could not convert hostname to internet address\n");
- 		 return 1;
- 	};
+	/**
+	 * Receive data only
+	 * @param buf data
+	 * @param length size of data expecting, 0 for a single packet
+	 * @returns size of data received
+	 */
+	int ReceiveDataOnly(void* buf,int length=0){
 
-     /**
-      * Convert Internet Address structure pointer to ip string (char*)
-      * Clears the internet address structure as well
-      * @param res pointer to internet address structure
-      * @param ip pointer to char array to store result in
-      * @param ipsize size available in ip buffer
-      * @return 1 for fail, 0 for success
-      */
-     // Do not make this static (for multi threading environment)
-     int ConvertInternetAddresstoIpString (struct addrinfo *res, char* ip, const int ipsize) {
-    	 if (inet_ntop (res->ai_family, &((struct sockaddr_in *) res->ai_addr)->sin_addr, ip, ipsize) != NULL) {
-    		 freeaddrinfo(res);
-    		 return 0;
-    	 }
-    	 cprintf(RED, "Error: Could not convert internet address to ip string\n");
-    	 return 1;
-     }
+		if (buf==NULL) return -1;
 
+		total_sent=0;
+		int tcpfd = socketDescriptor;
 
-    
-     int ReceiveDataOnly(void* buf,int length=0){
+		switch(protocol) {
+		case TCP:
+			tcpfd = (is_a_server ? file_des : socketDescriptor);
+			if (tcpfd<0) return -1;
+			while(length>0){
+				nsending = (length>packet_size) ? packet_size:length;
+				nsent = read(tcpfd,(char*)buf+total_sent,nsending);
+				if(!nsent) {
+					if(!total_sent) {
+						return -1; //to handle it
+					}
+					break;
+				}
+				length-=nsent;
+				total_sent+=nsent;
+			}
 
-    	 if (buf==NULL) return -1;
+			if (total_sent>0)
+				strcpy(thisClientIP,dummyClientIP);
 
-    	 total_sent=0;
+			if (strcmp(lastClientIP,thisClientIP))
+				differentClients=1;
+			else
+				differentClients=0;
 
-    	 switch(protocol) {
-    	 case TCP:
-    		 if (file_des<0) return -1;
-    		 while(length>0){
-    			 nsending = (length>packet_size) ? packet_size:length;
-    			 nsent = read(file_des,(char*)buf+total_sent,nsending);
-    			 if(!nsent) {
-    				 if(!total_sent) {
-    					 return -1; //to handle it
-    				 }
-    				 break;
-    			 }
-    			 length-=nsent;
-    			 total_sent+=nsent;
-    		 }
-
-    		 if (total_sent>0)
-    			 strcpy(thisClientIP,dummyClientIP);
-
-    		 if (strcmp(lastClientIP,thisClientIP))
-    			 differentClients=1;
-    		 else
-    			 differentClients=0;
-
-    		 break;
-    	 case UDP:
-    		 if (socketDescriptor<0) return -1;
-    		 //if length given, listens to length, else listens for packetsize till length is reached
-    		 if(length){
-    			 while(length>0){
-   					 nsending = (length>packet_size) ? packet_size:length;
-    			     nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
-    			     if(nsent == header_packet_size)
-    			    	 continue;
-    				 if(nsent != nsending){
-    					 if(nsent && (nsent != -1))
-    							 cprintf(RED,"Incomplete Packet size %d\n",nsent);
-    					 break;
-    				 }
-    				 length-=nsent;
-    				 total_sent+=nsent;
-    			 }
-    		 }
-    		 //listens to only 1 packet
-    		 else{
-    			 //normal
-    			 nsending=packet_size;
-    			 while(1){
+			break;
+		case UDP:
+			if (socketDescriptor<0) return -1;
+			//if length given, listens to length, else listens for packetsize till length is reached
+			if(length){
+				while(length>0){
+					nsending = (length>packet_size) ? packet_size:length;
+					nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
+					if(nsent == header_packet_size)
+						continue;
+					if(nsent != nsending){
+						if(nsent && (nsent != -1))
+							cprintf(RED,"Incomplete Packet size %d\n",nsent);
+						break;
+					}
+					length-=nsent;
+					total_sent+=nsent;
+				}
+			}
+			//listens to only 1 packet
+			else{
+				//normal
+				nsending=packet_size;
+				while(1){
 #ifdef VERYVERBOSE
-    				cprintf(BLUE,"%d gonna listen\n", portno); fflush(stdout);
+					cprintf(BLUE,"%d gonna listen\n", portno); fflush(stdout);
 #endif
-    				 nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
-    				 //break out of loop only if read one packets size or read didnt work (cuz of shutdown)
-    				 if(nsent<=0 || nsent == packet_size)
-    					 break;
-    				 //incomplete packets or header packets ignored and read buffer again
-    				 if(nsent != packet_size && nsent != header_packet_size)
-    						cprintf(RED,"%d Incomplete Packet size %d\n", portno, nsent);
-    			 }
-    			//nsent = 1040;
-    			 if(nsent > 0)total_sent+=nsent;
-    		 }
-    		 break;
-    	 default:
-    		 ;
-    	 }
+					nsent = recvfrom(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, &clientAddress_length);
+					//break out of loop only if read one packets size or read didnt work (cuz of shutdown)
+					if(nsent<=0 || nsent == packet_size)
+						break;
+					//incomplete packets or header packets ignored and read buffer again
+					if(nsent != packet_size && nsent != header_packet_size)
+						cprintf(RED,"%d Incomplete Packet size %d\n", portno, nsent);
+				}
+				//nsent = 1040;
+				if(nsent > 0)total_sent+=nsent;
+			}
+			break;
+		default:
+			;
+		}
 #ifdef VERY_VERBOSE
-    	 cout << "sent "<< total_sent << " Bytes" << endl;
+		cout << "sent "<< total_sent << " Bytes" << endl;
 #endif
+		return total_sent;
+	}
 
-
-    	 return total_sent;
-
-
-
-     }
-
-
-     int SendDataOnly(void *buf, int length) {
+	/**
+	 * Send data only
+	 * @param buf data
+	 * @param length size of data expecting
+	 * @returns size of data sent
+	 */
+	int SendDataOnly(void *buf, int length) {
 #ifdef VERY_VERBOSE
-       cout << "want to send "<< length << " Bytes" << endl; 
+		cout << "want to send "<< length << " Bytes" << endl;
 #endif
-       if (buf==NULL) return -1;
-       
-       total_sent=0;
-       
+		if (buf==NULL) return -1;
 
-       switch(protocol) {
-       case TCP:
-	 if (file_des<0) return -1;
-	 while(length>0){
-	   nsending = (length>packet_size) ? packet_size:length;
-	   nsent = write(file_des,(char*)buf+total_sent,nsending); 
-	   if(is_a_server && nsent < 0) {
-		   cprintf(BG_RED, "Error writing to socket. Possible client socket crash\n");
-		   break;
-	   }
-	   if(!nsent) break;
-	   length-=nsent;
-	   total_sent+=nsent;
-	 }
-	 break;
-       case UDP:
-	 if (socketDescriptor<0) return -1;
-	 while(length>0){
-	   nsending = (length>packet_size) ? packet_size:length;
-	   nsent = sendto(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, clientAddress_length); 
-	   if(!nsent) break;
-	   length-=nsent;
-	   total_sent+=nsent;
-	 }
-	 
-	 break;
-       default:
-	 ;
-       }
+		total_sent=0;
+
+		int tcpfd = socketDescriptor;
+
+		switch(protocol) {
+		case TCP:
+			tcpfd = (is_a_server ? file_des : socketDescriptor);
+			if (tcpfd<0) return -1;
+			while(length>0){
+				nsending = (length>packet_size) ? packet_size:length;
+				nsent = write(tcpfd,(char*)buf+total_sent,nsending);
+				if(is_a_server && nsent < 0) {
+					cprintf(BG_RED, "Error writing to socket. Possible client socket crash\n");
+					break;
+				}
+				if(!nsent) break;
+				length-=nsent;
+				total_sent+=nsent;
+			}
+			break;
+		case UDP:
+			if (socketDescriptor<0) return -1;
+			while(length>0){
+				nsending = (length>packet_size) ? packet_size:length;
+				nsent = sendto(socketDescriptor,(char*)buf+total_sent,nsending, 0, (struct sockaddr *) &clientAddress, clientAddress_length);
+				if(!nsent) break;
+				length-=nsent;
+				total_sent+=nsent;
+			}
+
+			break;
+		default:
+			;
+		}
 #ifdef VERY_VERBOSE
-       cout << "sent "<< total_sent << " Bytes" << endl; 
+		cout << "sent "<< total_sent << " Bytes" << endl;
 #endif
-       return total_sent;
-     }
+		return total_sent;
+	}
 
+	char lastClientIP[INET_ADDRSTRLEN];
+	char thisClientIP[INET_ADDRSTRLEN];
+	int differentClients;
 
-     int getCurrentTotalReceived(){
-    	 return total_sent;
-     }
+protected:
+	int portno;
+	communicationProtocol protocol;
+	int is_a_server;
+	int socketDescriptor;
+	int file_des;
+	int packet_size;
+	struct sockaddr_in clientAddress, serverAddress;
+	socklen_t clientAddress_length;
+	char dummyClientIP[INET_ADDRSTRLEN];
 
-     char lastClientIP[INET_ADDRSTRLEN];
-     char thisClientIP[INET_ADDRSTRLEN];
-     int differentClients;
-
-
- protected:
-
-  int portno;
-  communicationProtocol protocol; 
-  int is_a_server;
-  int socketDescriptor;
-  int file_des;
-  int packet_size;
-  struct sockaddr_in clientAddress, serverAddress;
-  socklen_t clientAddress_length;
-  char dummyClientIP[INET_ADDRSTRLEN];
-
-
- private:
-  
-  int nsending;
-  int nsent;
-  int total_sent;
-  int header_packet_size;
-  int actual_udp_socket_buffer_size;
-
-  // pthread_mutex_t mp;
+private:
+	int nsending;
+	int nsent;
+	int total_sent;
+	int header_packet_size;
+	int actual_udp_socket_buffer_size;
 };