improving sockets, fixed some bugs

app.c

@@ -2,51 +2,102 @@
 
 #include "core.c"
 #include "signal.h"
+#include "stdlib.h"
 
 Server *server = NULL;
 
 void handleSigint(int dummy) {
     if (server) {
-        print("\n");
-        print("Closing server socket.\n");
+        println("");
+        println("Closing server socket.");
         serverClose(server);
-        print("Success\n.");
+        println("Success.");
     }
-    exit(0);
+    signal(SIGINT, SIG_DFL);
+    raise(SIGINT);
 }
 
 int djstd_entry(Arena *arena, StringList args) {
     signal(SIGINT, &handleSigint);
 
+    bool isServer = strEql(args.data[0], s("server"));
+    bool isClient = strEql(args.data[0], s("client"));
+
+    if (!isServer && !isClient || args.length < 2) {
+        println("Usage: [type] [port] ([remote_address])");
+        println("[type] is either 'server' or 'client'");
+        println("[remote_address] can be given if a client app, default is loopback");
+        return 0;
+    }
+
     int port = 8080;
-    Int32Result portParsed = parsePositiveInt(args.data[0]);
+    Int32Result portParsed = parsePositiveInt(args.data[1]);
     if (portParsed.valid) {
         port = portParsed.result;
     }
 
-    print("Starting server on port %d\n", port);
-    Server myserver = serverInit((ServerInitInfo){
-        .concurrentClients=16,
-        .port=port,
-        .memory=Megabytes(64),
-    });
-
-    server = &myserver;
-
-    serverListen(&myserver);
-    Client *client = serverAccept(&myserver);
-
-    CharList buf = PushFullListZero(arena, CharList, 257);
-    uint64 bytesRead = clientRead(client, (void *)buf.data, buf.length - 1);
-
-    if (bytesRead > 0) {
-        print("Client said: %s\n", buf.data);
-        print("Now that's insightful.\n");
-    } else if (bytesRead == -1) {
-        print("Connection error\n");
+    string addr = s("::1");
+    if (!isServer && args.length > 2) {
+        if (args.data[2].length > 0) {
+            addr = args.data[2];
+        }
     }
 
-    clientClose(client);
+    if (isServer) {
+        println("Starting server on port %d", port);
+        Server myserver = serverInit((ServerInitInfo){
+            .concurrentClients=16,
+            .port=port,
+            .memory=Megabytes(64),
+        });
+
+        server = &myserver;
+
+        serverListen(&myserver);
+        Socket *client = serverAccept(&myserver);
+
+        forever {
+            string buf = PushStringFill(arena, 256, 0);
+            uint64 bytesRead = socketRead(client, buf.str, buf.length - 1);
+
+            if (bytesRead > 0) {
+                buf.length = bytesRead;
+                println("Client said: %S", strSplit(arena, s("\n"), buf).data[0]);
+
+                println("Saying goodbye");
+                string message = s("Goodbye\n");
+                socketWrite(client, message.str, message.length);
+                break;
+            }
+            serverClose(&myserver);
+        }
+
+        socketClose(client);
+    } else {
+        println("Connecting to socket at %S on port %d", addr, port);
+        Socket sock = socketConnect(arena, (SocketConnectInfo){ .address=addr, .port=port });
+        println("CONNECTED");
+
+        string message;
+        uint64 bytesWritten;
+
+        string buf = PushStringFill(arena, 256, 0);
+
+        forever {
+            message = s("Howdy partner\n");
+            print("Saying: %S", message);
+            bytesWritten = socketWrite(&sock, message.str, message.length);
+
+            socketRead(&sock, buf.str, buf.length);
+            message = strSplit(arena, s("\n"), buf).data[0];
+            println("Received message: %S", message);
+            if (strEql(message, s("Goodbye"))) {
+                println("Quitting");
+                break;
+            }
+        }
+        socketClose(&sock);
+    }
 
     return 0;
 }