root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
rui.zheng 2015-05-12 16:11:18 +08:00
commit 0eabf75988
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
socks5.go
View File

@ -140,13 +140,13 @@ func socks5Handle(conn net.Conn) {
req, err := gosocks5.ReadRequest(conn)
if err != nil {
//log.Println(err)
log.Println(err)
return
}
switch req.Cmd {
case gosocks5.CmdConnect:
//log.Println("connect", req.Addr.String())
log.Println("connect", req.Addr.String())
tconn, err := Connect(req.Addr.String(), Proxy)
if err != nil {
gosocks5.NewReply(gosocks5.HostUnreachable, nil).Write(conn)

15
ws.go
View File

@ -24,7 +24,9 @@ func (conn *WSConn) Read(b []byte) (n int, err error) {
if err != nil {
return
}
return r.Read(b)
n, err = r.Read(b)
log.Println("ws r:", n)
return
}
func (conn *WSConn) Write(b []byte) (n int, err error) {
@ -33,7 +35,10 @@ func (conn *WSConn) Write(b []byte) (n int, err error) {
return
}
defer w.Close()
return w.Write(b)
n, err = w.Write(b)
log.Println("ws w:", n)
return
}
func (conn *WSConn) SetDeadline(t time.Time) error {
@ -62,6 +67,12 @@ func (s *WSServer) handle(w http.ResponseWriter, r *http.Request) {
defer conn.Close()
c := gosocks5.ServerConn(NewWSConn(conn), serverConfig)
/*
if err := c.Handleshake(); err != nil {
log.Println(err)
return
}
*/
socks5Handle(c)
}