浏览代码

prefer Network over string

v2ray 9 年之前
父节点
当前提交
4bb1d822af
共有 2 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      app/router/rules/condition.go
  2. 5 5
      common/net/destination.go

+ 1 - 1
app/router/rules/condition.go

@@ -165,5 +165,5 @@ func NewNetworkMatcher(network *v2net.NetworkList) *NetworkMatcher {
 }
 
 func (this *NetworkMatcher) Apply(dest v2net.Destination) bool {
-	return this.network.HasNetwork(v2net.Network(dest.Network()))
+	return this.network.HasNetwork(dest.Network())
 }

+ 5 - 5
common/net/destination.go

@@ -2,7 +2,7 @@ package net
 
 // Destination represents a network destination including address and protocol (tcp / udp).
 type Destination interface {
-	Network() string  // Protocol of communication (tcp / udp)
+	Network() Network // Protocol of communication (tcp / udp)
 	Address() Address // Address of destination
 	Port() Port
 	String() string // String representation of the destination
@@ -28,8 +28,8 @@ type tcpDestination struct {
 	port    Port
 }
 
-func (dest *tcpDestination) Network() string {
-	return "tcp"
+func (dest *tcpDestination) Network() Network {
+	return TCPNetwork
 }
 
 func (dest *tcpDestination) Address() Address {
@@ -74,8 +74,8 @@ type udpDestination struct {
 	port    Port
 }
 
-func (dest *udpDestination) Network() string {
-	return "udp"
+func (dest *udpDestination) Network() Network {
+	return UDPNetwork
 }
 
 func (dest *udpDestination) Address() Address {