go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tungo: debug exec.Command output

Browse Source
This commit is contained in:
ginuerzh
2025-08-09 16:34:04 +08:00
parent 2b9f795972
commit 4eb006f1b0
14 changed files with 330 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
listener/tungo/tun_darwin.go
+13 -3
View File
@@ -31,8 +31,14 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
cmd := fmt.Sprintf("ifconfig %s inet %s %s mtu %d up",
name, l.md.config.Net[0].String(), peer, l.md.config.MTU)
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if err = exec.Command(args[0], args[1:]...).Run(); err != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, string(output))
}
if er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
ip = l.md.config.Net[0].IP
@@ -50,8 +56,12 @@ func (l *tunListener) addRoutes(ifName string) error {
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Net.String(), ifName)
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if err := exec.Command(args[0], args[1:]...).Run(); err != nil {
return err
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, string(output))
}
if er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
}
return nil
listener/tungo/tun_linux.go
+5 -1
View File
@@ -64,7 +64,11 @@ func (l *tunListener) createTun() (dev io.ReadWriteCloser, name string, ip net.I
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, string(output))
}
if er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
listener/tungo/tun_other.go
+10 -2
View File
@@ -31,7 +31,11 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, string(output))
}
if er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
@@ -50,7 +54,11 @@ func (l *tunListener) addRoutes(ifName string) error {
cmd := fmt.Sprintf("route add -net %s -interface %s", route.Net.String(), ifName)
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, string(output))
}
if er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
}
listener/tungo/tun_windows.go
+29 -6
View File
@@ -40,12 +40,16 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
return
}
if l.md.config.MTU > 0 {
if l.md.config.MTU > 0 {
cmd := fmt.Sprintf("netsh interface ip set subinterface %s mtu=%d", name, l.md.config.MTU)
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, windows.ByteSliceToString(output))
}
if er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
@@ -59,7 +63,11 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, windows.ByteSliceToString(output))
}
if er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
@@ -75,7 +83,11 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, windows.ByteSliceToString(output))
}
if er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
@@ -95,7 +107,11 @@ func (l *tunListener) addRoutes(ifName string, gw net.IP) error {
}
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, windows.ByteSliceToString(output))
}
if er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
}
@@ -107,7 +123,14 @@ func (l *tunListener) deleteRoute(ifName string, route string) error {
route, ifName)
l.log.Debug(cmd)
args := strings.Split(cmd, " ")
return exec.Command(args[0], args[1:]...).Run()
output, er := exec.Command(args[0], args[1:]...).CombinedOutput()
if len(output) > 0 {
l.log.Debugf("%s: %s", cmd, windows.ByteSliceToString(output))
}
if er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
return nil
}
func ipMask(mask net.IPMask) string {