Signed-off-by: hengyoush <hengyoush1@163.com>

hengyoush · hengyoush · commit 02c499a5fef1 · 2023-05-15T22:55:15.000+08:00
resolve conflict

Signed-off-by: hengyoush &lt;hengyoush1@163.com&gt;
diff --git a/exec/network/tc/network_tc.go b/exec/network/tc/network_tc.go
@@ -91,7 +91,7 @@ func startNet(ctx context.Context, netInterface, classRule, localPort, remotePor
 			return spec.ResponseFailWithFlags(spec.ParameterIllegal, "remote-port", remotePort, err)
 		}
 	}
-	if excludePort != "" {
+	if excludePort != "" { 
 		excludePortRanges, err = getExcludePortRanges(ctx, excludePort, ignorePeerPorts, cl)
 		if err != nil {
 			return spec.ResponseFailWithFlags(spec.ParameterIllegal, "exclude-port", excludePort, err)

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func startNet(ctx context.Context, netInterface, classRule, localPort, remotePor`
`91`	`91`	`return spec.ResponseFailWithFlags(spec.ParameterIllegal, "remote-port", remotePort, err)`
`92`	`92`	`}`
`93`	`93`	`}`
`94`		`- if excludePort != "" {`
	`94`	`+ if excludePort != "" {`
`95`	`95`	`excludePortRanges, err = getExcludePortRanges(ctx, excludePort, ignorePeerPorts, cl)`
`96`	`96`	`if err != nil {`
`97`	`97`	`return spec.ResponseFailWithFlags(spec.ParameterIllegal, "exclude-port", excludePort, err)`