还是继续使用 lens2 signaler, local signaler还是测试不够充分

This commit is contained in:
shynome
2023-04-23 00:13:48 +08:00
parent 9eaaad33bb
commit 9c20bc26f2

View File

@@ -1,6 +1,7 @@
package main package main
import ( import (
"flag"
"io" "io"
"log" "log"
"net" "net"
@@ -9,18 +10,26 @@ import (
"github.com/lainio/err2/try" "github.com/lainio/err2/try"
"github.com/shynome/wgortc" "github.com/shynome/wgortc"
"github.com/shynome/wgortc/signaler/local" "github.com/shynome/wgortc/signaler/lens2"
"golang.zx2c4.com/wireguard/conn" "golang.zx2c4.com/wireguard/conn"
"golang.zx2c4.com/wireguard/device" "golang.zx2c4.com/wireguard/device"
"golang.zx2c4.com/wireguard/tun/netstack" "golang.zx2c4.com/wireguard/tun/netstack"
) )
func main() { func main() {
startServer() runServer := flag.Bool("server", false, "")
startClient() flag.Parse()
if *runServer {
dev := startServer()
<-dev.Wait()
// dev.Close()
return
} else {
startClient()
}
} }
var hub = local.NewHub() var signaler = "https://test:test@signaler.slive.fun"
var loglevel = device.LogLevelVerbose var loglevel = device.LogLevelVerbose
func startServer() (dev *device.Device) { func startServer() (dev *device.Device) {
@@ -31,9 +40,8 @@ func startServer() (dev *device.Device) {
) )
try.To(err) try.To(err)
var bind conn.Bind var bind conn.Bind
var signaler = local.NewServer() wrtcSignaler := lens2.NewSignaler("server", signaler)
hub.Register("server", signaler) bind = wgortc.NewBind(wrtcSignaler)
bind = wgortc.NewBind("server", signaler)
// bind = conn.NewDefaultBind() // bind = conn.NewDefaultBind()
dev = device.NewDevice(tdev, bind, device.NewLogger(loglevel, "server")) dev = device.NewDevice(tdev, bind, device.NewLogger(loglevel, "server"))
dev.IpcSet(`private_key=003ed5d73b55806c30de3f8a7bdab38af13539220533055e635690b8b87ad641 dev.IpcSet(`private_key=003ed5d73b55806c30de3f8a7bdab38af13539220533055e635690b8b87ad641
@@ -61,9 +69,8 @@ func startClient() (dev *device.Device, tnet *netstack.Net) {
[]netip.Addr{netip.MustParseAddr("8.8.8.8")}, []netip.Addr{netip.MustParseAddr("8.8.8.8")},
1420) 1420)
try.To(err) try.To(err)
var signaler = local.NewServer() wrtcSignaler := lens2.NewSignaler("client", signaler)
hub.Register("client", signaler) bind := wgortc.NewBind(wrtcSignaler)
bind := wgortc.NewBind("client", signaler)
dev = device.NewDevice(tun, bind, device.NewLogger(loglevel, "client")) dev = device.NewDevice(tun, bind, device.NewLogger(loglevel, "client"))
err = dev.IpcSet(`private_key=087ec6e14bbed210e7215cdc73468dfa23f080a1bfb8665b2fd809bd99d28379 err = dev.IpcSet(`private_key=087ec6e14bbed210e7215cdc73468dfa23f080a1bfb8665b2fd809bd99d28379
public_key=c4c8e984c5322c8184c72265b92b250fdb63688705f504ba003c88f03393cf28 public_key=c4c8e984c5322c8184c72265b92b250fdb63688705f504ba003c88f03393cf28