From 4fee4cec7d24cdae24a15c9ecd049a72c2a3edb0 Mon Sep 17 00:00:00 2001
From: deranjer <deranjer@gmail.com>
Date: Sun, 31 May 2020 20:19:43 -0400
Subject: [PATCH] fixing some net connection issues

---
 client/clientcmd/info.go | 12 +++++++++---
 server/server.go         |  5 ++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/client/clientcmd/info.go b/client/clientcmd/info.go
index dca7efb..96a2dcb 100644
--- a/client/clientcmd/info.go
+++ b/client/clientcmd/info.go
@@ -8,8 +8,7 @@ import (
 )
 
 func GetServerInfo(conn *net.Conn) error {
-	for {
-		fmt.Println("New LOop")
+	for { // Server should send 'Connected\n' to client after connect, then client can ask for server details
 		message, err := bufio.NewReader(*conn).ReadString('\n')
 		if err != nil {
 			return fmt.Errorf("error reading from connection: %s", err)
@@ -18,7 +17,14 @@ func GetServerInfo(conn *net.Conn) error {
 		switch message {
 		case "Connected\n":
 			fmt.Println("Server has acknowledged connection, asking for server details")
-			conn.Send(fmt.Fprintf(*conn, "Details\n"))
+			bytesSent, err := fmt.Fprintf(*conn, "Details\n")
+			if err != nil {
+				fmt.Println("Error sending message to server! ", err)
+				os.Exit(0)
+			}
+			if bytesSent > 0 {
+				fmt.Println("Message Sent")
+			}
 		default:
 			fmt.Println("Details: ", message)
 			os.Exit(0)
diff --git a/server/server.go b/server/server.go
index a8c3dc0..521dc6d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -22,7 +22,10 @@ func main() {
 		switch message {
 		case "Details\n":
 			fmt.Println("Sending server details to client")
-			c.Send(fmt.Printf("Server Details are as follows: Version: %s\n", version))
+			detailsMessage := fmt.Sprintf("Server Details are as follows: Version: %s \n", version)
+			c.Send(detailsMessage)
+		default:
+			fmt.Println("unrecognized message! ", message)
 		}
 	})
 	server.OnClientConnectionClosed(func(c *tcp_server.Client, err error) {