refactor/fix: match dscp instead of tos (daeuniverse#294)

Co-authored-by: dae-bot[bot] <136105375+dae-bot[bot]@users.noreply.github.com>
douglarek · Aug 20, 2023 · c6557ce · c6557ce
1 parent 5c9e0cf
commit c6557ce
Show file tree

Hide file tree

Showing 16 changed files with 150 additions and 128 deletions.
diff --git a/cmd/honk.go b/cmd/honk.go
@@ -31,4 +31,4 @@ var (
 
 func init() {
 	rootCmd.AddCommand(honkCmd)
-}
+}
diff --git a/common/consts/ebpf.go b/common/consts/ebpf.go
@@ -52,7 +52,7 @@ const (
 	MatchType_IpVersion
 	MatchType_Mac
 	MatchType_ProcessName
-	MatchType_Tos
+	MatchType_Dscp
 	MatchType_Fallback
 	MatchType_MustRules
 

diff --git a/common/consts/routing.go b/common/consts/routing.go
@@ -22,7 +22,7 @@ const (
 	Function_IpVersion   = "ipversion"
 	Function_Mac         = "mac"
 	Function_ProcessName = "pname"
-	Function_Tos         = "tos"
+	Function_Dscp        = "dscp"
 
 	Function_QName    = "qname"
 	Function_QType    = "qtype"

diff --git a/component/routing/function_parser.go b/component/routing/function_parser.go
@@ -147,7 +147,7 @@ func UintParserFactory[T constraints.Unsigned](callback func(f *config_parser.Fu
 	return func(log *logrus.Logger, f *config_parser.Function, key string, paramValueGroup []string, overrideOutbound *Outbound) (err error) {
 		var values []T
 		for _, v := range paramValueGroup {
-			val, err := strconv.ParseUint(v, 10, 8*size)
+			val, err := strconv.ParseUint(v, 0, 8*size)
 			if err != nil {
 				return fmt.Errorf("cannot parse %v: %w", v, err)
 			}

diff --git a/control/control_plane.go b/control/control_plane.go
@@ -757,6 +757,7 @@ func (c *ControlPlane) Serve(readyChan chan<- bool, listener *Listener) (err err
 								Outbound: uint8(consts.OutboundControlPlaneRouting),
 								Pname:    [16]uint8{},
 								Pid:      0,
+								Dscp:     0,
 							}
 							realDst = pktDst
 							goto destRetrieved

diff --git a/control/dns_control.go b/control/dns_control.go
@@ -729,7 +729,7 @@ func (c *DnsController) dialSend(invokingDepth int, req *udpRequest, data []byte
 			"_qname":   qname,
 			"qtype":    qtype,
 			"pid":      req.routingResult.Pid,
-			"tos":      req.routingResult.Tos,
+			"dscp":     req.routingResult.Dscp,
 			"pname":    ProcessName2String(req.routingResult.Pname[:]),
 			"mac":      Mac2String(req.routingResult.Mac[:]),
 		}