WIP fixing tests.

netsec-ethz · Nov 30, 2024 · 0dd419d · 0dd419d
1 parent 64dcbc1
commit 0dd419d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/router/dataplane_hbird.go b/router/dataplane_hbird.go
@@ -116,10 +116,12 @@ func (p *scionPacketProcessor) determinePeerHbird() (processResult, error) {
 	return processResult{}, err
 }
 
+var getTimeNow func() time.Time = time.Now
+
 func (p *scionPacketProcessor) validateHopExpiryHbird() (processResult, error) {
 	expiration := util.SecsToTime(p.infoField.Timestamp).
 		Add(path.ExpTimeToDuration(p.hopField.ExpTime))
-	expired := expiration.Before(time.Now())
+	expired := expiration.Before(getTimeNow())
 	if !expired {
 		return processResult{}, nil
 	}
@@ -137,7 +139,7 @@ func (p *scionPacketProcessor) validateHopExpiryHbird() (processResult, error) {
 func (p *scionPacketProcessor) validateReservationExpiry() (processResult, error) {
 	startTime := util.SecsToTime(p.hbirdPath.PathMeta.BaseTS - uint32(p.flyoverField.ResStartTime))
 	endTime := startTime.Add(time.Duration(p.flyoverField.Duration) * time.Second)
-	now := time.Now()
+	now := getTimeNow()
 	if startTime.Before(now) && now.Before(endTime) {
 		return processResult{}, nil
 	}

diff --git a/router/dataplane_hbird_test.go b/router/dataplane_hbird_test.go
@@ -66,7 +66,7 @@ func TestProcessHbirdPacket(t *testing.T) {
 
 	key := []byte("testkey_xxxxxxxx")
 	sv := []byte("test_secretvalue")
-	now := time.Now()
+	now := util.SecsToTime(1000)
 
 	testCases := map[string]struct {
 		mockMsg         func(bool) *ipv4.Message
@@ -95,7 +95,7 @@ func TestProcessHbirdPacket(t *testing.T) {
 					dpath.HopFields[2].HopField)
 				ret := toMsg(t, spkt, dpath)
 				if afterProcessing {
-					ret.Addr = &net.UDPAddr{IP: dst.IP().AsSlice(), Port: topology.EndhostPort}
+					ret.Addr = &net.UDPAddr{IP: dst.IP().AsSlice(), Port: dstUDPPort}
 					ret.Flags, ret.NN, ret.N, ret.OOB = 0, 0, 0, nil
 
 				}
@@ -659,7 +659,7 @@ func TestProcessHbirdPacket(t *testing.T) {
 					dpath.HopFields[2].HopField.Mac = computeMAC(t, key, dpath.InfoFields[0],
 						dpath.HopFields[2].HopField)
 					ret := toMsg(t, spkt, dpath)
-					ret.Addr = &net.UDPAddr{IP: dst.IP().AsSlice(), Port: topology.EndhostPort}
+					ret.Addr = &net.UDPAddr{IP: dst.IP().AsSlice(), Port: dstUDPPort}
 					ret.Flags, ret.NN, ret.N, ret.OOB = 0, 0, 0, nil
 					return ret
 				}
@@ -735,7 +735,7 @@ func TestProcessHbirdPacket(t *testing.T) {
 					spkt.PayloadLen, dpath.InfoFields[0], dpath.HopFields[2], dpath.PathMeta)
 				ret := toMsg(t, spkt, dpath)
 				if afterProcessing {
-					ret.Addr = &net.UDPAddr{IP: dst.IP().AsSlice(), Port: topology.EndhostPort}
+					ret.Addr = &net.UDPAddr{IP: dst.IP().AsSlice(), Port: dstUDPPort}
 					ret.Flags, ret.NN, ret.N, ret.OOB = 0, 0, 0, nil
 				}
 				return ret
@@ -1340,6 +1340,8 @@ func TestProcessHbirdPacket(t *testing.T) {
 		},
 	}
 
+	router.SetNowFunction(func() time.Time { return now })
+
 	for name, tc := range testCases {
 		name, tc := name, tc
 		t.Run(name, func(t *testing.T) {
@@ -3838,7 +3840,7 @@ func prepHbirdMsg(now time.Time) (*slayers.SCION, *hummingbird.Decoded) {
 		DstIA:        xtest.MustParseIA("4-ff00:0:411"),
 		SrcIA:        xtest.MustParseIA("2-ff00:0:222"),
 		Path:         &hummingbird.Raw{},
-		PayloadLen:   18,
+		PayloadLen:   26, // scionudpLayer + len("actualpayloadbytes")
 	}
 
 	dpath := &hummingbird.Decoded{

diff --git a/router/export2_test.go b/router/export2_test.go
@@ -0,0 +1,7 @@
+package router
+
+import "time"
+
+func SetNowFunction(nowFun func() time.Time) {
+	getTimeNow = nowFun
+}