mirrors/SpoofDPI
1
0
Fork 0
mirror of https://github.com/xvzc/SpoofDPI.git synced 2025-01-04 13:24:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ref: add better error messages

Browse Source
This commit is contained in:
pibragimov 2024-08-26 01:48:24 +03:00
parent 856d677ba2
commit 827dcd392a
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/spoof-dpi/main.go
View File

@ -34,12 +34,9 @@ func main() {
} else { } else {
util.PrintSimpleInfo() util.PrintSimpleInfo()
} }
if config.SystemProxy { if config.SystemProxy {
if err := util.SetOsProxy(uint16(config.Port)); err != nil { if err := util.SetOsProxy(uint16(config.Port)); err != nil {
logger.Fatal().Msgf("error while changing proxy settings: %s", err) logger.Fatal().Msgf("error while changing proxy settings: %s", err)
} }
defer func() { defer func() {
if err := util.UnsetOsProxy(); err != nil { if err := util.UnsetOsProxy(); err != nil {
@ -68,9 +65,4 @@ func main() {
}() }()
<-done <-done
if *config.SystemProxy {
if err := util.UnsetOsProxy(); err != nil {
log.Fatalf("error while unsetting os proxy: %v", err)
}
}
} }

12
util/os.go
View File

@ -1,7 +1,6 @@
package util package util
import ( import (
"errors"
"fmt" "fmt"
"os/exec" "os/exec"
"runtime" "runtime"
@ -43,14 +42,15 @@ func UnsetOsProxy() error {
} }
func getDefaultNetwork() (string, error) { func getDefaultNetwork() (string, error) {
network, err := exec.Command("sh", "-c", getDefaultNetworkCMD).Output() cmd := exec.Command("sh", "-c", getDefaultNetworkCMD)
out, err := cmd.CombinedOutput()
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get default network, stdout: %s: %w", string(network), err) return "", fmt.Errorf("%s: %s", cmd.String(), out)
} }
if len(network) == 0 { if len(out) == 0 {
return "", errors.New("no available networks") return "", fmt.Errorf("%s: no available networks", cmd.String())
} }
return strings.TrimSpace(string(network)), nil return strings.TrimSpace(string(out)), nil
} }
func getProxyTypes() []string { func getProxyTypes() []string {