feature: enabled the FFI-based API for 'ngx.var' in the stream subsystem.

Author: thibaultcha

lib/resty/core.lua

@@ -4,6 +4,7 @@ local subsystem = ngx.config.subsystem
 
 
 require "resty.core.ctx"
+require "resty.core.var"
 require "resty.core.regex"
 require "resty.core.shdict"
 require "resty.core.time"
@@ -15,7 +16,6 @@ require "resty.core.base64"
 
 
 if subsystem == 'http' then
-    require "resty.core.var"
     require "resty.core.request"
     require "resty.core.response"
     require "resty.core.worker"

lib/resty/core/var.lua

@@ -1,28 +1,36 @@
 -- Copyright (C) Yichun Zhang (agentzh)
 
 
-local ffi = require 'ffi'
+local ffi = require "ffi"
 local base = require "resty.core.base"
 
+
+local C = ffi.C
 local ffi_new = ffi.new
 local ffi_str = ffi.string
-local C = ffi.C
 local type = type
+local error = error
+local tostring = tostring
+local setmetatable = setmetatable
 local get_request = base.get_request
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
 local new_tab = base.new_tab
-local error = error
-local tostring = tostring
-local setmetatable = setmetatable
+local subsystem = ngx.config.subsystem
+
+
+local ngx_lua_ffi_var_get
+local ngx_lua_ffi_var_set
+
 
 local ERR_BUF_SIZE = 256
 
 
 ngx.var = new_tab(0, 0)
 
 
-ffi.cdef[[
+if subsystem == "http" then
+    ffi.cdef[[
     int ngx_http_lua_ffi_var_get(ngx_http_request_t *r,
         const char *name_data, size_t name_len, char *lowcase_buf,
         int capture_id, char **value, size_t *value_len, char **err);
@@ -31,7 +39,26 @@ ffi.cdef[[
         const unsigned char *name_data, size_t name_len,
         unsigned char *lowcase_buf, const unsigned char *value,
         size_t value_len, unsigned char *errbuf, size_t *errlen);
-]]
+    ]]
+
+    ngx_lua_ffi_var_get = C.ngx_http_lua_ffi_var_get
+    ngx_lua_ffi_var_set = C.ngx_http_lua_ffi_var_set
+
+elseif subsystem == "stream" then
+    ffi.cdef[[
+    int ngx_stream_lua_ffi_var_get(ngx_stream_lua_request_t *r,
+        const char *name_data, size_t name_len, char *lowcase_buf,
+        int capture_id, char **value, size_t *value_len, char **err);
+
+    int ngx_stream_lua_ffi_var_set(ngx_stream_lua_request_t *r,
+        const unsigned char *name_data, size_t name_len,
+        unsigned char *lowcase_buf, const unsigned char *value,
+        size_t value_len, unsigned char *errbuf, size_t *errlen);
+    ]]
+
+    ngx_lua_ffi_var_get = C.ngx_stream_lua_ffi_var_get
+    ngx_lua_ffi_var_set = C.ngx_stream_lua_ffi_var_set
+end
 
 
 local value_ptr = ffi_new("unsigned char *[1]")
@@ -47,8 +74,8 @@ local function var_get(self, name)
     local value_len = get_size_ptr()
     local rc
     if type(name) == "number" then
-        rc = C.ngx_http_lua_ffi_var_get(r, nil, 0, nil, name, value_ptr,
-                                        value_len, errmsg)
+        rc = ngx_lua_ffi_var_get(r, nil, 0, nil, name, value_ptr, value_len,
+                                 errmsg)
 
     else
         if type(name) ~= "string" then
@@ -58,8 +85,8 @@ local function var_get(self, name)
         local name_len = #name
         local lowcase_buf = get_string_buf(name_len)
 
-        rc = C.ngx_http_lua_ffi_var_get(r, name, name_len, lowcase_buf, 0,
-                                        value_ptr, value_len, errmsg)
+        rc = ngx_lua_ffi_var_get(r, name, name_len, lowcase_buf, 0, value_ptr,
+                                 value_len, errmsg)
     end
 
     -- ngx.log(ngx.WARN, "rc = ", rc)
@@ -104,8 +131,8 @@ local function var_set(self, name, value)
     end
 
     local errbuf = lowcase_buf + name_len
-    local rc = C.ngx_http_lua_ffi_var_set(r, name, name_len, lowcase_buf,
-                                          value, value_len, errbuf, errlen)
+    local rc = ngx_lua_ffi_var_set(r, name, name_len, lowcase_buf, value,
+                                   value_len, errbuf, errlen)
 
     -- ngx.log(ngx.WARN, "rc = ", rc)