Comments r1

scionproto · Oct 18, 2018 · 51397ca · 51397ca
1 parent 8d1af38
commit 51397ca
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/go/border/rpkt/path.go b/go/border/rpkt/path.go
@@ -134,12 +134,13 @@ func (rp *RtrPkt) validateLocalIF(ifid *common.IFIDType) error {
 // mkInfoPathOffsets is a helper function to create an scmp.InfoPathOffsets
 // instance from the current packet.
 func (rp *RtrPkt) mkInfoPathOffsets() scmp.Info {
-	if curr, err := rp.IFCurr(); curr == nil || err != nil {
-		return nil
+	var ifid uint16
+	if curr, err := rp.IFCurr(); curr != nil && err == nil {
+		ifid = uint16(*curr)
 	}
 	return &scmp.InfoPathOffsets{
 		InfoF: uint16(rp.CmnHdr.CurrInfoF), HopF: uint16(rp.CmnHdr.CurrHopF),
-		IfID: uint16(*rp.ifCurr), Ingress: rp.DirFrom == rcmn.DirExternal,
+		IfID: ifid, Ingress: rp.DirFrom == rcmn.DirExternal,
 	}
 }