zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-11 18:40:31 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Lay groundwork for allowing TCP Connections

Browse Source 
- enhance logging messages to call out UDP as appropriate
- make the variable name UDP-specific
This commit is contained in:
Brian Cunnie
2023-09-13 15:11:52 +02:00
parent d7526c6ca2
commit 49ea1d36a8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sslip.io-dns-server/main.go
View File

@@ -40,18 +40,18 @@ func main() {
log.Println(logmessage) log.Println(logmessage)
} }
conn, err := net.ListenUDP("udp", &net.UDPAddr{Port: *bindPort}) connUdp, err := net.ListenUDP("udp", &net.UDPAddr{Port: *bindPort})
// common err hierarchy: net.OpError → os.SyscallError → syscall.Errno // common err hierarchy: net.OpError → os.SyscallError → syscall.Errno
switch { switch {
case err == nil: case err == nil:
log.Printf("Successfully bound to all IPs, port %d.\n", *bindPort) log.Printf("Successfully bound via UDP to all IPs, port %d.\n", *bindPort)
wg.Add(1) wg.Add(1)
go readFrom(conn, &wg, x, *quiet) go readFrom(connUdp, &wg, x, *quiet)
case isErrorPermissionsError(err): case isErrorPermissionsError(err):
log.Printf("Try invoking me with `sudo` because I don't have permission to bind to port %d.\n", *bindPort) log.Printf("Try invoking me with `sudo` because I don't have permission to bind to port %d.\n", *bindPort)
log.Fatal(err.Error()) log.Fatal(err.Error())
case isErrorAddressAlreadyInUse(err): case isErrorAddressAlreadyInUse(err):
log.Printf("I couldn't bind to \"0.0.0.0:%d\" (INADDR_ANY, all interfaces), so I'll try to bind to each address individually.\n", *bindPort) log.Printf("I couldn't bind via UDP to \"0.0.0.0:%d\" (INADDR_ANY, all interfaces), so I'll try to bind to each address individually.\n", *bindPort)
ipCIDRs := listLocalIPCIDRs() ipCIDRs := listLocalIPCIDRs()
var boundIPsPorts, unboundIPs []string var boundIPsPorts, unboundIPs []string
for _, ipCIDR := range ipCIDRs { for _, ipCIDR := range ipCIDRs {
@@ -60,7 +60,7 @@ func main() {
log.Printf(`I couldn't parse the local interface "%s".`, ipCIDR) log.Printf(`I couldn't parse the local interface "%s".`, ipCIDR)
continue continue
} }
conn, err = net.ListenUDP("udp", &net.UDPAddr{ connUdp, err = net.ListenUDP("udp", &net.UDPAddr{
IP: ip, IP: ip,
Port: *bindPort, Port: *bindPort,
Zone: "", Zone: "",
@@ -69,16 +69,16 @@ func main() {
unboundIPs = append(unboundIPs, ip.String()) unboundIPs = append(unboundIPs, ip.String())
} else { } else {
wg.Add(1) wg.Add(1)
boundIPsPorts = append(boundIPsPorts, conn.LocalAddr().String()) boundIPsPorts = append(boundIPsPorts, connUdp.LocalAddr().String())
go readFrom(conn, &wg, x, *quiet) go readFrom(connUdp, &wg, x, *quiet)
} }
} }
if len(boundIPsPorts) == 0 { if len(boundIPsPorts) == 0 {
log.Fatalf("I couldn't bind to any IPs on port %d, so I'm exiting", *bindPort) log.Fatalf("I couldn't bind via UDP to any IPs on port %d, so I'm exiting", *bindPort)
} }
log.Printf(`I bound to the following IPs: "%s"`, strings.Join(boundIPsPorts, `", "`)) log.Printf(`I bound via UDP to the following IPs: "%s"`, strings.Join(boundIPsPorts, `", "`))
if len(unboundIPs) > 0 { if len(unboundIPs) > 0 {
log.Printf(`I couldn't bind to the following IPs: "%s"`, strings.Join(unboundIPs, `", "`)) log.Printf(`I couldn't bind via UDP to the following IPs: "%s"`, strings.Join(unboundIPs, `", "`))
} }
default: default:
log.Fatal(err.Error()) log.Fatal(err.Error())