through error on ngx.flush and ngx.echo in udp context + tests. style.

Author: alonbg

src/ngx_stream_lua_output.c

@@ -61,7 +61,7 @@ ngx_stream_lua_ngx_echo(lua_State *L, unsigned newline)
     }
 
     if (s->connection->type == SOCK_DGRAM) {
-        return luaL_error(L, "api call is not supported under udp transport");
+        return luaL_error(L, "not supported in udp requests");
     }
 
     ctx = ngx_stream_get_module_ctx(s, ngx_stream_lua_module);
@@ -480,6 +480,10 @@ ngx_stream_lua_ngx_flush(lua_State *L)
 
     s = ngx_stream_lua_get_session(L);
 
+    if (s->connection->type == SOCK_DGRAM) {
+        return luaL_error(L, "not supported in udp requests");
+    }
+
     wait = 1;  /* always wait */
 
     ctx = ngx_stream_get_module_ctx(s, ngx_stream_lua_module);
@@ -567,6 +571,10 @@ ngx_stream_lua_ngx_eof(lua_State *L)
         return luaL_error(L, "no session object found");
     }
 
+    if (s->connection->type == SOCK_DGRAM) {
+        return luaL_error(L, "not supported in udp requests");
+    }
+
     if (lua_gettop(L) != 0) {
         return luaL_error(L, "no argument is expected");
     }

src/ngx_stream_lua_socket_udp.c

@@ -1096,7 +1096,6 @@ ngx_stream_lua_socket_udp_receive(lua_State *L)
     ngx_stream_lua_srv_conf_t             *lscf;
 
     nargs = lua_gettop(L);
-
     if (nargs != 1) {
         return luaL_error(L, "expecting 1 arguments "
                           "(including the object), but got %d", nargs);
@@ -1167,9 +1166,10 @@ ngx_stream_lua_socket_udp_receive(lua_State *L)
          ngx_stream_lua_socket_udp_handle_success(s, u);
          u->connected = 1;
          rc = NGX_OK;
-     } else {
+
+    } else {
          rc = ngx_stream_lua_socket_udp_read(s, u);
-     }
+    }
 
     if (rc == NGX_ERROR) {
         dd("read failed: %d", (int) u->ft_type);
@@ -1354,7 +1354,6 @@ ngx_stream_lua_socket_udp_read(ngx_stream_session_t *s,
     ssize_t                      n;
 
     c = u->udp_connection.connection;
-
     rev = c->read;
 
     ngx_log_debug1(NGX_LOG_DEBUG_STREAM, c->log, 0,

t/138-req-udp-socket.t

@@ -59,7 +59,7 @@ received: hello world! my
 
 --- dgram_response
 --- error_log
-api call is not supported under udp transport
+not supported in udp requests
 
 
 
@@ -73,11 +73,50 @@ api call is not supported under udp transport
 
 --- dgram_response
 --- error_log
-api call is not supported under udp transport
+not supported in udp requests
 
 
 
-=== TEST 4: receive (bad arg number)
+=== TEST 4: ngx.eof after ngx.req.udp_socket(true)
+--- dgram_server_config
+    content_by_lua_block {
+        local sock, err = ngx.req.udp_socket(true)
+        if not sock then
+            ngx.log(ngx.ERR, "failed to get raw request socket: ", err)
+            return ngx.exit(ngx.ERROR)
+        end
+        assert(sock:send(""))
+        ngx.eof()
+}
+
+--- config
+server_tokens off;
+
+--- dgram_response
+--- error_log
+not supported in udp requests
+
+
+
+=== TEST 5: ngx.flush after ngx.udp_req.socket(true)
+--- dgram_server_config
+  content_by_lua_block {
+      local sock, err = ngx.req.udp_socket(true)
+      if not sock then
+          ngx.log(ngx.ERR, "failed to get raw request socket: ", err)
+          return ngx.exit(ngx.ERROR)
+      end
+      assert(sock:send(""))
+      ngx.flush()
+}
+
+--- dgram_response
+--- error_log
+not supported in udp requests
+
+
+
+=== TEST 6: receive (bad arg number)
 --- dgram_server_config
     content_by_lua_block {
         local sock, err = ngx.req.udp_socket()
@@ -91,7 +130,7 @@ expecting 1 arguments (including the object), but got 2
 
 
 
-=== TEST 5: failing reread after reading timeout happens
+=== TEST 7: failing reread after reading timeout happens
 --- SKIP
 --- dgram_server_config
     content_by_lua_block {
@@ -117,7 +156,7 @@ stream lua udp socket read timed out
 
 
 
-=== TEST 6: req socket GC'd
+=== TEST 8: req socket GC'd
 --- dgram_server_config
     content_by_lua_block {
         do

t/140-raw-req-udp-socket.t

@@ -106,54 +106,7 @@ ok
 
 
 
-=== TEST 4: ngx.eof after ngx.req.udp_socket(true)
---- dgram_server_config
-    content_by_lua_block {
-        local sock, err = ngx.req.udp_socket(true)
-        if not sock then
-            ngx.log(ngx.ERR, "failed to get raw request socket: ", err)
-            return ngx.exit(ngx.ERROR)
-        end
-        assert(sock:send(""))
-        local ok, err = ngx.eof()
-        if not ok then
-            ngx.log(ngx.ERR, "failed to eof: ", err)
-            return
-        end
-    }
-
---- config
-server_tokens off;
-
---- dgram_response
---- no_error_log
-[error]
-
-
-
-=== TEST 5: ngx.flush after ngx.udp_req.socket(true)
---- dgram_server_config
-  content_by_lua_block {
-      local sock, err = ngx.req.udp_socket(true)
-      if not sock then
-          ngx.log(ngx.ERR, "failed to get raw request socket: ", err)
-          return ngx.exit(ngx.ERROR)
-      end
-      assert(sock:send(""))
-      local ok, err = ngx.flush()
-      if not ok then
-          ngx.log(ngx.ERR, "failed to flush: ", err)
-          return
-      end
-}
-
---- dgram_response
---- no_error_log
-[error]
-
-
-
-=== TEST 6: receive timeout
+=== TEST 4: receive timeout
 --- SKIP
 --- dgram_server_config
     content_by_lua_block {
@@ -179,7 +132,7 @@ stream lua udp socket read timed out
 
 
 
-=== TEST 7: on_abort called during ngx.sleep()
+=== TEST 5: on_abort called during ngx.sleep()
 --- dgram_server_config
     lua_check_client_abort on;
 
@@ -227,7 +180,7 @@ mysock handler aborted
 
 
 
-=== TEST 8: on_abort called during sock:receive()
+=== TEST 6: on_abort called during sock:receive()
 --- dgram_server_config
     lua_check_client_abort on;
 
@@ -278,7 +231,7 @@ mysock handler aborted
 
 
 
-=== TEST 9: request body not read yet
+=== TEST 7: request body not read yet
 --- dgram_server_config
     content_by_lua_block {
       local sock, err = ngx.req.udp_socket(true)