github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix nil address in inbound proxyman

pull/330/merge v2.16.1
Darien Raymond 2017-01-27 23:52:29 +01:00
parent 09e5ae7a4b
commit c5ecdc8078
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,11 +27,15 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
nl := p.Network() nl := p.Network()
pr := receiverConfig.PortRange pr := receiverConfig.PortRange
address := receiverConfig.Listen.AsAddress()
if address == nil {
address = net.AnyIP
}
for port := pr.From; port <= pr.To; port++ { for port := pr.From; port <= pr.To; port++ {
if nl.HasNetwork(net.Network_TCP) { if nl.HasNetwork(net.Network_TCP) {
log.Debug("Proxyman|DefaultInboundHandler: creating tcp worker on ", receiverConfig.Listen.AsAddress(), ":", port) log.Debug("Proxyman|DefaultInboundHandler: creating tcp worker on ", address, ":", port)
worker := &tcpWorker{ worker := &tcpWorker{
address: receiverConfig.Listen.AsAddress(), address: address,
port: net.Port(port), port: net.Port(port),
proxy: p, proxy: p,
stream: receiverConfig.StreamSettings, stream: receiverConfig.StreamSettings,
@ -46,7 +50,7 @@ func NewAlwaysOnInboundHandler(ctx context.Context, tag string, receiverConfig *
worker := &udpWorker{ worker := &udpWorker{
tag: tag, tag: tag,
proxy: p, proxy: p,
address: receiverConfig.Listen.AsAddress(), address: address,
port: net.Port(port), port: net.Port(port),
recvOrigDest: receiverConfig.ReceiveOriginalDestination, recvOrigDest: receiverConfig.ReceiveOriginalDestination,
} }

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

@ -73,6 +73,10 @@ func (h *DynamicInboundHandler) refresh() error {
h.worker2Recycle, h.worker = h.worker, h.worker2Recycle[:0] h.worker2Recycle, h.worker = h.worker, h.worker2Recycle[:0]
address := h.receiverConfig.Listen.AsAddress()
if address == nil {
address = v2net.AnyIP
}
for i := uint32(0); i < h.receiverConfig.AllocationStrategy.GetConcurrencyValue(); i++ { for i := uint32(0); i < h.receiverConfig.AllocationStrategy.GetConcurrencyValue(); i++ {
port := h.allocatePort() port := h.allocatePort()
p, err := proxy.CreateInboundHandler(h.ctx, h.proxyConfig) p, err := proxy.CreateInboundHandler(h.ctx, h.proxyConfig)
@ -84,7 +88,7 @@ func (h *DynamicInboundHandler) refresh() error {
if nl.HasNetwork(v2net.Network_TCP) { if nl.HasNetwork(v2net.Network_TCP) {
worker := &tcpWorker{ worker := &tcpWorker{
tag: h.tag, tag: h.tag,
address: h.receiverConfig.Listen.AsAddress(), address: address,
port: port, port: port,
proxy: p, proxy: p,
stream: h.receiverConfig.StreamSettings, stream: h.receiverConfig.StreamSettings,
@ -101,7 +105,7 @@ func (h *DynamicInboundHandler) refresh() error {
worker := &udpWorker{ worker := &udpWorker{
tag: h.tag, tag: h.tag,
proxy: p, proxy: p,
address: h.receiverConfig.Listen.AsAddress(), address: address,
port: port, port: port,
recvOrigDest: h.receiverConfig.ReceiveOriginalDestination, recvOrigDest: h.receiverConfig.ReceiveOriginalDestination,
} }