From ba2fa07e19559d1dcbbffb32bce2de008df57e34 Mon Sep 17 00:00:00 2001
From: jsrobson10 <jsrobson10@gmail.com>
Date: Mon, 25 Mar 2019 09:18:06 +1100
Subject: [PATCH] Got a connection between the server folder and the client.

---
 .gitignore                  |   4 ++++
 README.md                   |   3 +++
 client/Makefile             |  17 +++++++++++++++++
 client/connections.cpp      |  18 +++++++++++++++---
 client/connections.h        |   1 +
 client/main.cpp             |   2 ++
 lib/mainloop-api            |   1 +
 lib/{ => socket}/socket.cpp |   0
 lib/{ => socket}/socket.h   |   2 ++
 lib/socks_test_client       | Bin 14592 -> 0 bytes
 lib/socks_test_client.cpp   |  13 -------------
 lib/socks_test_server       | Bin 14312 -> 0 bytes
 lib/socks_test_server.cpp   |  16 ----------------
 server/Makefile             |  17 +++++++++++++++++
 server/connections.cpp      |  21 +++++++++++++++++++--
 15 files changed, 81 insertions(+), 34 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 client/Makefile
 create mode 160000 lib/mainloop-api
 rename lib/{ => socket}/socket.cpp (100%)
 rename lib/{ => socket}/socket.h (94%)
 delete mode 100644 lib/socks_test_client
 delete mode 100644 lib/socks_test_client.cpp
 delete mode 100644 lib/socks_test_server
 delete mode 100644 lib/socks_test_server.cpp
 create mode 100644 server/Makefile

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9bb885d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# Don't incude these binary files
+*.out
+*.o
+*.exe
diff --git a/README.md b/README.md
index 77b4bdd..82cdbe9 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,5 @@
 # online-game
 An online game created with C++
+
+# Port
+This game uses port 34698
diff --git a/client/Makefile b/client/Makefile
new file mode 100644
index 0000000..3a90abb
--- /dev/null
+++ b/client/Makefile
@@ -0,0 +1,17 @@
+all: connections.o main.o mainloop-api.o socket.o
+	g++ connections.o main.o mainloop-api.o socket.o
+
+connections.o: connections.cpp
+	g++ -c connections.cpp
+
+main.o: main.cpp
+	g++ -c main.cpp
+
+mainloop-api.o: lib/mainloop-api/mainloop-api.cpp
+	g++ -c lib/mainloop-api/mainloop-api.cpp -o mainloop-api.o
+
+socket.o: lib/socket/socket.cpp
+	g++ -c lib/socket/socket.cpp -o socket.o
+
+clean:
+	rm *.o
diff --git a/client/connections.cpp b/client/connections.cpp
index f6a6f78..fccd288 100644
--- a/client/connections.cpp
+++ b/client/connections.cpp
@@ -1,8 +1,20 @@
-#include "lib/socket.h"
+#include "lib/socket/socket.h"
+#include <cstdlib>
 
 client_tcp *client;
 
-int connections_init()
+void connections_init(int argc, char const* argv[])
 {
-  client = new client_tcp()
+  // Get the port
+  int port = PORT_DEFAULT;
+
+  // Did the user specify a port
+  if(argc > 2)
+  {
+    // Set the port to the specified one
+    port = atoi(argv[2]);
+  }
+
+  // Create a client
+  client = new client_tcp(argv[1], port);
 }
diff --git a/client/connections.h b/client/connections.h
index e69de29..160e9fd 100644
--- a/client/connections.h
+++ b/client/connections.h
@@ -0,0 +1 @@
+void connections_init(int argc, char const* argv[]);
diff --git a/client/main.cpp b/client/main.cpp
index 57efb02..6f400e2 100644
--- a/client/main.cpp
+++ b/client/main.cpp
@@ -2,6 +2,8 @@
 
 int main(int argc, char const *argv[])
 {
+  // Initialise the connections
+  connections_init(argc, argv);
 
   return 0;
 }
diff --git a/lib/mainloop-api b/lib/mainloop-api
new file mode 160000
index 0000000..c7924fc
--- /dev/null
+++ b/lib/mainloop-api
@@ -0,0 +1 @@
+Subproject commit c7924fc3f4cef1e42b27c683d1413aed5d684374
diff --git a/lib/socket.cpp b/lib/socket/socket.cpp
similarity index 100%
rename from lib/socket.cpp
rename to lib/socket/socket.cpp
diff --git a/lib/socket.h b/lib/socket/socket.h
similarity index 94%
rename from lib/socket.h
rename to lib/socket/socket.h
index 693e0ae..9e81731 100644
--- a/lib/socket.h
+++ b/lib/socket/socket.h
@@ -2,6 +2,8 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+#define PORT_DEFAULT 34698;
+
 class client_tcp
 {
 public:
diff --git a/lib/socks_test_client b/lib/socks_test_client
deleted file mode 100644
index 80dbc922a67cd2f4905507ce53248fdcf76ba84f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14592
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
byp9K63AtX@U4V;n_Ip%^3jeRh#s0ql#+J=b

diff --git a/lib/socks_test_client.cpp b/lib/socks_test_client.cpp
deleted file mode 100644
index 78c3d8d..0000000
--- a/lib/socks_test_client.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <iostream>
-#include <unistd.h>
-
-#include "socket.h"
-
-int main(int argc, char const *argv[])
-{
-  client_tcp client("localhost", 12345);
-  std::cout << "Status: " << client.status << '\n';
-  std::cout << client.recv(2) << '\n';
-
-  return 0;
-}
diff --git a/lib/socks_test_server b/lib/socks_test_server
deleted file mode 100644
index ae44e07c6559a5d611b6425eb3651f822b0c266b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14312
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

diff --git a/lib/socks_test_server.cpp b/lib/socks_test_server.cpp
deleted file mode 100644
index d0a4156..0000000
--- a/lib/socks_test_server.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <iostream>
-
-#include "socket.h"
-
-int main(int argc, char const *argv[])
-{
-  server_tcp server(12345);
-
-  while(1)
-  {
-    client_tcp client = server.cliaccept();
-    client.send("hi", 2);
-  }
-
-  return 0;
-}
diff --git a/server/Makefile b/server/Makefile
new file mode 100644
index 0000000..3a90abb
--- /dev/null
+++ b/server/Makefile
@@ -0,0 +1,17 @@
+all: connections.o main.o mainloop-api.o socket.o
+	g++ connections.o main.o mainloop-api.o socket.o
+
+connections.o: connections.cpp
+	g++ -c connections.cpp
+
+main.o: main.cpp
+	g++ -c main.cpp
+
+mainloop-api.o: lib/mainloop-api/mainloop-api.cpp
+	g++ -c lib/mainloop-api/mainloop-api.cpp -o mainloop-api.o
+
+socket.o: lib/socket/socket.cpp
+	g++ -c lib/socket/socket.cpp -o socket.o
+
+clean:
+	rm *.o
diff --git a/server/connections.cpp b/server/connections.cpp
index 22d7477..dd59a39 100644
--- a/server/connections.cpp
+++ b/server/connections.cpp
@@ -1,3 +1,20 @@
-#include "lib/socket.h"
+#include "lib/socket/socket.h"
+#include <cstdlib>
 
-server_tcp server;
+server_tcp *server;
+
+void connections_init(int argc, char const *argv[])
+{
+  // Get the port
+  int port = PORT_DEFAULT;
+
+  // Did the user specify a port
+  if(argc > 1)
+  {
+    // Set the port to the specified one
+    port = atoi(argv[1]);
+  }
+
+  // Start the server
+  server = new server_tcp(port);
+}