mirror of
https://github.com/xvzc/SpoofDPI.git
synced 2024-12-22 22:36:53 +00:00
fix local address
This commit is contained in:
parent
dd2e9a1c55
commit
741b4bc235
34
net/conn.go
34
net/conn.go
@ -40,6 +40,16 @@ func (c *Conn) Write(b []byte) (n int, err error) {
|
|||||||
return c.conn.Write(b)
|
return c.conn.Write(b)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Conn) SetDeadLine(t time.Time) (error) {
|
||||||
|
c.conn.SetDeadline(t)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Conn) SetKeepAlive(b bool) (error) {
|
||||||
|
c.conn.(*net.TCPConn).SetKeepAlive(b)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (conn *Conn) WriteChunks(c [][]byte) (n int, err error) {
|
func (conn *Conn) WriteChunks(c [][]byte) (n int, err error) {
|
||||||
total := 0
|
total := 0
|
||||||
for i := 0; i < len(c); i++ {
|
for i := 0; i < len(c); i++ {
|
||||||
@ -87,9 +97,15 @@ func (lConn *Conn) HandleHttp(p packet.HttpPacket) {
|
|||||||
|
|
||||||
ip, err := doh.Lookup(p.Domain())
|
ip, err := doh.Lookup(p.Domain())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[DOH] Error looking up for domain with ", p.Domain() , err)
|
// log.Error("[HTTP DOH] Error looking up for domain with ", p.Domain() , " ", err)
|
||||||
|
log.Error(lConn.RemoteAddr().String())
|
||||||
|
// log.Error(string(p.Raw()))
|
||||||
|
lConn.Write([]byte(p.Version() + " 502 Bad Gateway\r\n\r\n"))
|
||||||
|
lConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
log.Info(string(lConn.RemoteAddr().String()))
|
||||||
|
|
||||||
|
|
||||||
log.Debug("[DOH] Found ", ip, " with ", p.Domain())
|
log.Debug("[DOH] Found ", ip, " with ", p.Domain())
|
||||||
|
|
||||||
@ -102,6 +118,7 @@ func (lConn *Conn) HandleHttp(p packet.HttpPacket) {
|
|||||||
rConn, err := Dial("tcp", ip + port)
|
rConn, err := Dial("tcp", ip + port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[HTTPS] ", err)
|
log.Debug("[HTTPS] ", err)
|
||||||
|
lConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,6 +130,8 @@ func (lConn *Conn) HandleHttp(p packet.HttpPacket) {
|
|||||||
_, err = rConn.Write(p.Raw())
|
_, err = rConn.Write(p.Raw())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[HTTP] Error sending request to ", p.Domain(), err)
|
log.Debug("[HTTP] Error sending request to ", p.Domain(), err)
|
||||||
|
lConn.Close()
|
||||||
|
rConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,7 +143,9 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
|
|||||||
|
|
||||||
ip, err := doh.Lookup(p.Domain())
|
ip, err := doh.Lookup(p.Domain())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[DOH] Error looking up for domain: ", p.Domain(), " ", err)
|
log.Error("[HTTPS DOH] Error looking up for domain: ", p.Domain(), " ", err)
|
||||||
|
lConn.Write([]byte(p.Version() + " 502 Bad Gateway\r\n\r\n"))
|
||||||
|
lConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -139,6 +160,7 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
|
|||||||
rConn, err := Dial("tcp", ip + port)
|
rConn, err := Dial("tcp", ip + port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[HTTPS] ", err)
|
log.Debug("[HTTPS] ", err)
|
||||||
|
lConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,6 +169,8 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
|
|||||||
_, err = lConn.Write([]byte(p.Version() + " 200 Connection Established\r\n\r\n"))
|
_, err = lConn.Write([]byte(p.Version() + " 200 Connection Established\r\n\r\n"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[HTTPS] Error sending 200 Connection Established to the client", err)
|
log.Debug("[HTTPS] Error sending 200 Connection Established to the client", err)
|
||||||
|
lConn.Close()
|
||||||
|
rConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.Debug("[HTTPS] Sent 200 Connection Estabalished to the client")
|
log.Debug("[HTTPS] Sent 200 Connection Estabalished to the client")
|
||||||
@ -156,6 +180,8 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debug("[HTTPS] Error reading client hello from the client", err)
|
log.Debug("[HTTPS] Error reading client hello from the client", err)
|
||||||
log.Debug("[HTTPS] Closing local connection..")
|
log.Debug("[HTTPS] Closing local connection..")
|
||||||
|
lConn.Close()
|
||||||
|
rConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,6 +197,8 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
|
|||||||
|
|
||||||
if _, err := rConn.WriteChunks(chunks); err != nil {
|
if _, err := rConn.WriteChunks(chunks); err != nil {
|
||||||
log.Debug("[HTTPS] Error writing client hello to ", p.Domain(), err)
|
log.Debug("[HTTPS] Error writing client hello to ", p.Domain(), err)
|
||||||
|
lConn.Close()
|
||||||
|
rConn.Close()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,7 +206,7 @@ func (lConn *Conn) HandleHttps(p packet.HttpPacket) {
|
|||||||
|
|
||||||
func (from *Conn) Serve(to *Conn, proto string, fd string, td string) {
|
func (from *Conn) Serve(to *Conn, proto string, fd string, td string) {
|
||||||
defer from.Close()
|
defer from.Close()
|
||||||
defer to.CloseWrite()
|
defer to.Close()
|
||||||
|
|
||||||
proto += " "
|
proto += " "
|
||||||
|
|
||||||
|
@ -2,6 +2,7 @@ package proxy
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/xvzc/SpoofDPI/net"
|
"github.com/xvzc/SpoofDPI/net"
|
||||||
@ -23,7 +24,7 @@ func (p *Proxy) Port() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Proxy) Start() {
|
func (p *Proxy) Start() {
|
||||||
l, err := net.Listen("tcp", ":"+p.Port())
|
l, err := net.Listen("tcp", "127.0.0.1:"+p.Port())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error creating listener: ", err)
|
log.Fatal("Error creating listener: ", err)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@ -37,6 +38,8 @@ func (p *Proxy) Start() {
|
|||||||
log.Fatal("Error accepting connection: ", err)
|
log.Fatal("Error accepting connection: ", err)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
conn.SetDeadLine(time.Now().Add(3 * time.Second))
|
||||||
|
conn.SetKeepAlive(false)
|
||||||
|
|
||||||
log.Debug("[PROXY] Accepted a new connection from ", conn.RemoteAddr())
|
log.Debug("[PROXY] Accepted a new connection from ", conn.RemoteAddr())
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user