extend FAR_APPLY_ACTION to u16 to fit R16

free5gc · Oct 20, 2022 · 8892d6d · 8892d6d
1 parent ddf2950
commit 8892d6d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/attr_far.go b/attr_far.go
@@ -17,7 +17,7 @@ const (
 
 type FAR struct {
 	ID     uint32
-	Action uint8
+	Action uint16
 	Param  *ForwardParam
 	PDRIDs []uint16
 	BARID  *uint8
@@ -35,7 +35,7 @@ func DecodeFAR(b []byte) (*FAR, error) {
 		case FAR_ID:
 			far.ID = native.Uint32(b[n:])
 		case FAR_APPLY_ACTION:
-			far.Action = b[n]
+			far.Action = native.Uint16(b[n:])
 		case FAR_FORWARDING_PARAMETER:
 			param, err := DecodeForwardParam(b[n:])
 			if err != nil {

diff --git a/cmd/gogtp5g-tunnel/cmd_far.go b/cmd/gogtp5g-tunnel/cmd_far.go
@@ -35,7 +35,7 @@ func ParseFAROptions(args []string) ([]nl.Attr, error) {
 			}
 			attrs = append(attrs, nl.Attr{
 				Type:  gtp5gnl.FAR_APPLY_ACTION,
-				Value: nl.AttrU8(v),
+				Value: nl.AttrU16(v),
 			})
 		case "--hdr-creation":
 			// --hdr-creation <description> <o-teid> <peer-ipv4> <peer-port>

diff --git a/far.go b/far.go
@@ -10,7 +10,7 @@ import (
 
 // m LINK: ifindex
 // m FAR_ID: u32
-// m FAR_APPLY_ACTION: u8
+// m FAR_APPLY_ACTION: u16
 // m FAR_FORWARDING_PARAMETER {
 // m   FORWARDING_PARAMETER_OUTER_HEADER_CREATION {
 //       OUTER_HEADER_CREATION_DESCRIPTION: u16

diff --git a/far_test.go b/far_test.go
@@ -49,7 +49,7 @@ func TestCreateFAR(t *testing.T) {
 	attrs := []nl.Attr{
 		{
 			Type:  FAR_APPLY_ACTION,
-			Value: nl.AttrU8(1),
+			Value: nl.AttrU16(1),
 		},
 		{
 			Type: FAR_FORWARDING_PARAMETER,