ws: do not wait if last connection established

Author: tongyuantongyu

exec/http/main.go

@@ -5,10 +5,6 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"github.com/BurntSushi/toml"
-	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
-	"github.com/jellydator/ttlcache/v2"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -17,6 +13,11 @@ import (
 	"os"
 	"strconv"
 	"time"
+
+	"github.com/BurntSushi/toml"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+	"github.com/jellydator/ttlcache/v2"
 )
 
 var config Config
@@ -28,18 +29,18 @@ var (
 )
 
 func init() {
-	if len(os.Args) > 1 && os.Args[1] == "--version" {
-		fmt.Println(fullVersion)
-		os.Exit(0)
+	var configFile = "./config.toml"
+	if len(os.Args) > 1 {
+		if os.Args[1] == "--version" {
+			fmt.Println(fullVersion)
+			os.Exit(0)
+		}
+		configFile = os.Args[1]
 	}
 
 	log.Printf("network-measure HTTP %s, built at %s\n", fullVersion, buildDate)
 	config.SetDefault()
 
-	var configFile = "./config.toml"
-	if len(os.Args) > 1 {
-		configFile = os.Args[1]
-	}
 	if c, err := os.ReadFile(configFile); err == nil {
 		if err = toml.Unmarshal(c, &config); err != nil {
 			log.Printf("Failed loading config: %s, use default settings.\n", err)

exec/ws/main.go

@@ -265,8 +265,10 @@ func main() {
 	rand.Seed(time.Now().UnixNano())
 
 	retryCount := uint32(0)
+	established := false
 
 	for {
+		established = false
 		identifier := fmt.Sprintf("%s.%x.%x", config.Conn.Name, time.Now().Unix(), rand.Uint64())
 		header := http.Header{}
 		header.Set("User-Agent", getUserAgent())
@@ -325,6 +327,7 @@ func main() {
 		})
 
 		log.Printf("Connection to %s established.\n", config.Conn.Remote)
+		established = true
 
 	NextMsg:
 		for {
@@ -399,8 +402,10 @@ func main() {
 		}
 		icmp.GetICMPManager().Flush()
 
-		interval := time.Duration(config.Conn.Interval) * time.Second
-		log.Printf("Wait %s before retry...\n", interval.String())
-		time.Sleep(interval)
+		if !established {
+			interval := time.Duration(config.Conn.Interval) * time.Second
+			log.Printf("Wait %s before retry...\n", interval.String())
+			time.Sleep(interval)
+		}
 	}
 }