try some stuff, no avail

12 files changed, 51 insertions, 22 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..c3e4d96
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# Force unix newlines on all platforms
+util/update_from_stencil text eol=lf
+util/run_tests text eol=lf
+*.sh text eol=lf
diff --git a/Makefile b/Makefile
index 725e61e..654acc8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,17 @@
 
 CC      = gcc
 # CFLAGS  = -std=c99 -target x86_64-apple-darwin20 -g 
-CFLAGS = -g -I. -std=gnu99 -Wall -pthread
+# CFLAGS = -g -I. -std=gnu99 -Wall -pthread
+CFLAGS = -o
 
 all: server client
 
 server:
-	$(CC) $(CFLAGS) -o snowcast_server server.c
+	$(CC) $(CFLAGS) snowcast_server server.c
 
 client:
-	$(CC) $(CFLAGS) -o snowcast_control client.c
-	$(CC) $(CFLAGS) -o snowcast_listener listener.c
-
-# new:
-# 	$(CC) $(CFLAGS) -o s snowcast_server_concurrent.c
-# 	$(CC) $(CFLAGS) -o l listener.c
-# 	$(CC) $(CFLAGS) -o c client.c
-
+	$(CC) $(CFLAGS) snowcast_control client.c
+	$(CC) $(CFLAGS) snowcast_listener listener.c
+	
 clean:
 	rm -fv snowcast_control snowcast_listener snowcast_server
diff --git a/client.c b/client.c
index 6ade043..f39f839 100644
--- a/client.c
+++ b/client.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
     char s[INET6_ADDRSTRLEN];
 
     if (argc != 4) {
-        fprintf(stderr,"<server IP> <server port> <listener port>\n");
+        fprintf(stderr, "usage: <server IP> <server port> <listener port>\n");
         exit(1);
     }
 
@@ -92,7 +92,14 @@ int main(int argc, char *argv[])
     pthread_t reply_thread;
     pthread_create(&reply_thread, NULL, reply_thread_routine, (void*)sockfd);
 
-    usleep(1000);
+    usleep(100);
+
+    struct timeval tv;
+    tv.tv_sec = 0;
+    tv.tv_usec = TIMEOUT;
+    if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
+        perror("setsockopt");
+    }
 
     struct Hello hello;
     hello.commandType = 0;
@@ -123,6 +130,11 @@ int main(int argc, char *argv[])
             // printf("Changing to station %d.\n", inputInt);
 
             // send the command to change the station
+            tv.tv_sec = 0;
+            tv.tv_usec = TIMEOUT;
+            if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {
+                perror("setsockopt");
+            }
             struct SetStation setStation;
             setStation.commandType = 1;
             setStation.stationNumber = htons(inputInt);
@@ -148,6 +160,8 @@ void *reply_thread_routine(void* args) {
             perror("recv");
             exit(1);
         }
+
+        fprintf(stderr, "reply_type: %d\n", reply_type);
  
         if (reply_type == 2) { // we have a welcome message
             // recv the message, check for errors too
@@ -158,10 +172,16 @@ void *reply_thread_routine(void* args) {
                 exit(1);
             }
             uint16_t num_stations = ntohs(buf_num_stations);
-            fflush(stdout);
-            printf("Click q to end stream.\n");
-            printf("Welcome to Snowcast! The server has %u stations.\n", num_stations);
-            fflush(stdout);
+            fprintf(stdout, "Welcome to Snowcast! The server has %u stations.\n", num_stations);
+            fprintf(stderr, "Welcome to Snowcast! The server has %u stations.\n", num_stations);
+            // printf("Click q to end stream.\n");
+
+            struct timeval no_tv;
+            no_tv.tv_sec = 0;
+            no_tv.tv_usec = 0;
+            if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &no_tv, sizeof(no_tv)) < 0) {
+                perror("setsockopt");
+            }
             continue;
         }
 
@@ -192,13 +212,22 @@ void *reply_thread_routine(void* args) {
                 exit(1);
             }
 
+            printf("string size: %d\n", string_size);
+
             char *message = malloc(string_size);
             if(message == NULL) { perror("malloc in message"); }
             if (recv_all(sockfd, message, &string_size) == -1) {
                 perror("recv_all");
                 exit(1);
             }
+            struct timeval no_tv;
+            no_tv.tv_sec = 0;
+            no_tv.tv_usec = 0;
+            if (setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &no_tv, sizeof(no_tv)) < 0) {
+                perror("setsockopt");
+            }
             printf("Invalid protocol: %s. Exiting.\n", message);
+            fprintf(stderr, "Invalid protocol: %s. Exiting.\n", message);
             free(message);
             close(sockfd);
             exit(1);
diff --git a/snowcast_control b/snowcast_control
index 8496be5..21e448c 100755
--- a/snowcast_control
+++ b/snowcast_control
diff --git a/snowcast_listener b/snowcast_listener
index d399eb6..f27a5c1 100755
--- a/snowcast_listener
+++ b/snowcast_listener
diff --git a/snowcast_server b/snowcast_server
index 104d93f..7516d88 100755
--- a/snowcast_server
+++ b/snowcast_server
diff --git a/util/run_tests b/util/run_tests
index 4dbdf4b..64bbb1e 100755
--- a/util/run_tests
+++ b/util/run_tests
@@ -94,18 +94,18 @@ do_server() {
 }
 
 do_control() {
-    check_exists "${bin_dir}/snowcast_server"
-    run_tester server_tester $@
+    check_exists "${bin_dir}/snowcast_control"
+    run_tester control_tester $@
 }
 
 do_milestone() {
-   do_control -test.run="Test.+?/Test(ConnectsToServer|AcceptsClientConnection|CompletesHandshake)"
+   do_control -test.v -test.run="Test.+?/Test(ConnectsToServer|AcceptsClientConnection|CompletesHandshake)" || true
    do_server -test.v -test.run="Test.+?/Test(ConnectsToServer|AcceptsClientConnection|CompletesHandshake)"
 }
 
 
 do_all() {
-    do_server $@
+    do_server $@ || true
     do_control $@
 }
 
diff --git a/util/snowcast-dissector/install.sh b/util/snowcast-dissector/install.sh
index efd2341..caba8b6 100755
--- a/util/snowcast-dissector/install.sh
+++ b/util/snowcast-dissector/install.sh
@@ -7,8 +7,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 TARGET=~/.config/wireshark/plugins
 
 main() {
-    mkdir -pv ${TARGET}
-    install -v -m644 ${SCRIPT_DIR}/cs168_snowcast.lua ${TARGET}
+    mkdir -pv "${TARGET}"
+    install -v -m644 "${SCRIPT_DIR}/cs168_snowcast.lua" "${TARGET}"
 }
 
 main $@
diff --git a/util/tester/arm64/control_tester b/util/tester/arm64/control_tester
index 5eebce7..ef56521 100755
--- a/util/tester/arm64/control_tester
+++ b/util/tester/arm64/control_tester
diff --git a/util/tester/arm64/server_tester b/util/tester/arm64/server_tester
index 6694cfe..d900a1f 100755
--- a/util/tester/arm64/server_tester
+++ b/util/tester/arm64/server_tester
diff --git a/util/tester/control_tester b/util/tester/control_tester
index 942e960..854d3c6 100755
--- a/util/tester/control_tester
+++ b/util/tester/control_tester
diff --git a/util/tester/server_tester b/util/tester/server_tester
index 13063ec..7ea880c 100755
--- a/util/tester/server_tester
+++ b/util/tester/server_tester