Skip to content

Commit

Permalink
feat: add address to NIC
Browse files Browse the repository at this point in the history
  • Loading branch information
AkinoKaede committed May 28, 2023
1 parent 0472120 commit c8580cf
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 30 deletions.
75 changes: 46 additions & 29 deletions app/tun/config.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app/tun/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ option java_package = "com.v2ray.core.app.tun";
option java_multiple_files = true;


// import "app/router/routercommon/common.proto";
import "app/router/routercommon/common.proto";
import "common/net/packetaddr/config.proto";
import "common/protoext/extensions.proto";

Expand All @@ -21,4 +21,5 @@ message Config {
uint32 user_level = 3;
v2ray.core.net.packetaddr.PacketAddrType packet_encoding = 4;
string tag = 6;
repeated v2ray.core.app.router.routercommon.CIDR ips = 7;
}
32 changes: 32 additions & 0 deletions app/tun/nic.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package tun

import (
"github.com/v2fly/v2ray-core/v5/app/router/routercommon"
"gvisor.dev/gvisor/pkg/tcpip"
"gvisor.dev/gvisor/pkg/tcpip/network/ipv4"
"gvisor.dev/gvisor/pkg/tcpip/network/ipv6"
"gvisor.dev/gvisor/pkg/tcpip/stack"
)

Expand All @@ -17,3 +20,32 @@ func CreateNIC(nicID tcpip.NICID, linkEndpoint stack.LinkEndpoint) StackOption {
return nil
}
}

func AddProtocolAddress(id tcpip.NICID, ips []*routercommon.CIDR) StackOption {
return func(s *stack.Stack) error {
for _, ip := range ips {
tcpIpAddr := tcpip.AddrFrom4Slice(ip.Ip)
protocolAddress := tcpip.ProtocolAddress{
AddressWithPrefix: tcpip.AddressWithPrefix{
Address: tcpIpAddr,
PrefixLen: int(ip.Prefix),
},
}

switch tcpIpAddr.Len() {
case 4:
protocolAddress.Protocol = ipv4.ProtocolNumber
case 16:
protocolAddress.Protocol = ipv6.ProtocolNumber
default:
return newError("invalid IP address length:", tcpIpAddr.Len())
}

if err := s.AddProtocolAddress(id, protocolAddress, stack.AddressProperties{}); err != nil {
return newError("failed to add protocol address:", err)
}
}

return nil
}
}
1 change: 1 addition & 0 deletions app/tun/stack.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func (t *TUN) CreateStack(linkedEndpoint stack.LinkEndpoint) (*stack.Stack, erro
SetUDPHandler(t.ctx, t.dispatcher, t.policyManager, t.config),

CreateNIC(nicID, linkedEndpoint),
AddProtocolAddress(nicID, t.config.Ips),
}

for _, opt := range opts {
Expand Down

0 comments on commit c8580cf

Please sign in to comment.