From 83b9990bcc27960fc42ac3c32fe9db8e4a2d3054 Mon Sep 17 00:00:00 2001
From: mdiluzio <thefoips@gmail.com>
Date: Fri, 2 Jan 2015 15:25:30 +0000
Subject: [PATCH] some more cleanup and using TTRTS_PORT

---
 source/client/client.cpp |  2 +-
 source/client/server.cpp | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/source/client/client.cpp b/source/client/client.cpp
index 3e846de..dccaeff 100644
--- a/source/client/client.cpp
+++ b/source/client/client.cpp
@@ -34,7 +34,7 @@ int runClient(int argc, char* argv[])
     }
 
     // Get port number
-    portno = 11715;
+    portno = TTRTS_PORT;
 
     // Create a new socket
     // AF_INET is general internetsocked domain
diff --git a/source/client/server.cpp b/source/client/server.cpp
index dfac689..f9ed4b5 100644
--- a/source/client/server.cpp
+++ b/source/client/server.cpp
@@ -14,23 +14,25 @@
 
 int runServer(int argc, char* argv[])
 {
-    int sockfd; 	// socket File descriptor
-    int newsockfd; 	// new socket File descriptor
+    // Server side information
+    int sockfd; 	        // socket File descriptor
+    sockaddr_in serv_addr;  // Server address
+    int portno;		        // Port number
 
-    int portno;		// Port number
+    // information for each client
+    sockaddr_in cli_addr;   // Client address
     socklen_t clilen;		// length of client address
-    clilen = sizeof(sockaddr_in);
+    int clientsockfd; 	    // new socket File descriptor
+
 
     int n = 0;			// return value for read and write calls
 
     char buffer[1028]; // buffer for socked read
     memset(buffer,0,sizeof(buffer));
 
-    struct sockaddr_in serv_addr; // Server address
-    struct sockaddr_in cli_addr;  // Client address
 
     // Create a new socket
-    // AF_INET is general internetsocked domain
+    // AF_INET is general internet socket domain
     // SOCK_STREAM as messages will be read in on this socket, SOCK_DGRAM would be for packets
     // 0 is for default protocol
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -41,7 +43,7 @@ int runServer(int argc, char* argv[])
     memset(&serv_addr,0, sizeof(serv_addr));
 
     // Grab the port number
-    portno = 11715;
+    portno = TTRTS_PORT;
 
     // Set the server address family to AF_INET
     serv_addr.sin_family = AF_INET;
@@ -67,8 +69,8 @@ int runServer(int argc, char* argv[])
     // accept waits for a connection from a client
     // it returns a new socket file descriptor for this connection
     // client information will be stored in cli_addr
-    newsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
-    if (newsockfd < 0)
+    clientsockfd = accept(sockfd, (struct sockaddr *) &cli_addr, &clilen);
+    if (clientsockfd < 0)
         error("ERROR on accept");
 
     // loop
@@ -80,7 +82,7 @@ int runServer(int argc, char* argv[])
         // Read in the new socket
         // read will block until the client has called write
         // up to the full size of the buffer
-        n = read(newsockfd,buffer,sizeof(buffer)-1);
+        n = read(clientsockfd,buffer,sizeof(buffer)-1);
         if (n < 0)
             error("ERROR reading from socket");