ipset: only allow to set ipset in rule files #69

This commit is contained in:
nadoo committed 2018-11-27 23:25:20 +08:00
1 parent 86478d2c25
commit 5a43cf873e
14 files changed
+59 -71

No files matched your search

+1 -1
View File
@@ -232,7 +232,7 @@ func (s *SOCKS5) Dial(network, addr string) (net.Conn, error) {
c, err := s.dialer.Dial(network, s.addr)
if err != nil {
log.F("dial to %s error: %s", s.addr, err)
log.F("[socks5]: dial to %s error: %s", s.addr, err)
return nil, err
}
+7 -4
View File
@@ -33,7 +33,7 @@ func init() {
proxy.RegisterServer("tls", NewTLSServer)
}
// NewTLS returns a tls proxy
// NewTLS returns a tls proxy struct
func NewTLS(s string, dialer proxy.Dialer) (*TLS, error) {
u, err := url.Parse(s)
if err != nil {
@@ -69,7 +69,7 @@ func NewTLS(s string, dialer proxy.Dialer) (*TLS, error) {
return p, nil
}
// NewTLSDialer returns a tls proxy dialer.
// NewTLSDialer returns a tls proxy dialer
func NewTLSDialer(s string, dialer proxy.Dialer) (proxy.Dialer, error) {
p, err := NewTLS(s, dialer)
if err != nil {
@@ -104,7 +104,7 @@ func NewTLSServer(s string, dialer proxy.Dialer) (proxy.Server, error) {
cert, err := stdtls.LoadX509KeyPair(p.certFile, p.keyFile)
if err != nil {
log.F("[tls] unabled load cert: %s, key %s", p.certFile, p.keyFile)
log.F("[tls] unable to load cert: %s, key %s", p.certFile, p.keyFile)
return nil, err
}
@@ -144,8 +144,11 @@ func (s *TLS) ListenAndServe() {
}
}
// Serve .
// Serve serves requests
func (s *TLS) Serve(c net.Conn) {
// we know the internal server will close the connection after serve
// defer c.Close()
if s.server != nil {
cc := stdtls.Server(c, s.tlsConfig)
s.server.Serve(cc)
+2 -1
View File
@@ -93,7 +93,8 @@ func (s *Unix) ListenAndServe() {
// Serve serves requests
func (s *Unix) Serve(c net.Conn) {
defer c.Close()
// we know the internal server will close the connection after serve
// defer c.Close()
if s.server != nil {
s.server.Serve(c)