fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-05 07:50:24 +08:00
Code Activity

优化代码结构，router增加ttl

Browse Source
This commit is contained in:
源文雨
2022-04-15 15:41:09 +08:00
parent dcaff382bf
commit 826c89c678
9 changed files with 152 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
upper/services/tunnel/tunnel_test.go
View File

@@ -27,10 +27,34 @@ func TestTunnel(t *testing.T) {
t.Log("peer priv key:", hex.EncodeToString(peerpk.Private()[:]))
t.Log("peer publ key:", hex.EncodeToString(peerpk.Public()[:]))
m := link.NewMe(selfpk.Private(), "192.168.1.2/32", "127.0.0.1:1236", nil, 1, 1, 4096)
m.AddPeer("192.168.1.3", peerpk.Public(), "127.0.0.1:1237", []string{"192.168.1.3/32"}, nil, 0, 0, false, false)
p := link.NewMe(peerpk.Private(), "192.168.1.3/32", "127.0.0.1:1237", nil, 1, 1, 4096)
p.AddPeer("192.168.1.2", selfpk.Public(), "127.0.0.1:1236", []string{"192.168.1.2/32"}, nil, 0, 0, false, false)
m := link.NewMe(&link.MyConfig{
MyIPwithMask: "192.168.1.2/32",
MyEndpoint: "127.0.0.1:1236",
PrivateKey: selfpk.Private(),
SrcPort: 1,
DstPort: 1,
MTU: 4096,
})
m.AddPeer(&link.PeerConfig{
PeerIP: "192.168.1.3",
EndPoint: "127.0.0.1:1237",
AllowedIPs: []string{"192.168.1.3/32"},
PubicKey: peerpk.Public(),
})
p := link.NewMe(&link.MyConfig{
MyIPwithMask: "192.168.1.3/32",
MyEndpoint: "127.0.0.1:1237",
PrivateKey: peerpk.Private(),
SrcPort: 1,
DstPort: 1,
MTU: 4096,
})
p.AddPeer(&link.PeerConfig{
PeerIP: "192.168.1.2",
EndPoint: "127.0.0.1:1236",
AllowedIPs: []string{"192.168.1.2/32"},
PubicKey: selfpk.Public(),
})
tunnme, err := Create(&m, "192.168.1.3")
if err != nil {
t.Fatal(err)

30
upper/services/wg/wg.go
View File

@@ -65,7 +65,7 @@ func (wg *WG) Stop() {
_ = wg.me.Close()
}
func (wg *WG) init(srcport, destport, mtu uint16) {
func (wg *WG) init(srcport, dstport, mtu uint16) {
cidrsmap := make(map[string]bool, 32)
_, mysubnet, err := net.ParseCIDR(wg.c.SubNet)
if err != nil {
@@ -89,13 +89,15 @@ func (wg *WG) init(srcport, destport, mtu uint16) {
i++
}
wg.me = link.NewMe(
&wg.key,
wg.c.IP+"/32",
wg.c.EndPoint,
lower.NewNIC(wg.c.IP, wg.c.SubNet, fmt.Sprintf("%d", mtu), cidrs...),
srcport, destport, mtu,
)
wg.me = link.NewMe(&link.MyConfig{
MyIPwithMask: wg.c.IP + "/32",
MyEndpoint: wg.c.EndPoint,
PrivateKey: &wg.key,
NIC: lower.NewNIC(wg.c.IP, wg.c.SubNet, fmt.Sprintf("%d", mtu), cidrs...),
SrcPort: srcport,
DstPort: dstport,
MTU: mtu,
})
for _, peer := range wg.c.Peers {
var peerkey [32]byte
@@ -107,6 +109,16 @@ func (wg *WG) init(srcport, destport, mtu uint16) {
if n != 32 {
panic("peer public key length is not 32")
}
wg.me.AddPeer(peer.IP, &peerkey, peer.EndPoint, peer.AllowedIPs, peer.QueryList, peer.KeepAliveSeconds, peer.QuerySeconds, peer.AllowTrans, true)
wg.me.AddPeer(&link.PeerConfig{
PeerIP: peer.IP,
EndPoint: peer.EndPoint,
AllowedIPs: peer.AllowedIPs,
Querys: peer.QueryList,
PubicKey: &peerkey,
KeepAliveDur: peer.KeepAliveSeconds,
QueryTick: peer.QuerySeconds,
AllowTrans: peer.AllowTrans,
NoPipe: true,
})
}
}