From 87b6e36391a0a37f5136910dfc331807add61eef Mon Sep 17 00:00:00 2001
From: sotech117 <michael_foiani@brown.edu>
Date: Tue, 24 Oct 2023 01:12:05 +0000
Subject: more descriptive errors to match reference. final commit :)

---
 cmd/vhost/main.go      |   4 +---
 cmd/vrouter/main.go    |   3 +--
 pkg/ipstack/ipstack.go |   8 ++++----
 vhost                  | Bin 3105198 -> 3105174 bytes
 vrouter                | Bin 3105238 -> 3105198 bytes
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cmd/vhost/main.go b/cmd/vhost/main.go
index e83d1bf..c0e5ad8 100644
--- a/cmd/vhost/main.go
+++ b/cmd/vhost/main.go
@@ -71,11 +71,9 @@ func main() {
 						if neighbor.VipAddr == address ||
 							neighbor.VipAddr == hop.VIP && hop.Type == "S" {
 							bytesWritten, err := ipstack.SendIP(&myAddr, neighbor, ipstack.TEST_PROTOCOL, messageToSendBytes, ipAddr, nil)
+							fmt.Printf("Sent %d bytes to %s\n", bytesWritten, neighbor.VipAddr.String())
 							if err != nil {
 								fmt.Println(err)
-							} else {
-								fmt.Printf("Sent %d bytes to %s\n", bytesWritten, neighbor.VipAddr.String())
-
 							}
 						}
 					}
diff --git a/cmd/vrouter/main.go b/cmd/vrouter/main.go
index bc8cb2b..2736525 100644
--- a/cmd/vrouter/main.go
+++ b/cmd/vrouter/main.go
@@ -90,10 +90,9 @@ func main() {
 							neighbor.VipAddr == hop.VIP {
 							// send the message to the neighbor
 							bytesWritten, err := ipstack.SendIP(&myAddr, neighbor, ipstack.TEST_PROTOCOL, messageToSendBytes, ipAddr, nil)
+							fmt.Printf("Sent %d bytes to %s\n", bytesWritten, neighbor.VipAddr.String())
 							if err != nil {
 								fmt.Println(err)
-							} else {
-								fmt.Printf("Sent %d bytes to %s\n", bytesWritten, neighbor.VipAddr.String())
 							}
 						}
 					}
diff --git a/pkg/ipstack/ipstack.go b/pkg/ipstack/ipstack.go
index d3178b8..fe8d743 100644
--- a/pkg/ipstack/ipstack.go
+++ b/pkg/ipstack/ipstack.go
@@ -330,7 +330,7 @@ func SendIP(src *netip.Addr, dest *Neighbor, protocolNum int, message []byte, de
 	// check if the interface is up
 	iface, err := GetInterfaceByName(dest.Name)
 	if !iface.State {
-		return -1, errors.Errorf("error SEND: %s is down", iface.Name)
+		return 0, errors.Errorf("error SEND: %s is down", iface.Name)
 	}
 	// if the header is nil, create a new one
 	if hdr == nil {
@@ -371,7 +371,7 @@ func SendIP(src *netip.Addr, dest *Neighbor, protocolNum int, message []byte, de
 	// Assemble the header into a byte array
 	headerBytes, err := hdr.Marshal()
 	if err != nil {
-		return -1, err
+		return 0, err
 	}
 
 	// Compute the checksum (see below)
@@ -397,7 +397,7 @@ func SendIP(src *netip.Addr, dest *Neighbor, protocolNum int, message []byte, de
 	bytesWritten, err := iface.Socket.WriteToUDP(bytesToSend, sendAddr)
 	if err != nil {
 		fmt.Println("Error writing to UDP socket")
-		return -1, errors.WithMessage(err, "Error writing to UDP socket")
+		return 0, errors.WithMessage(err, "Error writing to UDP socket")
 	}
 
 	return bytesWritten, nil
@@ -1005,4 +1005,4 @@ func CleanUp() {
 	routingTable = make(map[netip.Prefix]Hop)
 
 	time.Sleep(5 * time.Millisecond)
-}
\ No newline at end of file
+}
diff --git a/vhost b/vhost
index 8ecce6f..3c30a1f 100755
Binary files a/vhost and b/vhost differ
diff --git a/vrouter b/vrouter
index 948abfc..f86f584 100755
Binary files a/vrouter and b/vrouter differ
-- 
cgit v1.2.3-70-g09d2