Merge pull request #3 from babs/fix-df-windows-local

fix: do-not-fragment on unsupported platform and localized pings

Author: babs

README.md

@@ -30,7 +30,7 @@ Available probing means are:
 
 Pure Go is the default option but for unprivileged users ([see linux notes](#linux-notes-on-pure-go-ping)), OS/system's ping command (usually available on OS with specific cap or setuid) can be used with a background spawn model with `-s` flag. Privileged mode (default when user is root or on windows) can be forcefully enabled with `-privileged`.
 
-On pure Go implementation, ICMP packet size can be specified using `-size` option. Given size doesn't account for the 28 bytes header (note for usual limits: 1472 or 8972). This has no effect on system's ping, refer to system's manual and use `-ping-options`.
+On pure Go implementation, ICMP packet size can be specified using `-size` option, note that do-not-fragment bit is set only for linux platform (kind of defeat the purpose of `-size` on other platforms :/). Given size doesn't account for the 28 bytes header (note for usual limits: 1472 or 8972). This has no effect on system's ping, refer to system's manual and use `-ping-options`.
 
 Hint ca be given about address family resolution using `ip<family>://`, `ip://` is the default, `ip4://` to force IPv4 and `ip6://` to force IPv6, example:
  - `google.com` is equivalent to `ip://google.com`

pinger_probing.go

@@ -34,7 +34,9 @@ func (w *ProbingWrapper) Start() {
 	w.pinger.OnRecv = w.onRecv
 	w.pinger.OnDuplicateRecv = w.onDuplicateRecv
 	w.pinger.Size = w.size
-	w.pinger.SetDoNotFragment(true)
+	if runtime.GOOS == "linux" {
+		w.pinger.SetDoNotFragment(true)
+	}
 
 	if runtime.GOOS == "windows" || os.Getuid() == 0 {
 		w.pinger.SetPrivileged(true)

pinger_system.go

@@ -25,6 +25,7 @@ type SystemPingWrapper struct {
 }
 
 var time_extractor = regexp.MustCompile(`time[=<]([\d\.]+) *(.?s)`)
+var time_extractor_non_local = regexp.MustCompile(`[=<]([\d\.]+) *(.?s)`)
 
 func (w *SystemPingWrapper) Start() {
 	w.hstring = fmt.Sprintf("%s (%s)", w.host, w.ip.String())
@@ -53,12 +54,16 @@ func (w *SystemPingWrapper) Start() {
 		log.Fatal(err)
 	}
 
+	extractor := time_extractor
+
 	if runtime.GOOS == "windows" {
 		args = append(args, "-t")
+		extractor = time_extractor_non_local
 	}
 	args = append(args, w.ip.String())
 
 	w.cmd = exec.Command(path, args...)
+	w.cmd.Env = append(w.cmd.Environ(), "LANG=C")
 
 	w.stats = &PWStats{
 		state: true,
@@ -69,7 +74,7 @@ func (w *SystemPingWrapper) Start() {
 		// Read line by line and process it
 		for scanner.Scan() {
 			line := scanner.Text()
-			extracted := time_extractor.FindAllStringSubmatch(line, -1)
+			extracted := extractor.FindAllStringSubmatch(line, -1)
 			if len(extracted) > 0 {
 				w.stats.lastrecv = time.Now().UnixNano()
 				w.stats.lastrtt_as_string = extracted[0][1] + extracted[0][2]