mirror of
				https://github.com/xjasonlyu/tun2socks.git
				synced 2025-11-01 04:22:44 +08:00 
			
		
		
		
	update main options
This commit is contained in:
		
							
								
								
									
										11
									
								
								cmd/main.go
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								cmd/main.go
									
									
									
									
									
								
							| @@ -51,13 +51,11 @@ type CmdArgs struct { | |||||||
|  |  | ||||||
| 	// FakeDNS | 	// FakeDNS | ||||||
| 	EnableFakeDNS *bool | 	EnableFakeDNS *bool | ||||||
| 	FakeIPRange   *string | 	Hosts         *string | ||||||
| 	FakeDNSAddr   *string |  | ||||||
| 	FakeDNSHosts  *string |  | ||||||
| 	HijackDNS     *string | 	HijackDNS     *string | ||||||
| 	BackendDNS    *string | 	BackendDNS    *string | ||||||
|  |  | ||||||
| 	// Session Statistics Monitor | 	// Session Monitor | ||||||
| 	EnableMonitor *bool | 	EnableMonitor *bool | ||||||
| 	MonitorAddr   *string | 	MonitorAddr   *string | ||||||
| } | } | ||||||
| @@ -165,11 +163,6 @@ func main() { | |||||||
| 	signal.Notify(osSignals, os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGHUP) | 	signal.Notify(osSignals, os.Interrupt, os.Kill, syscall.SIGTERM, syscall.SIGHUP) | ||||||
| 	<-osSignals | 	<-osSignals | ||||||
|  |  | ||||||
| 	// Stop fakeDNS server |  | ||||||
| 	if fakeDNS != nil { |  | ||||||
| 		fakeDNS.Stop() |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	// Stop session stater | 	// Stop session stater | ||||||
| 	if monitor != nil { | 	if monitor != nil { | ||||||
| 		monitor.Stop() | 		monitor.Stop() | ||||||
|   | |||||||
| @@ -4,7 +4,6 @@ package main | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"flag" | 	"flag" | ||||||
| 	"strings" |  | ||||||
|  |  | ||||||
| 	"github.com/xjasonlyu/tun2socks/component/fakedns" | 	"github.com/xjasonlyu/tun2socks/component/fakedns" | ||||||
| 	"github.com/xjasonlyu/tun2socks/log" | 	"github.com/xjasonlyu/tun2socks/log" | ||||||
| @@ -12,29 +11,17 @@ import ( | |||||||
|  |  | ||||||
| func init() { | func init() { | ||||||
| 	args.EnableFakeDNS = flag.Bool("fakeDNS", false, "Enable fake DNS") | 	args.EnableFakeDNS = flag.Bool("fakeDNS", false, "Enable fake DNS") | ||||||
| 	args.FakeDNSAddr = flag.String("fakeDNSAddr", ":53", "Listen address of fake DNS") | 	args.Hosts = flag.String("hosts", "", "DNS hosts mapping, e.g. 'example.com=1.1.1.1,example.net=2.2.2.2'") | ||||||
| 	args.FakeIPRange = flag.String("fakeIPRange", "198.18.0.0/15", "Fake IP CIDR range for DNS") |  | ||||||
| 	args.FakeDNSHosts = flag.String("fakeDNSHosts", "", "DNS hosts mapping, e.g. 'example.com=1.1.1.1,example.net=2.2.2.2'") |  | ||||||
| 	args.HijackDNS = flag.String("hijackDNS", "", "Hijack the specific DNS query to get a fake ip, e.g. '*:53', '8.8.8.8:53,8.8.4.4:53'") | 	args.HijackDNS = flag.String("hijackDNS", "", "Hijack the specific DNS query to get a fake ip, e.g. '*:53', '8.8.8.8:53,8.8.4.4:53'") | ||||||
| 	args.BackendDNS = flag.String("backendDNS", "8.8.8.8:53,1.1.1.1:53", "Backend DNS to resolve !TypeA or !ClassINET query. (must support tcp)") | 	args.BackendDNS = flag.String("backendDNS", "8.8.8.8:53,8.8.4.4:53", "Backend DNS to resolve !TypeA or !ClassINET query. (must support tcp)") | ||||||
|  |  | ||||||
| 	registerInitFn(func() { | 	registerInitFn(func() { | ||||||
| 		if *args.EnableFakeDNS { | 		if *args.EnableFakeDNS { | ||||||
| 			var err error | 			resolver, err := fakedns.NewResolver(*args.Hosts, *args.BackendDNS) | ||||||
| 			fakeDNS, err = fakedns.NewServer(*args.FakeIPRange, *args.FakeDNSHosts) |  | ||||||
| 			if err != nil { | 			if err != nil { | ||||||
| 				log.Fatalf("Create fake DNS server failed: %v", err) | 				log.Fatalf("Create fake DNS server failed: %v", err) | ||||||
| 			} | 			} | ||||||
|  | 			fakeDNS = resolver | ||||||
| 			// Set fakeDNS variables |  | ||||||
| 			fakedns.ServeAddr = *args.FakeDNSAddr |  | ||||||
| 			fakedns.BackendDNS = strings.Split(*args.BackendDNS, ",") |  | ||||||
|  |  | ||||||
| 			// Start fakeDNS server |  | ||||||
| 			if err := fakeDNS.Start(); err != nil { |  | ||||||
| 				log.Fatalf("Start fake DNS failed: %v", err) |  | ||||||
| 			} |  | ||||||
| 			log.Infof("Fake DNS serving at %v", fakedns.ServeAddr) |  | ||||||
| 		} else { | 		} else { | ||||||
| 			fakeDNS = nil | 			fakeDNS = nil | ||||||
| 		} | 		} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jason
					Jason