[test]

rule/port.go

@@ -1,15 +1,24 @@
 package rules
 
 import (
+	"fmt"
 	"strconv"
+	"strings"
 
 	C "github.com/Dreamacro/clash/constant"
 )
 
+type portReal struct {
+	portStart int
+	portEnd   int
+}
+
 type Port struct {
-	adapter  string
-	port     string
-	isSource bool
+	adapter   string
+	port      string
+	isSource  bool
+	portList  []portReal
+	ruleExtra *C.RuleExtra
 }
 
 func (p *Port) RuleType() C.RuleType {
@@ -21,9 +30,9 @@ func (p *Port) RuleType() C.RuleType {
 
 func (p *Port) Match(metadata *C.Metadata) bool {
 	if p.isSource {
-		return metadata.SrcPort == p.port
+		return p.matchPortReal(metadata.SrcPort)
 	}
-	return metadata.DstPort == p.port
+	return p.matchPortReal(metadata.DstPort)
 }
 
 func (p *Port) Adapter() string {
@@ -38,14 +47,79 @@ func (p *Port) ShouldResolveIP() bool {
 	return false
 }
 
-func NewPort(port string, adapter string, isSource bool) (*Port, error) {
-	_, err := strconv.ParseUint(port, 10, 16)
+func (p *Port) RuleExtra() *C.RuleExtra {
+	return p.ruleExtra
+}
+
+func (p *Port) matchPortReal(portRef string) bool {
+	port, err := strconv.Atoi(portRef)
 	if err != nil {
+		return false
+	}
+
+	var rs bool
+	for _, pr := range p.portList {
+		if pr.portEnd == -1 {
+			rs = port == pr.portStart
+		} else {
+			rs = port >= pr.portStart && port <= pr.portEnd
+		}
+		if rs {
+			return true
+		}
+	}
+	return false
+}
+
+func NewPort(port string, adapter string, isSource bool, ruleExtra *C.RuleExtra) (*Port, error) {
+	ports := strings.Split(port, "/")
+	if len(ports) > 28 {
+		return nil, fmt.Errorf("%s, too many ports to use, maximum support 28 ports", errPayload.Error())
+	}
+
+	var portList []portReal
+	for _, p := range ports {
+		if p == "" {
+			continue
+		}
+
+		subPorts := strings.Split(p, "-")
+		subPortsLen := len(subPorts)
+		if subPortsLen > 2 {
+			return nil, errPayload
+		}
+
+		portStart, err := strconv.Atoi(strings.Trim(subPorts[0], "[ ]"))
+		if err != nil || portStart < 0 || portStart > 65535 {
+			return nil, errPayload
+		}
+
+		if subPortsLen == 1 {
+			portList = append(portList, portReal{portStart, -1})
+		} else if subPortsLen == 2 {
+			portEnd, err1 := strconv.Atoi(strings.Trim(subPorts[1], "[ ]"))
+			if err1 != nil || portEnd < 0 || portEnd > 65535 {
+				return nil, errPayload
+			}
+
+			shouldReverse := portStart > portEnd
+			if shouldReverse {
+				portList = append(portList, portReal{portEnd, portStart})
+			} else {
+				portList = append(portList, portReal{portStart, portEnd})
+			}
+		}
+	}
+
+	if len(portList) == 0 {
 		return nil, errPayload
 	}
+
 	return &Port{
-		adapter:  adapter,
-		port:     port,
-		isSource: isSource,
+		adapter:   adapter,
+		port:      port,
+		isSource:  isSource,
+		portList:  portList,
+		ruleExtra: ruleExtra,
 	}, nil
 }