lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-30 05:56:54 -05:00
Code Issues Releases Wiki Activity

migrate NetworkList to []Network

Browse Source
This commit is contained in:
Darien Raymond 2018-11-20 16:58:26 +01:00
parent 7b80322b60
commit 769f770cf7
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
18 changed files with 167 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/proxyman/inbound/always.go
View File

@ -89,7 +89,7 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
}
for port := pr.From; port <= pr.To; port++ {
if nl.HasNetwork(net.Network_TCP) {
if net.HasNetwork(nl, net.Network_TCP) {
newError("creating stream worker on ", address, ":", port).AtDebug().WriteToLog()
worker := &tcpWorker{
@ -107,7 +107,7 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
h.workers = append(h.workers, worker)
}
if nl.HasNetwork(net.Network_UDP) {
if net.HasNetwork(nl, net.Network_UDP) {
worker := &udpWorker{
tag: tag,
proxy: p,

4
app/proxyman/inbound/dynamic.go
View File

@ -122,7 +122,7 @@ func (h *DynamicInboundHandler) refresh() error {
}
p := rawProxy.(proxy.Inbound)
nl := p.Network()
if nl.HasNetwork(net.Network_TCP) {
if net.HasNetwork(nl, net.Network_TCP) {
worker := &tcpWorker{
tag: h.tag,
address: address,
@ -142,7 +142,7 @@ func (h *DynamicInboundHandler) refresh() error {
workers = append(workers, worker)
}
if nl.HasNetwork(net.Network_UDP) {
if net.HasNetwork(nl, net.Network_UDP) {
worker := &udpWorker{
tag: h.tag,
proxy: p,

4
app/router/config.go
View File

@ -85,7 +85,9 @@ func (rr *RoutingRule) BuildCondition() (Condition, error) {
conds.Add(NewPortMatcher(*rr.PortRange))
}
if rr.NetworkList != nil {
if len(rr.Networks) > 0 {
conds.Add(NewNetworkMatcher(rr.Networks))
} else if rr.NetworkList != nil {
conds.Add(NewNetworkMatcher(rr.NetworkList.Network))
}

118
app/router/config.pb.go
View File

@ -374,9 +374,12 @@ type RoutingRule struct {
// List of GeoIPs for target IP address matching. If this entry exists, the cidr above will have no effect.
// GeoIP fields with the same country code are supposed to contain exactly same content. They will be merged during runtime.
// For customized GeoIPs, please leave country code empty.
Geoip []*GeoIP `protobuf:"bytes,10,rep,name=geoip,proto3" json:"geoip,omitempty"`
PortRange *net.PortRange `protobuf:"bytes,4,opt,name=port_range,json=portRange,proto3" json:"port_range,omitempty"`
NetworkList *net.NetworkList `protobuf:"bytes,5,opt,name=network_list,json=networkList,proto3" json:"network_list,omitempty"`
Geoip []*GeoIP `protobuf:"bytes,10,rep,name=geoip,proto3" json:"geoip,omitempty"`
PortRange *net.PortRange `protobuf:"bytes,4,opt,name=port_range,json=portRange,proto3" json:"port_range,omitempty"`
// List of networks. Deprecated. Use networks.
NetworkList *net.NetworkList `protobuf:"bytes,5,opt,name=network_list,json=networkList,proto3" json:"network_list,omitempty"` // Deprecated: Do not use.
// List of networks for matching.
Networks []net.Network `protobuf:"varint,13,rep,packed,name=networks,proto3,enum=v2ray.core.common.net.Network" json:"networks,omitempty"`
// List of CIDRs for source IP address matching.
SourceCidr []*CIDR `protobuf:"bytes,6,rep,name=source_cidr,json=sourceCidr,proto3" json:"source_cidr,omitempty"` // Deprecated: Do not use.
// List of GeoIPs for source IP address matching. If this entry exists, the source_cidr above will have no effect.
@ -480,6 +483,7 @@ func (m *RoutingRule) GetPortRange() *net.PortRange {
return nil
}
// Deprecated: Do not use.
func (m *RoutingRule) GetNetworkList() *net.NetworkList {
if m != nil {
return m.NetworkList
@ -487,6 +491,13 @@ func (m *RoutingRule) GetNetworkList() *net.NetworkList {
return nil
}
func (m *RoutingRule) GetNetworks() []net.Network {
if m != nil {
return m.Networks
}
return nil
}
// Deprecated: Do not use.
func (m *RoutingRule) GetSourceCidr() []*CIDR {
if m != nil {
@ -710,54 +721,55 @@ func init() {
}
var fileDescriptor_6b1608360690c5fc = []byte{
// 776 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xeb, 0x44,
0x10, 0x3e, 0x76, 0x7e, 0x4e, 0x3d, 0x76, 0x83, 0x59, 0x71, 0x90, 0x29, 0x14, 0x82, 0x55, 0x20,
0x12, 0xc8, 0x91, 0x52, 0xe0, 0x0e, 0x95, 0x26, 0x2d, 0x21, 0x02, 0x4a, 0xb4, 0x6d, 0xb9, 0x80,
0x8b, 0x68, 0xeb, 0x6c, 0x8d, 0x85, 0xb3, 0xbb, 0x5a, 0xaf, 0x4b, 0xf3, 0x0a, 0x3c, 0x0a, 0x12,
0x8f, 0xc4, 0xbb, 0xa0, 0xdd, 0x75, 0xda, 0x06, 0xd5, 0x10, 0x9d, 0xbb, 0x9d, 0xd9, 0x6f, 0x66,
0xbe, 0xf9, 0x85, 0x8f, 0xef, 0x46, 0x92, 0xac, 0x93, 0x94, 0xaf, 0x86, 0x29, 0x97, 0x74, 0x48,
0x84, 0x18, 0x4a, 0x5e, 0x29, 0x2a, 0x87, 0x29, 0x67, 0xb7, 0x79, 0x96, 0x08, 0xc9, 0x15, 0x47,
0xaf, 0x36, 0x38, 0x49, 0x13, 0x22, 0x44, 0x62, 0x31, 0x07, 0x47, 0xff, 0x32, 0x4f, 0xf9, 0x6a,
0xc5, 0xd9, 0x90, 0x51, 0x35, 0x14, 0x5c, 0x2a, 0x6b, 0x7c, 0xf0, 0x49, 0x33, 0x8a, 0x51, 0xf5,
0x3b, 0x97, 0xbf, 0x59, 0x60, 0xfc, 0x87, 0x03, 0xdd, 0x33, 0xbe, 0x22, 0x39, 0x43, 0x5f, 0x42,
0x5b, 0xad, 0x05, 0x8d, 0x9c, 0xbe, 0x33, 0xe8, 0x8d, 0xe2, 0xe4, 0xd9, 0xf8, 0x89, 0x05, 0x27,
0x57, 0x6b, 0x41, 0xb1, 0xc1, 0xa3, 0xb7, 0xa0, 0x73, 0x47, 0x8a, 0x8a, 0x46, 0x6e, 0xdf, 0x19,
0x78, 0xd8, 0x0a, 0xf1, 0x08, 0xda, 0x1a, 0x83, 0x3c, 0xe8, 0xcc, 0x0b, 0x92, 0xb3, 0xf0, 0x85,
0x7e, 0x62, 0x9a, 0xd1, 0xfb, 0xd0, 0x41, 0xb0, 0x89, 0x1a, 0xba, 0x68, 0x0f, 0xda, 0xdf, 0x54,
0x45, 0x11, 0xb6, 0xe2, 0x04, 0xda, 0x93, 0xd9, 0x19, 0x46, 0x3d, 0x70, 0x73, 0x61, 0x78, 0x04,
0xd8, 0xcd, 0x05, 0x7a, 0x1b, 0xba, 0x42, 0xd2, 0xdb, 0xfc, 0xde, 0x84, 0xd8, 0xc7, 0xb5, 0x14,
0xff, 0x02, 0x9d, 0x29, 0xe5, 0xb3, 0x39, 0xfa, 0x10, 0x82, 0x94, 0x57, 0x4c, 0xc9, 0xf5, 0x22,
0xe5, 0x4b, 0x9b, 0x82, 0x87, 0xfd, 0x5a, 0x37, 0xe1, 0x4b, 0x8a, 0x86, 0xd0, 0x4e, 0xf3, 0xa5,
0x8c, 0xdc, 0x7e, 0x6b, 0xe0, 0x8f, 0xde, 0x6d, 0xc8, 0x4e, 0x87, 0xc7, 0x06, 0x18, 0x9f, 0x80,
0x67, 0x9c, 0x7f, 0x9f, 0x97, 0x0a, 0x8d, 0xa0, 0x43, 0xb5, 0xab, 0xc8, 0x31, 0xe6, 0xef, 0x35,
0x98, 0x1b, 0x03, 0x6c, 0xa1, 0x71, 0x0a, 0x2f, 0xa7, 0x94, 0x5f, 0xe6, 0x8a, 0xee, 0xc2, 0xef,
0x0b, 0xe8, 0x2e, 0x4d, 0x45, 0x6a, 0x86, 0x87, 0xff, 0x59, 0x7f, 0x5c, 0x83, 0xe3, 0x09, 0xf8,
0x75, 0x10, 0xc3, 0xf3, 0xf3, 0x6d, 0x9e, 0xef, 0x37, 0xf3, 0xd4, 0x26, 0x1b, 0xa6, 0x7f, 0xb7,
0xc1, 0xc7, 0xbc, 0x52, 0x39, 0xcb, 0x70, 0x55, 0x50, 0x84, 0xa0, 0xa5, 0x48, 0x66, 0x59, 0x7e,
0xfb, 0x02, 0x6b, 0x01, 0x7d, 0x04, 0xfb, 0x37, 0xa4, 0x20, 0x2c, 0xcd, 0x59, 0xb6, 0xd0, 0xbf,
0x41, 0xfd, 0x1b, 0x3c, 0xa8, 0xaf, 0x48, 0xf6, 0x9a, 0x69, 0xa0, 0xe3, 0xba, 0x3b, 0xad, 0xff,
0xed, 0xce, 0xd8, 0x8d, 0x1c, 0xdb, 0x21, 0xdd, 0x94, 0x8c, 0xf2, 0x5c, 0x44, 0xb0, 0x4b, 0x53,
0x0c, 0x14, 0x9d, 0x00, 0xe8, 0x35, 0x59, 0x48, 0xc2, 0x32, 0x1a, 0xb5, 0xfb, 0xce, 0xc0, 0x1f,
0xf5, 0x9f, 0x1a, 0xda, 0x4d, 0x49, 0x18, 0x55, 0xc9, 0x9c, 0x4b, 0x85, 0x35, 0x0e, 0x7b, 0x62,
0xf3, 0x44, 0xe7, 0x10, 0xd4, 0x1b, 0xb4, 0x28, 0xf2, 0x52, 0x45, 0x1d, 0xe3, 0x22, 0x6e, 0x70,
0x71, 0x61, 0xa1, 0xba, 0x37, 0xd8, 0x67, 0x8f, 0x02, 0xfa, 0x1a, 0xfc, 0x92, 0x57, 0x32, 0xa5,
0x0b, 0x93, 0x77, 0x77, 0xb7, 0xbc, 0xc1, 0xda, 0x4c, 0x74, 0xf6, 0x27, 0x10, 0xd4, 0x1e, 0x6c,
0x11, 0xfc, 0x1d, 0x8a, 0x50, 0xc7, 0x9c, 0x9a, 0x52, 0x1c, 0x02, 0x54, 0x25, 0x95, 0x0b, 0xba,
0x22, 0x79, 0x11, 0xbd, 0xec, 0xb7, 0x06, 0x1e, 0xf6, 0xb4, 0xe6, 0x5c, 0x2b, 0xd0, 0x07, 0xe0,
0xe7, 0xec, 0x86, 0x57, 0x6c, 0x69, 0xda, 0xbd, 0x67, 0xfe, 0xa1, 0x56, 0xe9, 0x56, 0x1f, 0xc0,
0x9e, 0xb9, 0x21, 0x29, 0x2f, 0x22, 0xcf, 0xfc, 0x3e, 0xc8, 0xe3, 0x00, 0x40, 0x11, 0x99, 0x51,
0xa5, 0x6d, 0xe3, 0x0b, 0xd8, 0x1f, 0x6f, 0x86, 0xc4, 0x0c, 0x58, 0xf8, 0x64, 0xc0, 0xec, 0x78,
0x7d, 0x0a, 0x6f, 0xf2, 0x4a, 0xd9, 0x70, 0x25, 0x2d, 0x68, 0xaa, 0xb8, 0xdd, 0x55, 0x0f, 0x87,
0x9b, 0x8f, 0xcb, 0x5a, 0x1f, 0xff, 0xe5, 0x42, 0x77, 0x62, 0x6e, 0x25, 0xba, 0x86, 0x37, 0xec,
0x08, 0x2d, 0x4a, 0x25, 0x89, 0xa2, 0xd9, 0xba, 0xbe, 0x5f, 0x9f, 0x35, 0xd5, 0xd2, 0xde, 0x58,
0x3b, 0x7f, 0x97, 0xb5, 0x0d, 0xee, 0x2d, 0xb7, 0x64, 0x7d, 0x0b, 0x65, 0x55, 0xd0, 0x7a, 0x88,
0x9b, 0x6e, 0xe1, 0x93, 0x9d, 0xc1, 0x06, 0x8f, 0xbe, 0x83, 0xde, 0xe3, 0x96, 0x18, 0x0f, 0x76,
0xa2, 0x8f, 0x1a, 0x3c, 0x6c, 0x95, 0x05, 0x3f, 0x6e, 0x98, 0x16, 0xe3, 0x29, 0xf4, 0xb6, 0x69,
0xea, 0x53, 0x79, 0x5a, 0xce, 0x4a, 0x7b, 0x4b, 0xaf, 0x4b, 0x3a, 0x13, 0xa1, 0x83, 0x42, 0x08,
0x66, 0x62, 0x76, 0x7b, 0xc1, 0xd9, 0x0f, 0x44, 0xa5, 0xbf, 0x86, 0x2e, 0xea, 0x01, 0xcc, 0xc4,
0x8f, 0xec, 0x8c, 0xae, 0x08, 0x5b, 0x86, 0xad, 0xf1, 0x57, 0xf0, 0x4e, 0xca, 0x57, 0xcf, 0x53,
0x98, 0x3b, 0x3f, 0x77, 0xed, 0xeb, 0x4f, 0xf7, 0xd5, 0x4f, 0x23, 0x4c, 0xd6, 0xc9, 0x44, 0x23,
0x4e, 0x85, 0x30, 0xf9, 0x51, 0x79, 0xd3, 0x35, 0x6d, 0x3d, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff,
0x7c, 0x01, 0x52, 0xfa, 0xba, 0x06, 0x00, 0x00,
// 799 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x6d, 0x6f, 0xe3, 0x44,
0x10, 0x3e, 0x3b, 0x2f, 0x57, 0x8f, 0xdd, 0x60, 0x56, 0x1c, 0x32, 0x85, 0x83, 0x60, 0x1d, 0x10,
0x09, 0xe4, 0x48, 0x39, 0xe0, 0x03, 0x12, 0x2a, 0xd7, 0x14, 0x82, 0x05, 0x94, 0x68, 0x7b, 0xc7,
0x07, 0xf8, 0x10, 0x6d, 0x9d, 0xad, 0xb1, 0x70, 0x76, 0x57, 0xeb, 0xf5, 0x71, 0xf9, 0x0b, 0xfc,
0x07, 0xfe, 0x00, 0x12, 0xff, 0x11, 0xed, 0x4b, 0xda, 0x06, 0xce, 0x10, 0xf1, 0x6d, 0x67, 0xe6,
0x99, 0x99, 0x67, 0xe7, 0x0d, 0xde, 0x7f, 0x3e, 0x93, 0x64, 0x9b, 0x15, 0x7c, 0x33, 0x2d, 0xb8,
0xa4, 0x53, 0x22, 0xc4, 0x54, 0xf2, 0x56, 0x51, 0x39, 0x2d, 0x38, 0xbb, 0xae, 0xca, 0x4c, 0x48,
0xae, 0x38, 0x7a, 0xb0, 0xc3, 0x49, 0x9a, 0x11, 0x21, 0x32, 0x8b, 0x39, 0x79, 0xf4, 0x37, 0xf7,
0x82, 0x6f, 0x36, 0x9c, 0x4d, 0x19, 0x55, 0x53, 0xc1, 0xa5, 0xb2, 0xce, 0x27, 0x1f, 0x74, 0xa3,
0x18, 0x55, 0xbf, 0x72, 0xf9, 0x8b, 0x05, 0xa6, 0xbf, 0x79, 0x30, 0x3c, 0xe7, 0x1b, 0x52, 0x31,
0xf4, 0x29, 0xf4, 0xd5, 0x56, 0xd0, 0xc4, 0x1b, 0x7b, 0x93, 0xd1, 0x2c, 0xcd, 0x5e, 0x9a, 0x3f,
0xb3, 0xe0, 0xec, 0xe9, 0x56, 0x50, 0x6c, 0xf0, 0xe8, 0x35, 0x18, 0x3c, 0x27, 0x75, 0x4b, 0x13,
0x7f, 0xec, 0x4d, 0x02, 0x6c, 0x85, 0x74, 0x06, 0x7d, 0x8d, 0x41, 0x01, 0x0c, 0x96, 0x35, 0xa9,
0x58, 0x7c, 0x4f, 0x3f, 0x31, 0x2d, 0xe9, 0x8b, 0xd8, 0x43, 0xb0, 0xcb, 0x1a, 0xfb, 0xe8, 0x08,
0xfa, 0x5f, 0xb5, 0x75, 0x1d, 0xf7, 0xd2, 0x0c, 0xfa, 0xf3, 0xfc, 0x1c, 0xa3, 0x11, 0xf8, 0x95,
0x30, 0x3c, 0x22, 0xec, 0x57, 0x02, 0xbd, 0x0e, 0x43, 0x21, 0xe9, 0x75, 0xf5, 0xc2, 0xa4, 0x38,
0xc6, 0x4e, 0x4a, 0x7f, 0x82, 0xc1, 0x82, 0xf2, 0x7c, 0x89, 0xde, 0x85, 0xa8, 0xe0, 0x2d, 0x53,
0x72, 0xbb, 0x2a, 0xf8, 0xda, 0x7e, 0x21, 0xc0, 0xa1, 0xd3, 0xcd, 0xf9, 0x9a, 0xa2, 0x29, 0xf4,
0x8b, 0x6a, 0x2d, 0x13, 0x7f, 0xdc, 0x9b, 0x84, 0xb3, 0x37, 0x3b, 0x7e, 0xa7, 0xd3, 0x63, 0x03,
0x4c, 0x4f, 0x21, 0x30, 0xc1, 0xbf, 0xad, 0x1a, 0x85, 0x66, 0x30, 0xa0, 0x3a, 0x54, 0xe2, 0x19,
0xf7, 0xb7, 0x3a, 0xdc, 0x8d, 0x03, 0xb6, 0xd0, 0xb4, 0x80, 0xfb, 0x0b, 0xca, 0x2f, 0x2b, 0x45,
0x0f, 0xe1, 0xf7, 0x09, 0x0c, 0xd7, 0xa6, 0x22, 0x8e, 0xe1, 0xc3, 0x7f, 0xad, 0x3f, 0x76, 0xe0,
0x74, 0x0e, 0xa1, 0x4b, 0x62, 0x78, 0x7e, 0xbc, 0xcf, 0xf3, 0xed, 0x6e, 0x9e, 0xda, 0x65, 0xc7,
0xf4, 0xf7, 0x01, 0x84, 0x98, 0xb7, 0xaa, 0x62, 0x25, 0x6e, 0x6b, 0x8a, 0x10, 0xf4, 0x14, 0x29,
0x2d, 0xcb, 0xaf, 0xef, 0x61, 0x2d, 0xa0, 0xf7, 0xe0, 0xf8, 0x8a, 0xd4, 0x84, 0x15, 0x15, 0x2b,
0x57, 0xda, 0x1a, 0x39, 0x6b, 0x74, 0xa3, 0x7e, 0x4a, 0xca, 0xff, 0xf9, 0x0d, 0xf4, 0xd8, 0x75,
0xa7, 0xf7, 0x9f, 0xdd, 0x39, 0xf3, 0x13, 0xcf, 0x76, 0x48, 0x37, 0xa5, 0xa4, 0xbc, 0x12, 0x09,
0x1c, 0xd2, 0x14, 0x03, 0x45, 0xa7, 0x00, 0x7a, 0x4d, 0x56, 0x92, 0xb0, 0x92, 0x26, 0xfd, 0xb1,
0x37, 0x09, 0x67, 0xe3, 0xbb, 0x8e, 0x76, 0x53, 0x32, 0x46, 0x55, 0xb6, 0xe4, 0x52, 0x61, 0x8d,
0xc3, 0x81, 0xd8, 0x3d, 0x51, 0x0e, 0x91, 0xdb, 0xa0, 0x55, 0x5d, 0x35, 0x2a, 0x19, 0x98, 0x10,
0x69, 0x47, 0x88, 0x0b, 0x0b, 0xd5, 0xbd, 0x31, 0xc4, 0x43, 0x76, 0xab, 0x40, 0x9f, 0xc1, 0x91,
0x13, 0x9b, 0xe4, 0x78, 0xdc, 0x9b, 0x8c, 0xf6, 0xfb, 0xf5, 0xcf, 0x30, 0xf8, 0x06, 0x8f, 0xbe,
0x80, 0xb0, 0xe1, 0xad, 0x2c, 0xe8, 0xca, 0xd4, 0x6d, 0x78, 0x58, 0xdd, 0xc0, 0xfa, 0xcc, 0x75,
0xf5, 0x4e, 0x21, 0x72, 0x11, 0x6c, 0x11, 0xc3, 0x03, 0x8a, 0xe8, 0x72, 0x2e, 0x4c, 0x29, 0x1f,
0x02, 0xb4, 0x0d, 0x95, 0x2b, 0xba, 0x21, 0x55, 0x9d, 0xdc, 0x1f, 0xf7, 0x26, 0x01, 0x0e, 0xb4,
0xe6, 0x4b, 0xad, 0x40, 0xef, 0x40, 0x58, 0xb1, 0x2b, 0xde, 0xb2, 0xb5, 0x19, 0x97, 0x23, 0x63,
0x07, 0xa7, 0xd2, 0xa3, 0x72, 0x02, 0x47, 0xe6, 0x06, 0x15, 0xbc, 0x4e, 0x02, 0x63, 0xbd, 0x91,
0xcf, 0x22, 0x00, 0x45, 0x64, 0x49, 0x95, 0xf6, 0x4d, 0x2f, 0xe0, 0xf8, 0x6c, 0x37, 0x64, 0x66,
0x40, 0xe3, 0x3b, 0x03, 0x6a, 0xc7, 0xf3, 0x43, 0x78, 0x95, 0xb7, 0xca, 0xa6, 0x6b, 0x68, 0x4d,
0x0b, 0xc5, 0xed, 0xae, 0x07, 0x38, 0xde, 0x19, 0x2e, 0x9d, 0x3e, 0xfd, 0xd3, 0x87, 0xe1, 0xdc,
0xdc, 0x5a, 0xf4, 0x0c, 0x5e, 0xb1, 0x23, 0xb8, 0x6a, 0x94, 0x24, 0x8a, 0x96, 0x5b, 0x77, 0xff,
0x3e, 0xea, 0xaa, 0xa5, 0xbd, 0xd1, 0x76, 0x7e, 0x2f, 0x9d, 0x0f, 0x1e, 0xad, 0xf7, 0x64, 0x7d,
0x4b, 0x65, 0x5b, 0x53, 0xb7, 0x04, 0x5d, 0xb7, 0xf4, 0xce, 0xce, 0x61, 0x83, 0x47, 0xdf, 0xc0,
0xe8, 0x76, 0xcb, 0x4c, 0x04, 0xbb, 0x11, 0x8f, 0x3a, 0x22, 0xec, 0x95, 0x05, 0xdf, 0x6e, 0xa8,
0x16, 0xd3, 0x05, 0x8c, 0xf6, 0x69, 0xea, 0x53, 0xfb, 0xa4, 0xc9, 0x1b, 0x7b, 0x8b, 0x9f, 0x35,
0x34, 0x17, 0xb1, 0x87, 0x62, 0x88, 0x72, 0x91, 0x5f, 0x5f, 0x70, 0xf6, 0x1d, 0x51, 0xc5, 0xcf,
0xb1, 0x8f, 0x46, 0x00, 0xb9, 0xf8, 0x9e, 0x9d, 0xd3, 0x0d, 0x61, 0xeb, 0xb8, 0x77, 0xf6, 0x39,
0xbc, 0x51, 0xf0, 0xcd, 0xcb, 0x29, 0x2c, 0xbd, 0x1f, 0x87, 0xf6, 0xf5, 0x87, 0xff, 0xe0, 0x87,
0x19, 0x26, 0xdb, 0x6c, 0xae, 0x11, 0x4f, 0x84, 0x30, 0xff, 0xa3, 0xf2, 0x6a, 0x68, 0xda, 0xfa,
0xf8, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x46, 0xbc, 0x52, 0xfa, 0x06, 0x00, 0x00,
}

7
app/router/config.proto
View File

@ -80,7 +80,12 @@ message RoutingRule {
repeated GeoIP geoip = 10;
v2ray.core.common.net.PortRange port_range = 4;
v2ray.core.common.net.NetworkList network_list = 5;
// List of networks. Deprecated. Use networks.
v2ray.core.common.net.NetworkList network_list = 5 [deprecated = true];
// List of networks for matching.
repeated v2ray.core.common.net.Network networks = 13;
// List of CIDRs for source IP address matching.
repeated CIDR source_cidr = 6 [deprecated = true];

8
app/router/router_test.go
View File

@ -24,9 +24,7 @@ func TestSimpleRouter(t *testing.T) {
TargetTag: &RoutingRule_Tag{
Tag: "test",
},
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
},
},
}
@ -59,9 +57,7 @@ func TestSimpleBalancer(t *testing.T) {
TargetTag: &RoutingRule_BalancingTag{
BalancingTag: "balance",
},
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Networks: []net.Network{net.Network_TCP},
},
},
BalancingRule: []*BalancingRule{

12
common/net/network.go
View File

@ -1,11 +1,5 @@
package net
func (n Network) AsList() *NetworkList {
return &NetworkList{
Network: []Network{n},
}
}
func (n Network) SystemString() string {
switch n {
case Network_TCP:
@ -19,7 +13,7 @@ func (n Network) SystemString() string {
func HasNetwork(list []Network, network Network) bool {
for _, value := range list {
if string(value) == string(network) {
if value == network {
return true
}
}
@ -36,10 +30,6 @@ func (l NetworkList) HasNetwork(network Network) bool {
return false
}
func (l NetworkList) Get(idx int) Network {
return l.Network[idx]
}
// Size returns the number of networks in this network list.
func (l NetworkList) Size() int {
return len(l.Network)

73
proxy/dokodemo/config.pb.go
View File

@ -19,15 +19,19 @@ var _ = math.Inf
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
type Config struct {
Address *net.IPOrDomain `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
NetworkList *net.NetworkList `protobuf:"bytes,3,opt,name=network_list,json=networkList,proto3" json:"network_list,omitempty"`
Timeout uint32 `protobuf:"varint,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // Deprecated: Do not use.
FollowRedirect bool `protobuf:"varint,5,opt,name=follow_redirect,json=followRedirect,proto3" json:"follow_redirect,omitempty"`
UserLevel uint32 `protobuf:"varint,6,opt,name=user_level,json=userLevel,proto3" json:"user_level,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
Address *net.IPOrDomain `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
Port uint32 `protobuf:"varint,2,opt,name=port,proto3" json:"port,omitempty"`
// List of networks that the Dokodemo accepts.
// Deprecated. Use networks.
NetworkList *net.NetworkList `protobuf:"bytes,3,opt,name=network_list,json=networkList,proto3" json:"network_list,omitempty"` // Deprecated: Do not use.
// List of networks that the Dokodemo accepts.
Networks []net.Network `protobuf:"varint,7,rep,packed,name=networks,proto3,enum=v2ray.core.common.net.Network" json:"networks,omitempty"`
Timeout uint32 `protobuf:"varint,4,opt,name=timeout,proto3" json:"timeout,omitempty"` // Deprecated: Do not use.
FollowRedirect bool `protobuf:"varint,5,opt,name=follow_redirect,json=followRedirect,proto3" json:"follow_redirect,omitempty"`
UserLevel uint32 `protobuf:"varint,6,opt,name=user_level,json=userLevel,proto3" json:"user_level,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
func (m *Config) Reset() { *m = Config{} }
@ -69,6 +73,7 @@ func (m *Config) GetPort() uint32 {
return 0
}
// Deprecated: Do not use.
func (m *Config) GetNetworkList() *net.NetworkList {
if m != nil {
return m.NetworkList
@ -76,6 +81,13 @@ func (m *Config) GetNetworkList() *net.NetworkList {
return nil
}
func (m *Config) GetNetworks() []net.Network {
if m != nil {
return m.Networks
}
return nil
}
// Deprecated: Do not use.
func (m *Config) GetTimeout() uint32 {
if m != nil {
@ -107,25 +119,26 @@ func init() {
}
var fileDescriptor_de04411d7254f312 = []byte{
// 310 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4e, 0xc2, 0x40,
0x10, 0x87, 0xd3, 0x8a, 0x80, 0x8b, 0x7f, 0x92, 0x3d, 0x2d, 0x46, 0x12, 0xe4, 0x02, 0xf1, 0xb0,
0x4d, 0xf0, 0xe8, 0x0d, 0x30, 0xc6, 0x84, 0x28, 0xd9, 0x83, 0x07, 0x2f, 0xa4, 0xb6, 0x83, 0x69,
0xe8, 0xee, 0x90, 0xe9, 0x02, 0xf6, 0x05, 0x7c, 0x18, 0x9f, 0xd2, 0x74, 0xdb, 0x46, 0x63, 0x82,
0xb7, 0xd9, 0xdf, 0x7e, 0xf3, 0xcd, 0x64, 0xd8, 0xcd, 0x6e, 0x4c, 0x61, 0x2e, 0x23, 0xd4, 0x41,
0x84, 0x04, 0xc1, 0x86, 0xf0, 0x23, 0x0f, 0x62, 0x5c, 0x63, 0x0c, 0x1a, 0x83, 0x08, 0xcd, 0x2a,
0x79, 0x97, 0x1b, 0x42, 0x8b, 0xbc, 0x5b, 0xb3, 0x04, 0xd2, 0x71, 0xb2, 0xe6, 0x2e, 0x87, 0x7f,
0x34, 0x11, 0x6a, 0x8d, 0x26, 0x30, 0x60, 0x83, 0x30, 0x8e, 0x09, 0xb2, 0xac, 0x74, 0xfc, 0x07,
0x1a, 0xb0, 0x7b, 0xa4, 0x75, 0x09, 0x0e, 0x3e, 0x7d, 0xd6, 0x9c, 0xba, 0xe9, 0xfc, 0x8e, 0xb5,
0x2a, 0x89, 0xf0, 0xfa, 0xde, 0xa8, 0x33, 0xbe, 0x96, 0xbf, 0x36, 0x29, 0x0d, 0xd2, 0x80, 0x95,
0x8f, 0x8b, 0x67, 0x9a, 0xa1, 0x0e, 0x13, 0xa3, 0xea, 0x0e, 0xce, 0x59, 0x63, 0x83, 0x64, 0x85,
0xdf, 0xf7, 0x46, 0x67, 0xca, 0xd5, 0xfc, 0x9e, 0x9d, 0x56, 0xc3, 0x96, 0x69, 0x92, 0x59, 0x71,
0xe4, 0xac, 0x83, 0x03, 0xd6, 0xa7, 0x12, 0x9d, 0x27, 0x99, 0x55, 0x1d, 0xf3, 0xf3, 0xe0, 0x57,
0xac, 0x65, 0x13, 0x0d, 0xb8, 0xb5, 0xa2, 0x51, 0xd8, 0x27, 0xbe, 0xf0, 0x54, 0x1d, 0xf1, 0x21,
0xbb, 0x58, 0x61, 0x9a, 0xe2, 0x7e, 0x49, 0x10, 0x27, 0x04, 0x91, 0x15, 0xc7, 0x7d, 0x6f, 0xd4,
0x56, 0xe7, 0x65, 0xac, 0xaa, 0x94, 0xf7, 0x18, 0xdb, 0x66, 0x40, 0xcb, 0x14, 0x76, 0x90, 0x8a,
0xa6, 0xdb, 0xf3, 0xa4, 0x48, 0xe6, 0x45, 0x30, 0x79, 0x60, 0xbd, 0x08, 0xb5, 0x3c, 0x78, 0xfb,
0x85, 0xf7, 0xda, 0xae, 0xeb, 0x2f, 0xbf, 0xfb, 0x32, 0x56, 0x61, 0x2e, 0xa7, 0x05, 0xb7, 0x70,
0xdc, 0xac, 0xfa, 0x7b, 0x6b, 0xba, 0xc3, 0xde, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x33, 0x8e,
0x70, 0xce, 0xf3, 0x01, 0x00, 0x00,
// 331 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4f, 0xea, 0x40,
0x10, 0xc7, 0xd3, 0xc2, 0x03, 0xde, 0xf2, 0x1e, 0x26, 0x7b, 0x5a, 0x8c, 0x98, 0xca, 0x85, 0xc6,
0xc3, 0x36, 0xa9, 0x37, 0xbd, 0x01, 0x89, 0x21, 0x21, 0x4a, 0xf6, 0xe0, 0xc1, 0x0b, 0xa9, 0xed,
0x60, 0x1a, 0xba, 0x3b, 0x64, 0xbb, 0x80, 0x7c, 0x25, 0x3f, 0x88, 0x9f, 0xcb, 0x74, 0xdb, 0xaa,
0x31, 0x81, 0xdb, 0xec, 0x7f, 0x7f, 0xfb, 0x9b, 0xd9, 0x0c, 0xb9, 0xde, 0x85, 0x3a, 0x3a, 0xf0,
0x18, 0x65, 0x10, 0xa3, 0x86, 0x60, 0xa3, 0xf1, 0xed, 0x10, 0x24, 0xb8, 0xc6, 0x04, 0x24, 0x06,
0x31, 0xaa, 0x55, 0xfa, 0xca, 0x37, 0x1a, 0x0d, 0xd2, 0x7e, 0xcd, 0x6a, 0xe0, 0x96, 0xe3, 0x35,
0x77, 0x3e, 0xfa, 0xa5, 0x89, 0x51, 0x4a, 0x54, 0x81, 0x02, 0x13, 0x44, 0x49, 0xa2, 0x21, 0xcf,
0x4b, 0xc7, 0x29, 0x50, 0x81, 0xd9, 0xa3, 0x5e, 0x97, 0xe0, 0xf0, 0xc3, 0x25, 0xad, 0x89, 0xed,
0x4e, 0xef, 0x48, 0xbb, 0x92, 0x30, 0xc7, 0x73, 0xfc, 0x6e, 0x78, 0xc5, 0x7f, 0x4c, 0x52, 0x1a,
0xb8, 0x02, 0xc3, 0x67, 0x8b, 0x47, 0x3d, 0x45, 0x19, 0xa5, 0x4a, 0xd4, 0x2f, 0x28, 0x25, 0xcd,
0x0d, 0x6a, 0xc3, 0x5c, 0xcf, 0xf1, 0xff, 0x0b, 0x5b, 0xd3, 0x19, 0xf9, 0x57, 0x35, 0x5b, 0x66,
0x69, 0x6e, 0x58, 0xc3, 0x5a, 0x87, 0x47, 0xac, 0x0f, 0x25, 0x3a, 0x4f, 0x73, 0x33, 0x76, 0x99,
0x23, 0xba, 0xea, 0x3b, 0xa0, 0xb7, 0xa4, 0x53, 0x1d, 0x73, 0xd6, 0xf6, 0x1a, 0x7e, 0x2f, 0xbc,
0x3c, 0xad, 0x11, 0x5f, 0x3c, 0xbd, 0x20, 0x6d, 0x93, 0x4a, 0xc0, 0xad, 0x61, 0xcd, 0x62, 0x3a,
0x6b, 0xaf, 0x23, 0x3a, 0x22, 0x67, 0x2b, 0xcc, 0x32, 0xdc, 0x2f, 0x35, 0x24, 0xa9, 0x86, 0xd8,
0xb0, 0x3f, 0x9e, 0xe3, 0x77, 0x44, 0xaf, 0x8c, 0x45, 0x95, 0xd2, 0x01, 0x21, 0xdb, 0x1c, 0xf4,
0x32, 0x83, 0x1d, 0x64, 0xac, 0x65, 0xff, 0xf9, 0xb7, 0x48, 0xe6, 0x45, 0x30, 0xbe, 0x27, 0x83,
0x18, 0x25, 0x3f, 0xba, 0xbb, 0x85, 0xf3, 0xdc, 0xa9, 0xeb, 0x77, 0xb7, 0xff, 0x14, 0x8a, 0xe8,
0xc0, 0x27, 0x05, 0xb7, 0xb0, 0xdc, 0xb4, 0xba, 0x7b, 0x69, 0xd9, 0xc5, 0xdc, 0x7c, 0x06, 0x00,
0x00, 0xff, 0xff, 0xec, 0xf1, 0xbb, 0x96, 0x33, 0x02, 0x00, 0x00,
}

8
proxy/dokodemo/config.proto
View File

@ -12,7 +12,13 @@ import "v2ray.com/core/common/net/network.proto";
message Config {
v2ray.core.common.net.IPOrDomain address = 1;
uint32 port = 2;
v2ray.core.common.net.NetworkList network_list = 3;
// List of networks that the Dokodemo accepts.
// Deprecated. Use networks.
v2ray.core.common.net.NetworkList network_list = 3 [deprecated = true];
// List of networks that the Dokodemo accepts.
repeated v2ray.core.common.net.Network networks = 7;
uint32 timeout = 4 [deprecated = true];
bool follow_redirect = 5;
uint32 user_level = 6;

12
proxy/dokodemo/dokodemo.go
View File

@ -38,7 +38,7 @@ type DokodemoDoor struct {
// Init initializes the DokodemoDoor instance with necessary parameters.
func (d *DokodemoDoor) Init(config *Config, pm policy.Manager) error {
if config.NetworkList == nil || config.NetworkList.Size() == 0 {
if (config.NetworkList == nil || config.NetworkList.Size() == 0) && len(config.Networks) == 0 {
return newError("no network specified")
}
d.config = config
@ -49,8 +49,13 @@ func (d *DokodemoDoor) Init(config *Config, pm policy.Manager) error {
return nil
}
func (d *DokodemoDoor) Network() net.NetworkList {
return *(d.config.NetworkList)
// Network implements proxy.Inbound.
func (d *DokodemoDoor) Network() []net.Network {
if len(d.config.Networks) > 0 {
return d.config.Networks
}
return d.config.NetworkList.Network
}
func (d *DokodemoDoor) policy() policy.Session {
@ -66,6 +71,7 @@ type hasHandshakeAddress interface {
HandshakeAddress() net.Address
}
// Process implements proxy.Inbound.
func (d *DokodemoDoor) Process(ctx context.Context, network net.Network, conn internet.Connection, dispatcher routing.Dispatcher) error {
newError("processing connection from: ", conn.RemoteAddr()).AtDebug().WriteToLog(session.ExportIDToError(ctx))
dest := net.Destination{

6
proxy/http/server.go
View File

@ -52,10 +52,8 @@ func (s *Server) policy() policy.Session {
return p
}
func (*Server) Network() net.NetworkList {
return net.NetworkList{
Network: []net.Network{net.Network_TCP},
}
func (*Server) Network() []net.Network {
return []net.Network{net.Network_TCP}
}
func parseHost(rawHost string, defaultPort net.Port) (net.Destination, error) {

6
proxy/mtproto/server.go
View File

@ -60,10 +60,8 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
}, nil
}
func (s *Server) Network() net.NetworkList {
return net.NetworkList{
Network: []net.Network{net.Network_TCP},
}
func (s *Server) Network() []net.Network {
return []net.Network{net.Network_TCP}
}
func isValidConnectionType(c [4]byte) bool {

4
proxy/proxy.go
View File

@ -17,8 +17,8 @@ import (
// An Inbound processes inbound connections.
type Inbound interface {
// Network returns a list of network that this inbound supports. Connections with not-supported networks will not be passed into Process().
Network() net.NetworkList
// Network returns a list of networks that this inbound supports. Connections with not-supported networks will not be passed into Process().
Network() []net.Network
// Process processes a connection of given network. If necessary, the Inbound can dispatch the connection to an Outbound.
Process(context.Context, net.Network, internet.Connection, routing.Dispatcher) error

12
proxy/shadowsocks/server.go
View File

@ -47,15 +47,13 @@ func NewServer(ctx context.Context, config *ServerConfig) (*Server, error) {
return s, nil
}
func (s *Server) Network() net.NetworkList {
list := net.NetworkList{
Network: s.config.Network,
}
if len(list.Network) == 0 {
list.Network = append(list.Network, net.Network_TCP)
func (s *Server) Network() []net.Network {
list := s.config.Network
if len(list) == 0 {
list = append(list, net.Network_TCP)
}
if s.config.UdpEnabled {
list.Network = append(list.Network, net.Network_UDP)
list = append(list, net.Network_UDP)
}
return list
}

8
proxy/socks/server.go
View File

@ -51,12 +51,10 @@ func (s *Server) policy() policy.Session {
}
// Network implements proxy.Inbound.
func (s *Server) Network() net.NetworkList {
list := net.NetworkList{
Network: []net.Network{net.Network_TCP},
}
func (s *Server) Network() []net.Network {
list := []net.Network{net.Network_TCP}
if s.config.UdpEnabled {
list.Network = append(list.Network, net.Network_UDP)
list = append(list, net.Network_UDP)
}
return list
}

6
proxy/vmess/inbound/inbound.go
View File

@ -145,10 +145,8 @@ func (h *Handler) Close() error {
}
// Network implements proxy.Inbound.Network().
func (*Handler) Network() net.NetworkList {
return net.NetworkList{
Network: []net.Network{net.Network_TCP},
}
func (*Handler) Network() []net.Network {
return []net.Network{net.Network_TCP}
}
func (h *Handler) GetUser(email string) *protocol.MemoryUser {

4
testing/mocks/proxy.go
View File

@ -38,9 +38,9 @@ func (m *ProxyInbound) EXPECT() *ProxyInboundMockRecorder {
}
// Network mocks base method
func (m *ProxyInbound) Network() net.NetworkList {
func (m *ProxyInbound) Network() []net.Network {
ret := m.ctrl.Call(m, "Network")
ret0, _ := ret[0].(net.NetworkList)
ret0, _ := ret[0].([]net.Network)
return ret0
}

24
testing/scenarios/command_test.go
View File

@ -71,11 +71,9 @@ func TestCommanderRemoveHandler(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP),
}),
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
Networks: []net.Network{net.Network_TCP},
}),
},
{
@ -85,11 +83,9 @@ func TestCommanderRemoveHandler(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP),
}),
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
Networks: []net.Network{net.Network_TCP},
}),
},
},
@ -218,11 +214,9 @@ func TestCommanderAddRemoveUser(t *testing.T) {
Listen: net.NewIPOrDomain(net.LocalHostIP),
}),
ProxySettings: serial.ToTypedMessage(&dokodemo.Config{
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
NetworkList: &net.NetworkList{
Network: []net.Network{net.Network_TCP},
},
Address: net.NewIPOrDomain(dest.Address),
Port: uint32(dest.Port),
Networks: []net.Network{net.Network_TCP},
}),
},
},