mirrors/SpoofDPI
1
0
Fork 0
mirror of https://github.com/xvzc/SpoofDPI.git synced 2024-12-31 07:04:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dependency issues followed by refactoring util module

Browse Source
This commit is contained in:
xvzc 2022-01-11 00:14:51 +09:00
parent 510f2f9835
commit c5640a51a7
3 changed files with 6 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,6 @@ import (
"log" "log"
"os" "os"
"os/signal" "os/signal"
"runtime"
"syscall" "syscall"
"github.com/xvzc/SpoofDPI/doh" "github.com/xvzc/SpoofDPI/doh"
@ -15,10 +14,10 @@ import (
func main() { func main() {
port, dns, debug := util.ParseArgs() port, dns, debug := util.ParseArgs()
p := proxy.New(port, runtime.GOOS, debug) p := proxy.New(port)
util.PrintWelcome(port, dns, debug) util.PrintWelcome(port, dns, debug)
if err := p.SetOsProxy(); err != nil { if err := util.SetOsProxy(port); err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -44,7 +43,7 @@ func main() {
}() }()
<-done <-done
if err := p.UnsetOsProxy(); err != nil { if err := util.UnsetOsProxy(); err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }

52
proxy/os-settings.go
View File

@ -1,52 +0,0 @@
package proxy
import (
"os/exec"
"strings"
)
func (p *Proxy) SetOsProxy() error {
if p.OS != "darwin" {
return nil
}
network, err := exec.Command("sh", "-c", "networksetup -listnetworkserviceorder | grep `route -n get 0.0.0.0 | grep 'interface' | cut -d ':' -f2` -B 1 | head -n 1 | cut -d ' ' -f2").Output()
if err != nil {
return err
}
_, err = exec.Command("sh", "-c", "networksetup -setwebproxy "+strings.TrimSpace(string(network))+" 127.0.0.1 "+p.Port).Output()
if err != nil {
return err
}
_, err = exec.Command("sh", "-c", "networksetup -setsecurewebproxy "+strings.TrimSpace(string(network))+" 127.0.0.1 "+p.Port).Output()
if err != nil {
return err
}
return nil
}
func (p *Proxy) UnsetOsProxy() error {
if p.OS != "darwin" {
return nil
}
network, err := exec.Command("sh", "-c", "networksetup -listnetworkserviceorder | grep `route -n get 0.0.0.0 | grep 'interface' | cut -d ':' -f2` -B 1 | head -n 1 | cut -d ' ' -f2").Output()
if err != nil {
return err
}
_, err = exec.Command("sh", "-c", "networksetup -setwebproxystate "+strings.TrimSpace(string(network))+" off").Output()
if err != nil {
return err
}
_, err = exec.Command("sh", "-c", "networksetup -setsecurewebproxystate "+strings.TrimSpace(string(network))+" off").Output()
if err != nil {
return err
}
return nil
}

10
proxy/proxy.go
View File

@ -10,16 +10,12 @@ import (
) )
type Proxy struct { type Proxy struct {
Port string Port string
OS string
Debug bool
} }
func New(port string, os string, debug bool) *Proxy { func New(port string) *Proxy {
return &Proxy{ return &Proxy{
Port: port, Port: port,
OS: os,
Debug: debug,
} }
} }