SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-06 05:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes

Browse source
This commit is contained in:
世界 2022-04-15 15:04:45 +08:00
parent 04917323e6
commit 5991cfc072
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
13 changed files with 177 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cli/ss-local/main.go
View file

@ -11,7 +11,6 @@ import (
"os"
"os/signal"
"runtime/debug"
"strconv"
"strings"
"syscall"
"time"
@ -31,7 +30,6 @@ import (
"github.com/sagernet/sing/protocol/shadowsocks/shadowaead"
"github.com/sagernet/sing/protocol/shadowsocks/shadowaead_2022"
"github.com/sagernet/sing/protocol/socks"
"github.com/sagernet/sing/protocol/wapd"
"github.com/sagernet/sing/transport/mixed"
"github.com/sagernet/sing/transport/system"
"github.com/sirupsen/logrus"
@ -54,7 +52,6 @@ type flags struct {
UseSystemRNG bool `json:"use_system_rng"`
ReducedSaltEntropy bool `json:"reduced_salt_entropy"`
ConfigFile string
WAPD bool
}
func main() {
@ -91,7 +88,6 @@ Only available with Linux kernel > 3.7.0.`)
command.Flags().BoolVarP(&f.Verbose, "verbose", "v", true, "Enable verbose mode.")
command.Flags().BoolVar(&f.UseSystemRNG, "use-system-rng", false, "Use system random number generator.")
command.Flags().BoolVar(&f.ReducedSaltEntropy, "reduced-salt-entropy", false, "Remapping salt to printable chars.")
command.Flags().BoolVar(&f.WAPD, "wapd", false, "Listen WADP server.")
err := command.Execute()
if err != nil {
@ -106,7 +102,6 @@ type LocalClient struct {
method shadowsocks.Method
dialer net.Dialer
bypass string
wapd *wapd.Listener
}
func NewLocalClient(f *flags) (*LocalClient, error) {
@ -252,10 +247,6 @@ func NewLocalClient(f *flags) (*LocalClient, error) {
client.Listener = mixed.NewListener(netip.AddrPortFrom(bind, f.LocalPort), nil, transproxyMode, client)
if f.WAPD {
client.wapd = wapd.NewListener(netip.MustParseAddr("255.255.255.255"), "http://127.0.0.1:"+strconv.Itoa(int(f.LocalPort))+"/proxy.pac", client)
}
if f.Bypass != "" {
err := geoip.LoadMMDB("Country.mmdb")
if err != nil {
@ -382,10 +373,6 @@ func Run(cmd *cobra.Command, flags *flags) {
logrus.Fatal(err)
}
if client.wapd != nil {
err = client.wapd.Start()
}
if err != nil {
logrus.Fatal(err)
}