Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

echo back requested Sec-Websocket-Protocol header for better browser … #24

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

echo back requested Sec-Websocket-Protocol header for better browser … #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions golang/websockify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,6 @@ func init() {
web = flag.String("web", path, "web root folder")
}

var upgrader = websocket.Upgrader{
ReadBufferSize: 1024,
WriteBufferSize: 1024,
CheckOrigin: func(r *http.Request) bool {
return true
},
}

func forwardTcp(wsConn *websocket.Conn, conn net.Conn) {
var tcpBuffer [1024]byte
defer func() {
Expand All @@ -56,20 +48,20 @@ func forwardTcp(wsConn *websocket.Conn, conn net.Conn) {
}
n, err := conn.Read(tcpBuffer[0:])
if err != nil {
log.Printf("%s: reading from TCP failed: %s", time.Now().Format(time.Stamp), err)
log.Printf("%s: TCP.Read() failed: %s", time.Now().Format(time.Stamp), err)
return
}
if err := wsConn.WriteMessage(websocket.BinaryMessage, tcpBuffer[0:n]); err != nil {
log.Printf("%s: websocket.WriteMessage() failed: %s", time.Now().Format(time.Stamp), err)
return
} else {
if err := wsConn.WriteMessage(websocket.BinaryMessage, tcpBuffer[0:n]); err != nil {
log.Printf("%s: writing to WS failed: %s", time.Now().Format(time.Stamp), err)
}
}
}
}

func forwardWeb(wsConn *websocket.Conn, conn net.Conn) {
defer func() {
if err := recover(); err != nil {
log.Printf("%s: reading from WS failed: %s", time.Now().Format(time.Stamp), err)
log.Printf("%s: websocket forwarding side panic: %s", time.Now().Format(time.Stamp), err)
}
if conn != nil {
conn.Close()
Expand All @@ -84,15 +76,26 @@ func forwardWeb(wsConn *websocket.Conn, conn net.Conn) {
}

_, buffer, err := wsConn.ReadMessage()
if err == nil {
if _, err := conn.Write(buffer); err != nil {
log.Printf("%s: writing to TCP failed: %s", time.Now().Format(time.Stamp), err)
}
if err != nil {
log.Printf("%s: websocket.ReadMessage() failed: %s", time.Now().Format(time.Stamp), err)
return
}
if _, err := conn.Write(buffer); err != nil {
log.Printf("%s: tcp.Write() failed: %s", time.Now().Format(time.Stamp), err)
return
}
}
}

func serveWs(w http.ResponseWriter, r *http.Request) {
upgrader := websocket.Upgrader{
ReadBufferSize: 1024,
WriteBufferSize: 1024,
CheckOrigin: func(r *http.Request) bool {
return true
},
Subprotocols: websocket.Subprotocols(r),
}
ws, err := upgrader.Upgrade(w, r, nil)
if err != nil {
log.Printf("%s: failed to upgrade to WS: %s", time.Now().Format(time.Stamp), err)
Expand Down