Merge pull request v2ray#1685 from eycorsican/fix-port

fix port field parsing. fixes v2ray#1684
see123654 · May 15, 2019 · 2544c2f · 2544c2f
2 parents d66c389 + 778767a
commit 2544c2f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/infra/conf/common.go b/infra/conf/common.go
@@ -195,8 +195,11 @@ func (list *PortList) Build() *net.PortList {
 // UnmarshalJSON implements encoding/json.Unmarshaler.UnmarshalJSON
 func (list *PortList) UnmarshalJSON(data []byte) error {
 	var listStr string
+	var number uint32
 	if err := json.Unmarshal(data, &listStr); err != nil {
-		return newError("invalid port list: ", string(data)).Base(err)
+		if err2 := json.Unmarshal(data, &number); err2 != nil {
+			return newError("invalid port: ", string(data)).Base(err2)
+		}
 	}
 	rangelist := strings.Split(listStr, ",")
 	for _, rangeStr := range rangelist {
@@ -217,6 +220,9 @@ func (list *PortList) UnmarshalJSON(data []byte) error {
 			}
 		}
 	}
+	if number != 0 {
+		list.Range = append(list.Range, PortRange{From: uint32(number), To: uint32(number)})
+	}
 	return nil
 }
 

diff --git a/infra/conf/router_test.go b/infra/conf/router_test.go
@@ -48,6 +48,10 @@ func TestRouterConfig(t *testing.T) {
 							"type": "field",
 							"port": "53, 443, 1000-2000",
 							"outboundTag": "test"
+						},{
+							"type": "field",
+							"port": 123,
+							"outboundTag": "test"
 						}
 					]
 				},
@@ -114,6 +118,16 @@ func TestRouterConfig(t *testing.T) {
 							Tag: "test",
 						},
 					},
+					{
+						PortList: &net.PortList{
+							Range: []*net.PortRange{
+								{From: 123, To: 123},
+							},
+						},
+						TargetTag: &router.RoutingRule_Tag{
+							Tag: "test",
+						},
+					},
 				},
 			},
 		},