Skip to content

Commit df6138f

Browse files
committed
tunnel: m debug log & code comment
1 parent 2adaa49 commit df6138f

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

intra/tun2socks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ func Connect(fd, linkmtu, tunmtu int, ifaddrs, fakedns string, dtr DefaultDNS, b
8484
// as -1, ["10.111.222.1/24", "fd66:f83a:c650::0/120"], and ["10.111.222.3", "fd66:f83a:c650::3"]
8585
// respectively.
8686
func Connect2(fd, tunmtu int, dtr DefaultDNS, bdg Bridge) (t Tunnel, err error) {
87-
// usually, 10.111.222.0/24 / [fd66:f83a:c650::0]/120
87+
// usually, 10.111.222.0/24 / [fd66:f83a:c650::1]/120
8888
// github.com/celzero/rethink-app/blob/59aa0daae/app/src/main/java/com/celzero/bravedns/service/BraveVPNService.kt#L2813
89-
return Connect(fd, -1, tunmtu, "10.111.222.1/24,fd66:f83a:c650::0/120", "10.111.222.3,fd66:f83a:c650::3", nil, bdg)
89+
return Connect(fd, -1, tunmtu, "10.111.222.1/24,fd66:f83a:c650::1/120", "10.111.222.3,fd66:f83a:c650::3", nil, bdg)
9090
}
9191

9292
// Connect3 is like Connect2, but does not require passing a Default DNS resolver.

intra/tunnel.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ func NewTunnel(fd, tunmtu int, ifaddrs, fakedns string, dtr DefaultDNS, bdg Brid
157157
func NewTunnel2(fd, linkmtu, tunmtu int, ifaddrs, fakedns string, dtr DefaultDNS, bdg Bridge) (t Tunnel, err error) {
158158
defer core.Recover(core.Exit11, "i.newTunnel")
159159

160+
log.D("tun: <<< new >>>; start; fd: %d, tunmtu: %d, linkmtu: %d, ifaddrs: %s, fakedns: %s, dtr? %t, bdg? %t",
161+
fd, tunmtu, linkmtu, ifaddrs, fakedns, dtr != nil, bdg != nil)
162+
160163
if dtr == nil || core.IsNil(dtr) {
161164
dtr, err = NewBuiltinDefaultDNS()
162165
log.D("tun: using builtin default dns; err? %v", err)
@@ -262,7 +265,7 @@ func NewTunnel2(fd, linkmtu, tunmtu int, ifaddrs, fakedns string, dtr DefaultDNS
262265
}
263266
}
264267

265-
// usually, 10.111.222.0/24 / [fd66:f83a:c650::0]/120
268+
// usually, 10.111.222.0/24 / [fd66:f83a:c650::1]/120
266269
// github.com/celzero/rethink-app/blob/59aa0daae/app/src/main/java/com/celzero/bravedns/service/BraveVPNService.kt#L2813
267270
if len(src) <= 0 { // default
268271
src = []netip.Prefix{netip.MustParsePrefix("10.111.222.1/24"), netip.MustParsePrefix("fd66:f83a:c650::1/120")}

0 commit comments

Comments
 (0)