update: project struct change

rc452860 · Feb 6, 2019 · cdeb7e9 · cdeb7e9
1 parent f17233c
commit cdeb7e9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 248 deletions.
diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
-	"syscall"
 	"time"
 
 	"github.com/rc452860/vnet/common/config"
@@ -33,10 +32,16 @@ func main() {
 		BareStarted()
 	}
 
-	c := make(chan os.Signal)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	<-c
-	cancle()
+	c := make(chan os.Signal, 1)
+	signal.Notify(c)
+	for {
+		data := <-c
+		log.Error("recive signal: %s", data.String())
+		if data == os.Interrupt {
+			cancle()
+			return
+		}
+	}
 }
 
 func BareStarted() {

diff --git a/cmd/test/test.go b/cmd/test/test.go
@@ -2,40 +2,20 @@ package main
 
 import (
 	"fmt"
-
-	"github.com/miekg/dns"
+	"os"
+	"os/signal"
+	"syscall"
 )
 
 func main() {
-	c := new(dns.Client)
-	// c.DialTimeout = time.Millisecond * 5000
-	// c.ReadTimeout = time.Millisecond * 5000
-	// c.WriteTimeout = time.Millisecond * 5000
-	m := new(dns.Msg)
-	m.SetQuestion(dns.Fqdn("baidu.com"), dns.TypeAAAA)
-	r, _, err := c.Exchange(m, "[2001:4860:4860::8844]:53")
-	if err != nil {
-		fmt.Print(err)
+	c := make(chan os.Signal)
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	for {
+		data := <-c
+		fmt.Println(data.String())
+		if data == os.Interrupt {
+			return
+		}
 	}
-	fmt.Println(r.Answer)
-	// r, _, err := c.Exchange(m, "114.114.114.114:53")
-	// if err != nil {
-	// 	fmt.Print("a" + err.Error())
-	// }
-	// fmt.Println(r.Answer)
-	// var l sync.Mutex
-	// c := sync.NewCond(&l)
-	// f := func() {
-	// 	c.L.Lock()
-	// 	defer c.L.Unlock()
-	// 	c.Wait()
-	// 	fmt.Println("aaa")
-	// }
-	// go f()
-	// go f()
-	// time.Sleep(3 * time.Second)
-	// c.L.Lock()
-	// c.Broadcast()
-	// c.L.Unlock()
-	// time.Sleep(3 * time.Second)
+
 }
diff --git a/db/db.go b/db/db.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/rc452860/vnet/utils/addr"
 
-	"github.com/rc452860/vnet/proxy"
 	"github.com/rc452860/vnet/record"
 
 	"github.com/AlecAivazis/survey"
@@ -365,7 +364,7 @@ func formatLoad() string {
 // DBTrafficMonitor is should using goroutine start
 func DBTrafficMonitor(ctx context.Context) {
 	traffic := make(chan record.Traffic, 32)
-	proxy.RegisterTrafficHandle(traffic)
+	server.RegisterTrafficHandle(traffic)
 	var data record.Traffic
 	// count traffic
 	for {

diff --git a/proxy/proxy.go b/proxy/proxy.go
diff --git a/proxy/proxy_test.go b/proxy/proxy_test.go
diff --git a/proxy/server/shadowsocks.go b/proxy/server/shadowsocks.go
@@ -17,7 +17,6 @@ import (
 	"github.com/rc452860/vnet/common/pool"
 	"github.com/rc452860/vnet/network/ciphers"
 	"github.com/rc452860/vnet/network/conn"
-	"github.com/rc452860/vnet/proxy"
 	"github.com/rc452860/vnet/record"
 	"github.com/rc452860/vnet/socks"
 	"golang.org/x/time/rate"
@@ -44,11 +43,11 @@ func init() {
 // ShadowsocksProxy is respect shadowsocks proxy server
 // it have Start and Stop method to control proxy
 type ShadowsocksProxy struct {
-	*proxy.ProxyService `json:"-,omitempty"`
-	Host                string `json:"host,omitempty"`
-	Port                int    `json:"port,omitempty"`
-	Method              string `json:"method,omitempty"`
-	Password            string `json:"password,omitempty"`
+	*ProxyService `json:"-,omitempty"`
+	Host          string `json:"host,omitempty"`
+	Port          int    `json:"port,omitempty"`
+	Method        string `json:"method,omitempty"`
+	Password      string `json:"password,omitempty"`
 	ShadowsocksArgs
 	ReadLimiter  *rate.Limiter `json:"read_limit,omitempty"`
 	WriteLimiter *rate.Limiter `json:"write_limit,omitempty"`
@@ -65,7 +64,7 @@ type ShadowsocksArgs struct {
 // NewShadowsocks is new ShadowsocksProxy object
 func NewShadowsocks(host string, method string, password string, port int, ssarg ShadowsocksArgs) (*ShadowsocksProxy, error) {
 	ss := &ShadowsocksProxy{
-		ProxyService:    proxy.NewProxyService(),
+		ProxyService:    NewProxyService(),
 		Host:            host,
 		Method:          method,
 		Password:        password,