general: restructure package, move socks to proxy

config.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/nadoo/conflag"
 
-	"github.com/nadoo/glider/common/log"
 	"github.com/nadoo/glider/dns"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/rule"
 )
 

dns/cache.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 // LongTTL is 50 years duration in seconds, used for none-expired items.

dns/client.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
 )
 

dns/server.go

@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
 )
 

main.go

@@ -9,9 +9,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
 	"github.com/nadoo/glider/dns"
 	"github.com/nadoo/glider/ipset"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 	"github.com/nadoo/glider/rule"
 	"github.com/nadoo/glider/service"

proxy/conn.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 const (

proxy/direct.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 )
 
 // Direct proxy.

proxy/http/client.go

@@ -6,8 +6,8 @@ import (
 	"net"
 	"net/textproto"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/http/http.go

@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/http/request.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 )
 
 // Methods are http methods from rfc.

proxy/http/server.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/kcp/kcp.go

@@ -12,7 +12,7 @@ import (
 	kcp "github.com/xtaci/kcp-go/v5"
 	"golang.org/x/crypto/pbkdf2"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/mixed/mixed.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"net/url"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 	"github.com/nadoo/glider/proxy/http"
 	"github.com/nadoo/glider/proxy/socks5"

proxy/obfs/http.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 // HTTPObfs struct

proxy/obfs/obfs.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"net/url"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/obfs/tls.go

@@ -18,7 +18,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 const (

proxy/redir/redir_linux.go

@@ -11,9 +11,9 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 const (

proxy/socks4/socks4.go

@@ -11,8 +11,8 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/socks5/packet.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"net"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 // PktConn .

proxy/socks5/socks5.go

@@ -19,10 +19,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 // Version is socks5 version number.

proxy/ss/packet.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"net"
 
-	"github.com/nadoo/glider/common/pool"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/pool"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 // PktConn .

proxy/ss/ss.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/nadoo/go-shadowsocks2/core"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 // SS is a base ss struct.

proxy/ssh/ssh.go

@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/crypto/ssh"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/ssr/ssr.go

@@ -13,9 +13,9 @@ import (
 	ssrinfo "github.com/mzz2017/shadowsocksR/ssr"
 	"github.com/mzz2017/shadowsocksR/streamCipher"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 func init() {

proxy/tcptun/tcptun.go

@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/tls/tls.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/trojan/packet.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"net"
 
-	"github.com/nadoo/glider/common/pool"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 // PktConn .

proxy/trojan/trojan.go

@@ -11,10 +11,10 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
-	"github.com/nadoo/glider/common/pool"
-	"github.com/nadoo/glider/common/socks"
+	"github.com/nadoo/glider/log"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
+	"github.com/nadoo/glider/proxy/socks"
 )
 
 // Trojan is a base trojan struct

proxy/udptun/udptun.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/unix/unix.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/uottun/uottun.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/vless/client.go

@@ -9,7 +9,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/vmess/chunk.go

@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 const (

proxy/vmess/client.go

@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 	"golang.org/x/crypto/chacha20poly1305"
 )
 

proxy/vmess/user.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 // User of vmess client.

proxy/vmess/vmess.go

@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

proxy/ws/client.go

@@ -11,7 +11,7 @@ import (
 	"net/textproto"
 	"strings"
 
-	"github.com/nadoo/glider/common/pool"
+	"github.com/nadoo/glider/pool"
 )
 
 var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")

proxy/ws/ws.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

rule/forward.go

@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

rule/group.go

@@ -11,7 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

rule/proxy.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/proxy"
 )
 

service/dhcpd/dhcpd.go

@@ -10,7 +10,7 @@ import (
 	"github.com/insomniacslk/dhcp/dhcpv4/nclient4"
 	"github.com/insomniacslk/dhcp/dhcpv4/server4"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 	"github.com/nadoo/glider/service"
 )
 

service/service.go

@@ -3,7 +3,7 @@ package service
 import (
 	"strings"
 
-	"github.com/nadoo/glider/common/log"
+	"github.com/nadoo/glider/log"
 )
 
 // Service is a server that can be run.