github/sower
4
0
Fork 0
mirror of https://github.com/wweir/sower.git synced 2024-04-21 12:42:15 +00:00
Code Issues Releases Wiki Activity

Fix protocol

Browse Source
This commit is contained in:
wweir
2019-04-04 10:57:25 +08:00
parent 2becd42176
commit aed2afbe6d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/parser/parse_addr.go → proxy/parser/parse.go
+7 -4
View File
@@ -27,7 +27,7 @@ type conn struct {
net.Conn
}
func NewAnyProtocol(c net.Conn, domain, port string) net.Conn {
func NewOtherConn(c net.Conn, domain, port string) net.Conn {
return &conn{
typ: OTHER,
domain: domain,
@@ -35,13 +35,13 @@ func NewAnyProtocol(c net.Conn, domain, port string) net.Conn {
Conn: c,
}
}
func NewHttpProtocol(c net.Conn) net.Conn {
func NewHttpConn(c net.Conn) net.Conn {
return &conn{
typ: HTTP,
Conn: c,
}
}
func NewHttpsProtocol(c net.Conn, port string) net.Conn {
func NewHttpsConn(c net.Conn, port string) net.Conn {
return &conn{
typ: HTTPS,
port: port,
@@ -54,16 +54,19 @@ func (c *conn) Write(b []byte) (n int, err error) {
var pkg []byte
switch c.typ {
case OTHER:
// type + domain + ':' + port + data
pkg = make([]byte, 0, 1+len(c.domain)+1+len(c.port)+len(b))
pkg = append(pkg, OTHER)
pkg = append(pkg, byte(len(c.domain)+1+len(c.port)))
pkg = append(pkg, []byte(c.domain+":"+c.port)...)
case HTTP:
// type + data
pkg = make([]byte, 0, 1+len(b))
pkg = append(pkg, HTTP)
case HTTPS:
// type + port + data
pkg = make([]byte, 0, 1+2+len(b))
pkg = append(pkg, HTTPS)
port, _ := strconv.Atoi(c.port)
@@ -139,7 +142,7 @@ func ParseHttpsHost(conn net.Conn) (net.Conn, string, error) {
teeConn.StartOrReset()
defer teeConn.Stop()
domain, _, err := extractSNI(io.Reader(teeConn))
domain, _, err := extractSNI(teeConn)
if err != nil {
return teeConn, "", err
} else if domain == "" {
proxy/shadow/shadow.go
+1 -1
View File
@@ -71,7 +71,7 @@ func (c *conn) Write(b []byte) (n int, err error) {
}
// BigEndian
c.writeBuf[0], c.writeBuf[1] = byte((dataSize&0xFF00)>>8), byte(dataSize&0xFF)
c.writeBuf[0], c.writeBuf[1] = byte(dataSize>>8), byte(dataSize)
c.aead.Seal(c.writeBuf[:0], c.encryptNonce(), c.writeBuf[:2], nil)
c.aead.Seal(c.writeBuf[:2+c.aead.Overhead()], c.encryptNonce(), b[:dataSize], nil)