diff options
| author | Shulhan <ms@kilabit.info> | 2019-03-05 21:16:22 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2019-03-05 21:16:22 +0700 |
| commit | 0d32f2b50c90ad7fb0e0b9a4bdd67c97a8102227 (patch) | |
| tree | 7c819ee1e5b24005e42f89fadcf98591e607888f /lib/websocket | |
| parent | 38b5fbef67b97338085579228f0f663a1b9ce298 (diff) | |
| download | pakakeh.go-0d32f2b50c90ad7fb0e0b9a4bdd67c97a8102227.tar.xz | |
websocket: unexport the Frame Pack method
The method Pack on single frame is not usable in the point of view of
implementor, since we prefer NewFrameXxx to create frame by operation code.
Diffstat (limited to 'lib/websocket')
| -rw-r--r-- | lib/websocket/client_test.go | 2 | ||||
| -rw-r--r-- | lib/websocket/frame.go | 6 | ||||
| -rw-r--r-- | lib/websocket/frame_test.go | 2 | ||||
| -rw-r--r-- | lib/websocket/funcs.go | 2 | ||||
| -rw-r--r-- | lib/websocket/server.go | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/lib/websocket/client_test.go b/lib/websocket/client_test.go index 92f7455d..bf91834c 100644 --- a/lib/websocket/client_test.go +++ b/lib/websocket/client_test.go @@ -301,7 +301,7 @@ func TestClientFragmentation(t *testing.T) { } for x := 0; x < len(c.frames); x++ { - req := c.frames[x].Pack(true) + req := c.frames[x].pack(true) err := testClient.send(context.Background(), req, nil) if err != nil { diff --git a/lib/websocket/frame.go b/lib/websocket/frame.go index ed378b20..c151486d 100644 --- a/lib/websocket/frame.go +++ b/lib/websocket/frame.go @@ -190,7 +190,7 @@ func newFrame(opcode opcode, isMasked bool, payload []byte) []byte { if isMasked { f.masked = frameIsMasked } - return f.Pack(isMasked) + return f.pack(isMasked) } // @@ -276,7 +276,7 @@ func (f *Frame) IsData() bool { } // -// Pack websocket Frame into packet that can be sent through network. +// pack websocket Frame into packet that can be sent through network. // // Caller must set frame fields Fin, opcode, masked, and payload. // @@ -288,7 +288,7 @@ func (f *Frame) IsData() bool { // A server MUST NOT mask any frames that it sends to the client. ( // (RFC 6455 5.1-P27). // -func (f *Frame) Pack(randomMask bool) (out []byte) { +func (f *Frame) pack(randomMask bool) (out []byte) { headerSize := uint64(2) payloadSize := uint64(len(f.payload)) diff --git a/lib/websocket/frame_test.go b/lib/websocket/frame_test.go index a83d2d6b..862ac894 100644 --- a/lib/websocket/frame_test.go +++ b/lib/websocket/frame_test.go @@ -336,7 +336,7 @@ func TestFramePack(t *testing.T) { for _, c := range cases { t.Log(c.desc) - got := c.f.Pack(false) + got := c.f.pack(false) test.Assert(t, "", c.exp, got, true) } diff --git a/lib/websocket/funcs.go b/lib/websocket/funcs.go index a7b53b84..8c0481f3 100644 --- a/lib/websocket/funcs.go +++ b/lib/websocket/funcs.go @@ -86,7 +86,7 @@ func SendFrame(fd int, f *Frame, randomMask bool) (err error) { return } - packet := f.Pack(randomMask) + packet := f.pack(randomMask) return Send(fd, packet) } diff --git a/lib/websocket/server.go b/lib/websocket/server.go index 4d315166..19cb364f 100644 --- a/lib/websocket/server.go +++ b/lib/websocket/server.go @@ -425,7 +425,7 @@ func (serv *Server) handleClose(conn int, req *Frame) { req.opcode = opcodeClose req.masked = 0 - res := req.Pack(false) + res := req.pack(false) _, err := unix.Write(conn, res) if err != nil { @@ -464,7 +464,7 @@ func (serv *Server) handlePing(conn int, req *Frame) { req.opcode = opcodePong req.masked = 0 - res := req.Pack(false) + res := req.pack(false) _, err := unix.Write(conn, res) if err != nil { |