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
ee8b5d57
Commit
ee8b5d57
authored
Feb 28, 2020
by
ginuerzh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix type assert
parent
e203d776
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
2 deletions
+31
-2
relay.go
relay.go
+17
-0
ss.go
ss.go
+7
-1
tuntap.go
tuntap.go
+7
-1
No files found.
relay.go
View file @
ee8b5d57
...
@@ -271,16 +271,20 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
...
@@ -271,16 +271,20 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
resp
:=
new
(
relay
.
Response
)
resp
:=
new
(
relay
.
Response
)
_
,
err
=
resp
.
ReadFrom
(
c
.
Conn
)
_
,
err
=
resp
.
ReadFrom
(
c
.
Conn
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Log
(
"[relay] read:"
,
err
)
return
return
}
}
if
resp
.
Version
!=
relay
.
Version1
{
if
resp
.
Version
!=
relay
.
Version1
{
err
=
relay
.
ErrBadVersion
err
=
relay
.
ErrBadVersion
log
.
Log
(
"[relay] read:"
,
err
)
return
return
}
}
if
resp
.
Status
!=
relay
.
StatusOK
{
if
resp
.
Status
!=
relay
.
StatusOK
{
err
=
fmt
.
Errorf
(
"status %d"
,
resp
.
Status
)
err
=
fmt
.
Errorf
(
"status %d"
,
resp
.
Status
)
log
.
Log
(
"[relay] read:"
,
err
)
return
return
}
}
log
.
Log
(
"[relay] read response OK"
)
})
})
if
!
c
.
udp
{
if
!
c
.
udp
{
...
@@ -292,6 +296,7 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
...
@@ -292,6 +296,7 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
return
return
}
}
dlen
:=
int
(
binary
.
BigEndian
.
Uint16
(
bb
[
:
]))
dlen
:=
int
(
binary
.
BigEndian
.
Uint16
(
bb
[
:
]))
log
.
Log
(
"[relay] read udp"
,
dlen
)
if
len
(
b
)
>=
dlen
{
if
len
(
b
)
>=
dlen
{
return
io
.
ReadFull
(
c
.
Conn
,
b
[
:
dlen
])
return
io
.
ReadFull
(
c
.
Conn
,
b
[
:
dlen
])
}
}
...
@@ -301,6 +306,12 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
...
@@ -301,6 +306,12 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
return
return
}
}
func
(
c
*
relayConn
)
ReadFrom
(
b
[]
byte
)
(
n
int
,
addr
net
.
Addr
,
err
error
)
{
n
,
err
=
c
.
Read
(
b
)
addr
=
c
.
Conn
.
RemoteAddr
()
return
}
func
(
c
*
relayConn
)
Write
(
b
[]
byte
)
(
n
int
,
err
error
)
{
func
(
c
*
relayConn
)
Write
(
b
[]
byte
)
(
n
int
,
err
error
)
{
if
len
(
b
)
>
0xFFFF
{
if
len
(
b
)
>
0xFFFF
{
err
=
errors
.
New
(
"write: data maximum exceeded"
)
err
=
errors
.
New
(
"write: data maximum exceeded"
)
...
@@ -314,6 +325,7 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
...
@@ -314,6 +325,7 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
c
.
wbuf
.
Write
(
bb
[
:
])
c
.
wbuf
.
Write
(
bb
[
:
])
}
}
c
.
wbuf
.
Write
(
b
)
// append the data to the cached header
c
.
wbuf
.
Write
(
b
)
// append the data to the cached header
log
.
Log
(
"[relay] write wbuf"
,
len
(
b
))
// _, err = c.Conn.Write(c.wbuf.Bytes())
// _, err = c.Conn.Write(c.wbuf.Bytes())
// c.wbuf.Reset()
// c.wbuf.Reset()
_
,
err
=
c
.
wbuf
.
WriteTo
(
c
.
Conn
)
_
,
err
=
c
.
wbuf
.
WriteTo
(
c
.
Conn
)
...
@@ -327,5 +339,10 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
...
@@ -327,5 +339,10 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
binary
.
BigEndian
.
PutUint16
(
buf
[
:
2
],
uint16
(
len
(
b
)))
binary
.
BigEndian
.
PutUint16
(
buf
[
:
2
],
uint16
(
len
(
b
)))
n
=
copy
(
buf
[
2
:
],
b
)
n
=
copy
(
buf
[
2
:
],
b
)
_
,
err
=
c
.
Conn
.
Write
(
buf
)
_
,
err
=
c
.
Conn
.
Write
(
buf
)
log
.
Log
(
"[relay] write"
,
n
)
return
return
}
}
func
(
c
*
relayConn
)
WriteTo
(
b
[]
byte
,
addr
net
.
Addr
)
(
n
int
,
err
error
)
{
return
c
.
Write
(
b
)
}
ss.go
View file @
ee8b5d57
...
@@ -302,7 +302,13 @@ func (h *shadowUDPHandler) Handle(conn net.Conn) {
...
@@ -302,7 +302,13 @@ func (h *shadowUDPHandler) Handle(conn net.Conn) {
log
.
Logf
(
"[ssu] %s: %s"
,
conn
.
LocalAddr
(),
err
)
log
.
Logf
(
"[ssu] %s: %s"
,
conn
.
LocalAddr
(),
err
)
return
return
}
}
cc
=
c
.
(
net
.
PacketConn
)
var
ok
bool
cc
,
ok
=
c
.
(
net
.
PacketConn
)
if
!
ok
{
log
.
Logf
(
"[ssu] %s: not a packet connection"
,
conn
.
LocalAddr
())
return
}
defer
cc
.
Close
()
defer
cc
.
Close
()
pc
,
ok
:=
conn
.
(
net
.
PacketConn
)
pc
,
ok
:=
conn
.
(
net
.
PacketConn
)
...
...
tuntap.go
View file @
ee8b5d57
...
@@ -173,7 +173,13 @@ func (h *tunHandler) Handle(conn net.Conn) {
...
@@ -173,7 +173,13 @@ func (h *tunHandler) Handle(conn net.Conn) {
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
pc
=
cc
.
(
net
.
PacketConn
)
var
ok
bool
pc
,
ok
=
cc
.
(
net
.
PacketConn
)
if
!
ok
{
err
=
errors
.
New
(
"not a packet connection"
)
log
.
Logf
(
"[tun] %s - %s: %s"
,
conn
.
LocalAddr
(),
raddr
,
err
)
return
err
}
}
else
{
}
else
{
if
h
.
options
.
TCPMode
{
if
h
.
options
.
TCPMode
{
if
raddr
!=
nil
{
if
raddr
!=
nil
{
...
...
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