From bb45b671c007842268d9e9a47d87366a4daebd27 Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Sun, 22 Jul 2018 18:54:18 +0800 Subject: [PATCH] general: add dev_linux conditional build codes --- dev.go | 1 - dev_linux.go | 5 +++++ proxy/ws/frame.go | 22 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 dev_linux.go diff --git a/dev.go b/dev.go index 2aff07f..5f58979 100644 --- a/dev.go +++ b/dev.go @@ -7,7 +7,6 @@ import ( _ "net/http/pprof" _ "github.com/nadoo/glider/proxy/ws" - // _ "github.com/nadoo/glider/proxy/tproxy" ) func init() { diff --git a/dev_linux.go b/dev_linux.go new file mode 100644 index 0000000..1ebcfed --- /dev/null +++ b/dev_linux.go @@ -0,0 +1,5 @@ +package main + +import ( + _ "github.com/nadoo/glider/proxy/tproxy" +) diff --git a/proxy/ws/frame.go b/proxy/ws/frame.go index a38e490..c336039 100644 --- a/proxy/ws/frame.go +++ b/proxy/ws/frame.go @@ -1,4 +1,24 @@ -// https://tools.ietf.org/html/rfc6455 +// https://tools.ietf.org/html/rfc6455#section-5.2 +// +// Frame Format +// 0 1 2 3 +// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +// +-+-+-+-+-------+-+-------------+-------------------------------+ +// |F|R|R|R| opcode|M| Payload len | Extended payload length | +// |I|S|S|S| (4) |A| (7) | (16/64) | +// |N|V|V|V| |S| | (if payload len==126/127) | +// | |1|2|3| |K| | | +// +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - + +// | Extended payload length continued, if payload len == 127 | +// + - - - - - - - - - - - - - - - +-------------------------------+ +// | |Masking-key, if MASK set to 1 | +// +-------------------------------+-------------------------------+ +// | Masking-key (continued) | Payload Data | +// +-------------------------------- - - - - - - - - - - - - - - - + +// : Payload Data continued ... : +// + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +// | Payload Data continued ... | +// +---------------------------------------------------------------+ package ws