Minor fixes

Author: tongyuantongyu

api.ts

@@ -98,7 +98,7 @@ export interface MtrPEntry {
 
 export interface MtrP {
   resolved: string; // ip selected to mtr
-  data: MtrPEntry[][] | null;
+  data: (MtrPEntry[] | null)[];
 }
 
 

icmp/icmp.go

@@ -128,9 +128,11 @@ type ICMPManager struct {
 	ctx context.Context
 	// function to call to stop the manager
 	cancel context.CancelFunc
-	// icmp packet conn of related network
+	// icmp packet conn and mutex of related network
 	pConn4 *icmp.PacketConn
+	lc4    sync.Mutex
 	pConn6 *icmp.PacketConn
+	lc6    sync.Mutex
 }
 
 var manager *ICMPManager
@@ -425,15 +427,19 @@ func (mgr *ICMPManager) Issue(ip net.Addr, ttl int, timeout time.Duration) (deli
 	}, timeout)
 
 	if v4 {
+		mgr.lc4.Lock()
 		if err := mgr.pConn4.IPv4PacketConn().SetTTL(ttl); err != nil {
 			return nil
 		}
 		_, _ = mgr.pConn4.WriteTo(msg, ipAddr)
+		mgr.lc4.Unlock()
 	} else {
+		mgr.lc6.Lock()
 		if err := mgr.pConn6.IPv6PacketConn().SetHopLimit(ttl); err != nil {
 			return nil
 		}
 		_, _ = mgr.pConn6.WriteTo(msg, ipAddr)
+		mgr.lc6.Unlock()
 	}
 
 	return

main.go

@@ -50,13 +50,15 @@ func jsonResult(c *gin.Context, r interface{}, e error) {
 
 func verifyStamp(c *gin.Context, timeStamp, nonce uint64) bool {
 	if time.Since(time.Unix(int64(timeStamp), 0)) > 60*time.Second {
-		c.AbortWithStatus(http.StatusUnauthorized)
+		c.String(http.StatusUnauthorized, "Stamp timeout")
+		c.Abort()
 		return false
 	}
 
 	nonceString := strconv.FormatUint(nonce, 16)
 	if _, err := nonceMap.Get(nonceString); err != ttlcache.ErrNotFound {
-		c.AbortWithStatus(http.StatusUnauthorized)
+		c.String(http.StatusUnauthorized, "Nonce already used")
+		c.Abort()
 		return false
 	}
 
@@ -174,12 +176,16 @@ func verify(c *gin.Context) {
 	sign := c.GetHeader("X-Signature")
 	hexSign, err := hex.DecodeString(sign)
 	if sign == "" || err != nil {
-		c.AbortWithStatus(http.StatusUnauthorized)
+		c.String(http.StatusUnauthorized, "Missing signature")
+		c.Abort()
 		return
 	}
 
-	if !hmac.Equal(hexSign, h.Sum(body)) {
-		c.AbortWithStatus(http.StatusUnauthorized)
+	h.Write(body)
+
+	if !hmac.Equal(hexSign, h.Sum(nil)) {
+		c.String(http.StatusUnauthorized, "Invalid signature")
+		c.Abort()
 		return
 	}
 
@@ -191,7 +197,8 @@ func limit(enable bool) gin.HandlerFunc {
 		if enable {
 			c.Next()
 		} else {
-			c.AbortWithStatus(http.StatusForbidden)
+			c.String(http.StatusForbidden, "API not enabled")
+			c.Abort()
 			return
 		}
 	}

mtr.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	lru "github.com/hashicorp/golang-lru"
 	"net"
 	"network-measure/icmp"
@@ -42,6 +41,7 @@ func rDNSLookup(ip string) string {
 }
 
 type MTRResult struct {
+	Probe  uint64
 	Hop    uint64
 	Result *icmp.Result
 }
@@ -79,26 +79,34 @@ func mtr(q *MtrQ) (*MtrP, error) {
 
 	r := MtrP{
 		Resolved: addr.String(),
-		Data:     make([][]MtrPEntry, q.MaxHop),
+		Data:     make([][]MtrPEntry, q.Times),
+	}
+
+	for i := uint64(0); i < q.Times; i++ {
+		r.Data[i] = make([]MtrPEntry, q.MaxHop)
 	}
 
 	resultPipe := make(chan MTRResult)
+	finishPipe := make(chan struct{})
 	go func() {
 		for result := range resultPipe {
-			if result.Result.Code == 256 {
-				continue
-			}
+			ip := result.Result.AddrIP.String()
 
-			fmt.Printf("{%d}, {%+v}\n", result.Hop, *result.Result)
+			entry := &r.Data[result.Probe][result.Hop]
+			entry.Code = result.Result.Code
+			if entry.Code != 256 {
+				entry.Address = ip
+				entry.RDNS = rDNSLookup(ip)
+				entry.Latency = float64(result.Result.Latency) / float64(time.Millisecond)
+			}
 
-			ip := result.Result.AddrIP.String()
-			r.Data[result.Hop] = append(r.Data[result.Hop], MtrPEntry{
-				Address: ip,
-				RDNS:    rDNSLookup(ip),
-				Code:    result.Result.Code,
-				Latency: float64(result.Result.Latency) / float64(time.Millisecond),
-			})
+			if entry.Code != 258 && entry.Code != 256 {
+				r.Data[result.Probe] = r.Data[result.Probe][:result.Hop+1]
+			}
 		}
+
+		finishPipe <- struct{}{}
+		close(finishPipe)
 	}()
 
 	m := icmp.GetICMPManager()
@@ -115,9 +123,11 @@ func mtr(q *MtrQ) (*MtrP, error) {
 
 		countTimes++
 		go func() {
+			thisCount := countTimes - 1
 			for i := uint64(0); i < q.MaxHop; i++ {
 				result := <-m.Issue(addr, int(i), timeout)
 				resultPipe <- MTRResult{
+					Probe:  thisCount,
 					Hop:    i,
 					Result: result,
 				}
@@ -132,7 +142,9 @@ func mtr(q *MtrQ) (*MtrP, error) {
 	}
 
 	times.Wait()
-	for r.Data[len(r.Data)-1] == nil {
+	close(resultPipe)
+	<-finishPipe
+	for len(r.Data) != 0 && r.Data[len(r.Data)-1] == nil {
 		r.Data = r.Data[:len(r.Data)-1]
 	}
 	return &r, nil