Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
G
gost
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
gost
Commits
398ca524
Commit
398ca524
authored
Oct 21, 2015
by
ginuerzh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compiling errors
parent
6d369f37
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
16 deletions
+15
-16
main.go
main.go
+1
-1
socks.go
socks.go
+8
-9
udp.go
udp.go
+6
-6
No files found.
main.go
View file @
398ca524
...
@@ -51,7 +51,7 @@ func main() {
...
@@ -51,7 +51,7 @@ func main() {
forwardArgs
=
parseArgs
(
forwardAddr
)
forwardArgs
=
parseArgs
(
forwardAddr
)
if
len
(
listenArgs
)
==
0
{
if
len
(
listenArgs
)
==
0
{
glog
.
Fatal
ln
(
"no listen addr"
)
glog
.
Exit
ln
(
"no listen addr"
)
}
}
var
wg
sync
.
WaitGroup
var
wg
sync
.
WaitGroup
...
...
socks.go
View file @
398ca524
...
@@ -7,7 +7,6 @@ import (
...
@@ -7,7 +7,6 @@ import (
"github.com/ginuerzh/gosocks5"
"github.com/ginuerzh/gosocks5"
"github.com/golang/glog"
"github.com/golang/glog"
"io"
"io"
"io/ioutil"
"net"
"net"
"strconv"
"strconv"
)
)
...
@@ -269,7 +268,8 @@ func handleSocks5Request(req *gosocks5.Request, conn net.Conn) {
...
@@ -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
err
!=
nil
{
if
glog
.
V
(
LWARNING
)
{
if
glog
.
V
(
LWARNING
)
{
glog
.
Warningln
(
"socks5 udp:"
,
err
)
glog
.
Warningln
(
"socks5 udp:"
,
err
)
...
@@ -280,7 +280,8 @@ func handleSocks5Request(req *gosocks5.Request, conn net.Conn) {
...
@@ -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
)
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
err
!=
nil
{
if
glog
.
V
(
LWARNING
)
{
if
glog
.
V
(
LWARNING
)
{
glog
.
Warningln
(
"socks5 udp forward:"
,
err
)
glog
.
Warningln
(
"socks5 udp forward:"
,
err
)
...
@@ -355,6 +356,7 @@ func createServerConn(uconn *net.UDPConn) (c *UDPConn, err error) {
...
@@ -355,6 +356,7 @@ func createServerConn(uconn *net.UDPConn) (c *UDPConn, err error) {
return
return
}
}
/*
func forwardUDP(req *gosocks5.Request) (conn net.Conn, err error) {
func forwardUDP(req *gosocks5.Request) (conn net.Conn, err error) {
if err != nil {
if err != nil {
...
@@ -389,11 +391,7 @@ func forwardUDP(req *gosocks5.Request) (conn net.Conn, err error) {
...
@@ -389,11 +391,7 @@ func forwardUDP(req *gosocks5.Request) (conn net.Conn, err error) {
}
}
}
}
*/
func
transportUDP
()
{
}
func
serveBind
(
conn
net
.
Conn
)
error
{
func
serveBind
(
conn
net
.
Conn
)
error
{
l
,
err
:=
net
.
ListenTCP
(
"tcp"
,
nil
)
l
,
err
:=
net
.
ListenTCP
(
"tcp"
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -539,6 +537,7 @@ func peekReply(dst io.Writer, src io.Reader) error {
...
@@ -539,6 +537,7 @@ func peekReply(dst io.Writer, src io.Reader) error {
return
nil
return
nil
}
}
/*
func cliTunnelUDP(uconn *net.UDPConn, sconn net.Conn) {
func cliTunnelUDP(uconn *net.UDPConn, sconn net.Conn) {
var raddr *net.UDPAddr
var raddr *net.UDPAddr
...
@@ -636,7 +635,7 @@ func srvTunnelUDP(conn net.Conn, uconn *net.UDPConn) {
...
@@ -636,7 +635,7 @@ func srvTunnelUDP(conn net.Conn, uconn *net.UDPConn) {
}
}
}
}
}
}
*/
func
ToSocksAddr
(
addr
net
.
Addr
)
*
gosocks5
.
Addr
{
func
ToSocksAddr
(
addr
net
.
Addr
)
*
gosocks5
.
Addr
{
host
,
port
,
_
:=
net
.
SplitHostPort
(
addr
.
String
())
host
,
port
,
_
:=
net
.
SplitHostPort
(
addr
.
String
())
p
,
_
:=
strconv
.
Atoi
(
port
)
p
,
_
:=
strconv
.
Atoi
(
port
)
...
...
udp.go
View file @
398ca524
package
main
package
main
import
(
import
(
"github.com/ginuerzh/gosocks5"
//
"github.com/ginuerzh/gosocks5"
"github.com/golang/glog"
//
"github.com/golang/glog"
"net"
"net"
)
)
type
UDPConn
struct
{
type
UDPConn
struct
{
isClient
bool
isClient
bool
udpConn
*
net
.
UDPConn
udpConn
*
net
.
UDPConn
udpAddr
*
net
.
UDP
Addr
addr
net
.
Addr
tcpConn
net
.
Conn
tcpConn
net
.
Conn
}
}
...
@@ -17,9 +17,9 @@ func Client(conn net.Conn, addr net.Addr) *UDPConn {
...
@@ -17,9 +17,9 @@ func Client(conn net.Conn, addr net.Addr) *UDPConn {
client
:=
&
UDPConn
{
isClient
:
true
}
client
:=
&
UDPConn
{
isClient
:
true
}
switch
conn
:=
conn
.
(
type
)
{
switch
conn
:=
conn
.
(
type
)
{
case
net
.
UDPConn
:
case
*
net
.
UDPConn
:
client
.
udpConn
=
conn
client
.
udpConn
=
conn
client
.
udpA
ddr
=
addr
client
.
a
ddr
=
addr
default
:
default
:
client
.
tcpConn
=
conn
client
.
tcpConn
=
conn
}
}
...
@@ -30,7 +30,7 @@ func Client(conn net.Conn, addr net.Addr) *UDPConn {
...
@@ -30,7 +30,7 @@ func Client(conn net.Conn, addr net.Addr) *UDPConn {
func
Server
(
conn
net
.
Conn
)
*
UDPConn
{
func
Server
(
conn
net
.
Conn
)
*
UDPConn
{
server
:=
&
UDPConn
{}
server
:=
&
UDPConn
{}
switch
conn
:=
conn
.
(
type
)
{
switch
conn
:=
conn
.
(
type
)
{
case
net
.
UDPConn
:
case
*
net
.
UDPConn
:
server
.
udpConn
=
conn
server
.
udpConn
=
conn
default
:
default
:
server
.
tcpConn
=
conn
server
.
tcpConn
=
conn
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment