zishuo/nip
1
0
Fork 0
mirror of https://github.com/cunnie/sslip.io.git synced 2025-10-05 07:36:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Placate the linter

Browse Source 
- check for errors when I was previously skipping them
- use module `time` better

Drive-by: Shorter way to copy the new `index.html` to the 5 servers.
This commit is contained in:
Brian Cunnie
2024-11-17 07:22:37 -08:00
parent 8c89816eeb
commit 3ed466bc74
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/DEVELOPER.md
View File

@@ -124,8 +124,9 @@ Update the webservers with the HTML with new versions:
```bash
ssh nono.io curl -L -o /www/sslip.io/document_root/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html
ssh ns-aws.sslip.io curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html
ssh ns-azure.sslip.io curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html
for HOST in ns-{aws,azure,gce,hetzner,ovh}.sslip.io; do
ssh $HOST curl -L -o /var/nginx/sslip.io/index.html https://raw.githubusercontent.com/cunnie/sslip.io/main/k8s/document_root_sslip.io/index.html
done
```
Browse to <https://ci.nono.io/teams/main/pipelines/sslip.io> and check that everything is green.

2
integration_speed_test.go
View File

@@ -76,7 +76,7 @@ var _ = Describe("speed", func() {
Expect(err).ToNot(HaveOccurred())
Expect(bytesRead).To(Equal(52)) // The A record response "127.0.0.1" is 52 bytes
}
elapsedSeconds := time.Now().Sub(startTime).Seconds()
elapsedSeconds := time.Since(startTime).Seconds()
Eventually(serverSession.Err).Should(Say(`TypeA 127-0-0-1\.sslip\.io\. \? 127\.0\.0\.1`))
//fmt.Fprintf(os.Stderr, "Queries/second: %.2f\n", float64(numQueries)/elapsedSeconds)
Expect(float64(numQueries) / elapsedSeconds).Should(BeNumerically(">", minThroughput))

6
integration_test.go
View File

@@ -558,15 +558,13 @@ func squatOnTcp(port int) (squatters []net.Listener, err error) {
squatters = append(squatters, squatter)
}
addrCIDRs, err := net.InterfaceAddrs() // typical addrCIDR "10.9.9.161/24"
ipv6regex := regexp.MustCompile(`:`)
for _, addrCIDR := range addrCIDRs {
ip, _, err := net.ParseCIDR(addrCIDR.String())
if err != nil {
return squatters, err
}
ipv6, err := regexp.MatchString(`:`, addrCIDR.String())
if err != nil {
return squatters, err
}
ipv6 := ipv6regex.MatchString(addrCIDR.String())
// accommodate IPv6's requirements for brackets: "[::1]:1024" vs "127.0.0.1:1024"
if ipv6 {
squatter, err = net.Listen("tcp", "["+ip.String()+"]"+":"+strconv.Itoa(port))

12
main.go
View File

@@ -144,6 +144,10 @@ func readFromUDP(conn *net.UDPConn, x *xip.Xip, quiet bool) {
return
}
_, err = conn.WriteToUDP(response, addr)
if err != nil {
log.Println(err.Error())
return
}
if !quiet {
log.Printf("%v.%d %s", addr.IP, addr.Port, logMessage)
}
@@ -168,6 +172,10 @@ func readFromTCP(tcpListener *net.TCPListener, x *xip.Xip, quiet bool) {
}
remoteAddrPort := tcpConn.RemoteAddr().String()
addr, port, err := net.SplitHostPort(remoteAddrPort)
if err != nil {
log.Println(err.Error())
continue
}
go func() {
defer func(tcpConn *net.TCPConn) {
@@ -184,6 +192,10 @@ func readFromTCP(tcpListener *net.TCPListener, x *xip.Xip, quiet bool) {
binary.BigEndian.PutUint16(responseSizeBigEndianBytes, responseSize)
response = append(responseSizeBigEndianBytes, response...)
_, err = tcpConn.Write(response)
if err != nil {
log.Println(err.Error())
return
}
if !quiet {
log.Printf("%s.%s %s", addr, port, logMessage)
}