Skip to content

Commit

Permalink
fix compiling errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ginuerzh committed Oct 21, 2015
1 parent 6d369f3 commit 398ca52
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func main() {
forwardArgs = parseArgs(forwardAddr)

if len(listenArgs) == 0 {
glog.Fatalln("no listen addr")
glog.Exitln("no listen addr")
}

var wg sync.WaitGroup
Expand Down
17 changes: 8 additions & 9 deletions socks.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/ginuerzh/gosocks5"
"github.com/golang/glog"
"io"
"io/ioutil"
"net"
"strconv"
)
Expand Down Expand Up @@ -269,7 +268,8 @@ func handleSocks5Request(req *gosocks5.Request, conn net.Conn) {
}
}

clientConn, dgram, err := createClientConn(conn, uconn)
//clientConn, dgram, err := createClientConn(conn, uconn)
_, dgram, err := createClientConn(conn, uconn)
if err != nil {
if glog.V(LWARNING) {
glog.Warningln("socks5 udp:", err)
Expand All @@ -280,7 +280,8 @@ func handleSocks5Request(req *gosocks5.Request, conn net.Conn) {
glog.Infof("[udp] length %d, to %s", len(dgram.Data), dgram.Header.Addr)
}

serverConn, err := createServerConn(uconn)
//serverConn, err := createServerConn(uconn)
_, err = createServerConn(uconn)
if err != nil {
if glog.V(LWARNING) {
glog.Warningln("socks5 udp forward:", err)
Expand Down Expand Up @@ -355,6 +356,7 @@ func createServerConn(uconn *net.UDPConn) (c *UDPConn, err error) {
return
}

/*
func forwardUDP(req *gosocks5.Request) (conn net.Conn, err error) {
if err != nil {
Expand Down Expand Up @@ -389,11 +391,7 @@ func forwardUDP(req *gosocks5.Request) (conn net.Conn, err error) {
}
}

func transportUDP() {

}

*/
func serveBind(conn net.Conn) error {
l, err := net.ListenTCP("tcp", nil)
if err != nil {
Expand Down Expand Up @@ -539,6 +537,7 @@ func peekReply(dst io.Writer, src io.Reader) error {
return nil
}

/*
func cliTunnelUDP(uconn *net.UDPConn, sconn net.Conn) {
var raddr *net.UDPAddr
Expand Down Expand Up @@ -636,7 +635,7 @@ func srvTunnelUDP(conn net.Conn, uconn *net.UDPConn) {
}
}
}

*/
func ToSocksAddr(addr net.Addr) *gosocks5.Addr {
host, port, _ := net.SplitHostPort(addr.String())
p, _ := strconv.Atoi(port)
Expand Down
12 changes: 6 additions & 6 deletions udp.go
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package main

import (
"github.com/ginuerzh/gosocks5"
"github.com/golang/glog"
//"github.com/ginuerzh/gosocks5"
//"github.com/golang/glog"
"net"
)

type UDPConn struct {
isClient bool
udpConn *net.UDPConn
udpAddr *net.UDPAddr
addr net.Addr
tcpConn net.Conn
}

func Client(conn net.Conn, addr net.Addr) *UDPConn {
client := &UDPConn{isClient: true}

switch conn := conn.(type) {
case net.UDPConn:
case *net.UDPConn:
client.udpConn = conn
client.udpAddr = addr
client.addr = addr
default:
client.tcpConn = conn
}
Expand All @@ -30,7 +30,7 @@ func Client(conn net.Conn, addr net.Addr) *UDPConn {
func Server(conn net.Conn) *UDPConn {
server := &UDPConn{}
switch conn := conn.(type) {
case net.UDPConn:
case *net.UDPConn:
server.udpConn = conn
default:
server.tcpConn = conn
Expand Down

0 comments on commit 398ca52

Please sign in to comment.