Merge pull request #243 from nxtrace/main

SYNC

.github/workflows/test.yml

@@ -31,8 +31,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
-          check-latest: true
+          go-version: '1.22.0'
       - name: Checkout codebase
         uses: actions/checkout@v4
       - name: Test with unix

cmd/cmd.go

@@ -70,6 +70,7 @@ func Excute() {
 		Help: "Choose the language for displaying [en, cn]"})
 	file := parser.String("", "file", &argparse.Options{Help: "Read IP Address or domain name from file"})
 	nocolor := parser.Flag("C", "nocolor", &argparse.Options{Help: "Disable Colorful Output"})
+	dontFragment := parser.Flag("", "dont-fragment", &argparse.Options{Default: false, Help: "Set the Don't Fragment bit (IPv4 TCP only)"})
 
 	err := parser.Parse(os.Args)
 	if err != nil {
@@ -112,6 +113,7 @@ func Excute() {
 			PktSize:        *packetSize,
 			Timeout:        time.Duration(*timeout) * time.Millisecond,
 			File:           *file,
+			DontFragment:   *dontFragment,
 		}
 
 		fastTrace.FastTest(*tcp, *output, paramsFastTrace)
@@ -270,6 +272,7 @@ func Excute() {
 		IPGeoSource:      ipgeo.GetSource(*dataOrigin),
 		Timeout:          time.Duration(*timeout) * time.Millisecond,
 		PktSize:          *packetSize,
+		DontFragment:     *dontFragment,
 	}
 
 	// 暂时弃用

fast_trace/fast_trace ipv6.go

@@ -39,6 +39,7 @@ func (f *FastTracer) tracert_v6(location string, ispCollection ISPCollection) {
 		SrcAddr:          f.ParamsFastTrace.SrcAddr,
 		PktSize:          f.ParamsFastTrace.PktSize,
 		Lang:             f.ParamsFastTrace.Lang,
+		DontFragment:     f.ParamsFastTrace.DontFragment,
 	}
 
 	if oe {

fast_trace/fast_trace.go

@@ -34,6 +34,7 @@ type ParamsFastTrace struct {
 	PktSize        int
 	Timeout        time.Duration
 	File           string
+	DontFragment   bool
 }
 
 type IpListElement struct {
@@ -68,6 +69,7 @@ func (f *FastTracer) tracert(location string, ispCollection ISPCollection) {
 		SrcAddr:          f.ParamsFastTrace.SrcAddr,
 		PktSize:          f.ParamsFastTrace.PktSize,
 		Lang:             f.ParamsFastTrace.Lang,
+		DontFragment:     f.ParamsFastTrace.DontFragment,
 	}
 
 	if oe {

go.mod

@@ -1,6 +1,6 @@
 module github.com/nxtrace/NTrace-core
 
-go 1.22
+go 1.22.0
 
 require (
 	github.com/akamensky/argparse v1.4.0

trace/tcp_ipv4.go

@@ -219,6 +219,9 @@ func (t *TCPTracer) send(ttl int) error {
 		TTL:      uint8(ttl),
 		//Flags:    layers.IPv4DontFragment, // 我感觉没必要
 	}
+	if t.DontFragment {
+		ipHeader.Flags = layers.IPv4DontFragment
+	}
 	// 使用Uint16兼容32位系统，防止在rand的时候因使用int32而溢出
 	sequenceNumber := uint32(r.Intn(math.MaxUint16))
 	tcpHeader := &layers.TCP{

trace/trace.go

@@ -42,6 +42,7 @@ type Config struct {
 	AsyncPrinter     func(res *Result)
 	PktSize          int
 	Maptrace         bool
+	DontFragment	 bool
 }
 
 type Method string
@@ -81,6 +82,7 @@ func Traceroute(method Method, config Config) (*Result, error) {
 		if config.DestIP.To4() != nil {
 			tracer = &UDPTracer{Config: config}
 		} else {
+			//TODO: IPv6 UDP trace 在做了，指新建文件夹（
 			return nil, errors.New("IPv6 UDP Traceroute is not supported")
 		}
 	case TCPTrace: