Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rearrange the dup() functions to compile on more platforms
This fixes issue #127. Thanks @nmeum for the suggestion - this should provide a path forward for more OSes and architectures.
- Loading branch information
Showing
7 changed files
with
80 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| // Copyright 2019-2021 Graham Clark. All rights reserved. Use of this source | ||
| // code is governed by the MIT license that can be found in the LICENSE | ||
| // file. | ||
|
|
||
| package system | ||
|
|
||
| import ( | ||
| "os" | ||
| "os/exec" | ||
| "syscall" | ||
|
|
||
| log "github.com/sirupsen/logrus" | ||
| ) | ||
|
|
||
| //====================================================================== | ||
|
|
||
| // DumpcapExt will run dumpcap first, but if it fails, run tshark. Intended as | ||
| // a special case to allow termshark -i <iface> to use dumpcap if possible, | ||
| // but if it fails (e.g. iface==randpkt), fall back to tshark. dumpcap is more | ||
| // efficient than tshark at just capturing, and will drop fewer packets, but | ||
| // tshark supports extcap interfaces. | ||
| func DumpcapExt(dumpcapBin string, tsharkBin string, args ...string) error { | ||
| var err error | ||
|
|
||
| dumpcapCmd := exec.Command(dumpcapBin, args...) | ||
| log.Infof("Starting dumpcap command %v", dumpcapCmd) | ||
| dumpcapCmd.Stdin = os.Stdin | ||
| dumpcapCmd.Stdout = os.Stdout | ||
| dumpcapCmd.Stderr = os.Stderr | ||
| if dumpcapCmd.Run() != nil { | ||
| var tshark string | ||
| tshark, err = exec.LookPath(tsharkBin) | ||
| if err == nil { | ||
| log.Infof("Retrying with dumpcap command %v", append([]string{tshark}, args...)) | ||
| err = syscall.Exec(tshark, append([]string{tshark}, args...), os.Environ()) | ||
| } | ||
| } | ||
|
|
||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Copyright 2019-2021 Graham Clark. All rights reserved. Use of this source | ||
| // code is governed by the MIT license that can be found in the LICENSE | ||
| // file. | ||
|
|
||
| // +build !windows | ||
| // +build !linux !arm64 | ||
| // +build !linux !riscv64 | ||
|
|
||
| package system | ||
|
|
||
| import "syscall" | ||
|
|
||
| func Dup2(fd int, fd2 int) error { | ||
| return syscall.Dup2(fd, fd2) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| // Copyright 2019-2021 Graham Clark. All rights reserved. Use of this source | ||
| // code is governed by the MIT license that can be found in the LICENSE | ||
| // file. | ||
|
|
||
| package system | ||
|
|
||
| import "syscall" | ||
|
|
||
| func Dup2(fd int, fd2 int) error { | ||
| return syscall.Dup3(fd, fd2, 0) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| // Copyright 2019-2021 Graham Clark. All rights reserved. Use of this source | ||
| // code is governed by the MIT license that can be found in the LICENSE | ||
| // file. | ||
|
|
||
| package system | ||
|
|
||
| import "syscall" | ||
|
|
||
| func Dup2(fd int, fd2 int) error { | ||
| return syscall.Dup3(fd, fd2, 0) | ||
| } |