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
986b2747
Commit
986b2747
authored
Sep 15, 2016
by
rui.zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix wss bug
parent
f7c8c400
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
19 deletions
+13
-19
conn.go
conn.go
+2
-2
ws.go
ws.go
+11
-17
No files found.
conn.go
View file @
986b2747
...
...
@@ -440,13 +440,13 @@ func forward(conn net.Conn, arg Args) (net.Conn, error) {
switch
arg
.
Transport
{
case
"ws"
:
// websocket connection
conn
,
err
=
wsClient
(
conn
,
arg
.
Addr
)
conn
,
err
=
wsClient
(
"ws"
,
conn
,
arg
.
Addr
)
if
err
!=
nil
{
return
nil
,
err
}
case
"wss"
:
// websocket security
tlsUsed
=
true
conn
,
err
=
ws
sClient
(
conn
,
arg
.
Addr
)
conn
,
err
=
ws
Client
(
"wss"
,
conn
,
arg
.
Addr
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
ws.go
View file @
986b2747
...
...
@@ -17,24 +17,18 @@ type wsConn struct {
rb
[]
byte
}
func
wsClient
(
conn
net
.
Conn
,
host
string
)
(
*
wsConn
,
error
)
{
c
,
resp
,
err
:=
websocket
.
NewClient
(
conn
,
&
url
.
URL
{
Scheme
:
"ws"
,
Host
:
host
,
Path
:
"/ws"
},
nil
,
4096
,
4096
)
if
err
!=
nil
{
return
nil
,
err
}
resp
.
Body
.
Close
()
return
&
wsConn
{
conn
:
c
},
nil
}
func
wssClient
(
conn
net
.
Conn
,
host
string
)
(
*
wsConn
,
error
)
{
tlsConn
:=
tls
.
Client
(
conn
,
&
tls
.
Config
{
InsecureSkipVerify
:
true
})
if
err
:=
tlsConn
.
Handshake
();
err
!=
nil
{
return
nil
,
err
func
wsClient
(
scheme
string
,
conn
net
.
Conn
,
host
string
)
(
*
wsConn
,
error
)
{
dialer
:=
websocket
.
Dialer
{
ReadBufferSize
:
4096
,
WriteBufferSize
:
4096
,
TLSClientConfig
:
&
tls
.
Config
{
InsecureSkipVerify
:
true
},
HandshakeTimeout
:
time
.
Second
*
90
,
NetDial
:
func
(
net
,
addr
string
)
(
net
.
Conn
,
error
)
{
return
conn
,
nil
},
}
conn
=
tlsConn
c
,
resp
,
err
:=
websocket
.
NewClient
(
conn
,
&
url
.
URL
{
Scheme
:
"wss"
,
Host
:
host
,
Path
:
"/ws"
},
nil
,
4096
,
4096
)
u
:=
url
.
URL
{
Scheme
:
scheme
,
Host
:
host
,
Path
:
"/ws"
}
c
,
resp
,
err
:=
dialer
.
Dial
(
u
.
String
(),
nil
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
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