aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsotech117 <michael_foiani@brown.edu>2023-11-09 15:47:21 -0500
committersotech117 <michael_foiani@brown.edu>2023-11-09 15:47:21 -0500
commit96fbd9d3f5cd08d6855e44b72c0bad505bcec69a (patch)
treee49f1db967c06643b8b1653331527c50b6056f31
parent824b5dd6b67d18d4e708f6d9a0273151fe3d5ae1 (diff)
rename to correct pointer
-rw-r--r--pkg/ipstack/ipstack.go15
1 files changed, 7 insertions, 8 deletions
diff --git a/pkg/ipstack/ipstack.go b/pkg/ipstack/ipstack.go
index afe3bc5..ba55869 100644
--- a/pkg/ipstack/ipstack.go
+++ b/pkg/ipstack/ipstack.go
@@ -990,7 +990,7 @@ func HandleTCP(src *Interface, message []byte, hdr *ipv4header.IPv4Header) error
if !in {
fmt.Println("no socket entry found")
} else if socketEntry.State == Established {
- if (len(tcpPayload) == 0) {
+ if len(tcpPayload) == 0 {
break
}
fmt.Println("socket entry found")
@@ -1025,7 +1025,6 @@ func HandleTCP(src *Interface, message []byte, hdr *ipv4header.IPv4Header) error
break
}
-
mapMutex.Lock()
for _, socketEntry := range VHostSocketMaps {
if socketEntry.LocalPort == tcpHdr.DstPort && socketEntry.LocalIP == hdr.Dst.String() && socketEntry.State == SYNRECIEVED {
@@ -1258,7 +1257,7 @@ type RecvBuffer struct {
type SendBuffer struct {
una uint32
nxt uint32
- lbr uint32
+ lbw uint32
buffer []byte
}
@@ -1318,7 +1317,7 @@ func (l *VTCPListener) VAccept() (*VTCPConn, error) {
SendBuffer: &SendBuffer{
una: 0,
nxt: 0,
- lbr: 0,
+ lbw: 0,
buffer: make([]byte, MAX_WINDOW_SIZE),
},
RecvBuffer: &RecvBuffer{
@@ -1383,7 +1382,7 @@ func VConnect(ip string, port uint16) (*VTCPConn, error) {
SendBuffer: &SendBuffer{
una: 0,
nxt: 0,
- lbr: 0,
+ lbw: 0,
buffer: make([]byte, MAX_WINDOW_SIZE),
},
RecvBuffer: &RecvBuffer{
@@ -1509,12 +1508,12 @@ func (c *VTCPConn) VWrite(payload []byte) (int, error) {
}
// check if the payload is larger than the available window size
- if len(payload) > int(MAX_WINDOW_SIZE-(c.SendBuffer.nxt-1-c.SendBuffer.lbr)) {
+ if len(payload) > int(MAX_WINDOW_SIZE-(c.SendBuffer.nxt-1-c.SendBuffer.lbw)) {
return 0, errors.Errorf("error VWrite: payload is larger than the available window size")
}
// make the header
- advertisedWindow := MAX_WINDOW_SIZE - (c.SendBuffer.nxt - 1 - c.SendBuffer.lbr)
+ advertisedWindow := MAX_WINDOW_SIZE - (c.SendBuffer.nxt - 1 - c.SendBuffer.lbw)
tcpHdr := &header.TCPFields{
SrcPort: c.LocalPort,
DstPort: c.RemotePort,
@@ -1540,7 +1539,7 @@ func (c *VTCPConn) VWrite(payload []byte) (int, error) {
// update the next sequence number
// c.SendBuffer.nxt += uint32(len(payload))
- c.SendBuffer.lbr += uint32(len(payload))
+ c.SendBuffer.lbw += uint32(len(payload))
return len(payload), nil
}