fix some global var access (thanks to lualint)

Author: lipp

ludent.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+ludent $(find . -name "*.lua")

spec/client_ev_spec.lua

@@ -159,7 +159,7 @@ describe(
         wsc:on_error(async(function(ws,err)
               assert.is_same(ws,wsc)
               if socket.tcp6 then
-                 assert.is_equal(err,'host or service not provided, or not known')
+                assert.is_equal(err,'host or service not provided, or not known')
               else
                 assert.is_equal(err,'host not found')
               end

src/websocket/client_copas.lua

@@ -11,7 +11,7 @@ local new = function(ws)
   self.sock_connect = function(self,host,port)
     self.sock = socket.tcp()
     if ws.timeout ~= nil then
-      sock:settimeout(ws.timeout)
+      self.sock:settimeout(ws.timeout)
     end
     local _,err = copas.connect(self.sock,host,port)
     if err and err ~= 'already connected' then

src/websocket/client_ev.lua

@@ -96,14 +96,14 @@ local ev = function(ws)
             on_close(true,code or 1005,reason)
           end,handle_socket_err)
       else
-        on_close(true,code or 1005,reason)
+        on_close(true,1005,'')
       end
     end
   end
 
   self.send = function(_,message,opcode)
     local encoded = frame.encode(message,opcode or frame.TEXT,true)
-    async_send(encoded, nil, handle_socket_error)
+    async_send(encoded, nil, handle_socket_err)
   end
 
   self.connect = function(_,url,ws_protocol)

src/websocket/frame.lua

@@ -89,6 +89,7 @@ local decode = function(encoded)
     return nil,2
   end
   local pos,header,payload = sunpack(encoded,'bb')
+  local high,low
   encoded = ssub(encoded,pos)
   local bytes = 2
   local fin = band(header,bit_7) > 0
@@ -146,7 +147,7 @@ end
 
 local encode_close = function(code,reason)
   if code then
-    data = spack('>H',code)
+    local data = spack('>H',code)
     if reason then
       data = data..tostring(reason)
     end

src/websocket/server_ev.lua

@@ -58,12 +58,12 @@ local client = function(sock,protocol)
       on_error(err)
     end
   end
-  local user_on_message
+  local user_on_message = function() end
+  local TEXT = frame.TEXT
+  local BINARY = frame.BINARY
   local on_message = function(message,opcode)
-    if opcode == frame.TEXT or opcode == frame.BINARY then
-      if user_on_message then
-        user_on_message(self,message,opcode)
-      end
+    if opcode == TEXT or opcode == BINARY then
+      user_on_message(self,message,opcode)
     elseif opcode == frame.CLOSE then
       if self.state ~= 'CLOSING' then
         self.state = 'CLOSING'
@@ -75,7 +75,7 @@ local client = function(sock,protocol)
             on_close(true,code or 1006,reason)
           end,handle_sock_err)
       else
-        on_close(true,code or 1006,reason)
+        on_close(true,1006,'')
       end
     end
   end
@@ -172,6 +172,7 @@ local listen = function(opts)
       client_sock:settimeout(0)
       assert(client_sock)
       local request = {}
+      local last
       ev.IO.new(
         function(loop,read_io)
           repeat

src/websocket/sync.lua

@@ -136,7 +136,6 @@ local connect = function(self,ws_url,ws_protocol)
     host = host,
     port = port,
     protocols = {ws_protocol or ''},
-    origin = origin,
     uri = uri
   }
   local n,err = self:sock_send(req)