Changeset a1551f182d761cecc6451e8f8cc5b5f1b7d0d559 for src/modules

Timestamp:

09/18/09 13:30:43 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1253280643 +0000

git-parent:

[28b073c9b8925b6b5bab4ecdf6b76690e8adf946]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1253280643 +0000

Message:

expose config info and ssl into lua, closes #174

Files:

• src/modules/lua_noit.c (modified) (14 diffs)

src/modules/lua_noit.c

@@ -213 +213 @@
-    luaL_error(L, "must be called as method");
-  e = *eptr;
-a
-ciphers
-ert
-key
+ert
+key
+a
+ciphers
-
-  sslctx = eventer_ssl_ctx_new(SSL_CLIENT, cert, key, ca, ciphers);
@@ -239 +239 @@
-
-static int
-read_complete(eventer_t e, int mask, void *v
-      struct timeval *now
+do_read(eventer_t e, int *mask, struct nl_slcl *
+int *read_complete
-  char buff[4096];
-  noit_lua_check_info_t *ci;
-  struct nl_slcl *cl = vcl;
-  int len;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    if(cl->read_goal) {
-      int remaining = cl->read_goal - cl->read_sofar;
@@ -264 +252 @@
-      if(cl->read_sofar >= cl->read_goal) { /* We're done */
-        lua_pushlstring(cl->L, cl->inbuff, cl->read_goal);
-args
+*read_complete
-        cl->read_sofar -= cl->read_goal;
-        if(cl->read_sofar > 0) {  /* We have to buffer this for next read */
@@ -283 +271 @@
-      if(cp) {
-        lua_pushlstring(cl->L, cl->inbuff, cl->inbuff_len);
-args
+*read_complete
-        
-        cl->read_sofar = len - remaining;
@@ -294 +282 @@
-    }
-  }
+  return len;
+}
+static int
+noit_lua_socket_read_complete(eventer_t e, int mask, void *vcl,
+                              struct timeval *now) {
+  noit_lua_check_info_t *ci;
+  struct nl_slcl *cl = vcl;
+  int len;
+  int args = 0;
+
+  ci = get_ci(cl->L);
+  assert(ci);
+
+  if(mask & EVENTER_EXCEPTION) {
+    lua_pushnil(cl->L);
+    args = 1;
+    goto alldone;
+  }
+
+  len = noit_lua_socket_do_read(e, &mask, cl, &args);
-  if(len >= 0) {
-    /* We broke out, cause we read enough... */
@@ -316 +324 @@
-static int
-noit_lua_socket_read(lua_State *L) {
+  int args, mask, len;
-  struct nl_slcl *cl;
-  noit_lua_check_info_t *ci;
@@ -367 +376 @@
-  }
-
+  len = noit_lua_socket_do_read(e, &mask, cl, &args);
+  if(args == 1) return 1; /* completed read, return result */
+  if(len == -1 && errno == EAGAIN) {
+    /* we need to drop into eventer */
+  }
+  else {
+    lua_pushnil(cl->L);
+    args = 1;
+    return args;
+  }
+
-  e->callback = noit_lua_socket_read_complete;
-EVENTER_READ
+mask
-  eventer_add(e);
-  return noit_lua_yield(ci, 0);
@@ -458 +478 @@
-  }
-  lua_pushinteger(L, -1);
+  return 1;
+}
+static int
+noit_lua_socket_ssl_ctx(lua_State *L) {
+  eventer_t *eptr, e;
+  eventer_ssl_ctx_t **ssl_ctx_holder, *ssl_ctx;
+
+  eptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(eptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  e = *eptr;
+
+  ssl_ctx = eventer_get_eventer_ssl_ctx(e);
+  if(!ssl_ctx) {
+    lua_pushnil(L);
+    return 1;
+  }
+
+  ssl_ctx_holder = (eventer_ssl_ctx_t **)lua_newuserdata(L, sizeof(ssl_ctx));
+  *ssl_ctx_holder = ssl_ctx;
+  luaL_getmetatable(L, "noit.eventer.ssl_ctx");
+  lua_setmetatable(L, -2);
-  return 1;
-}
@@ -497 +539 @@
-       return 1;
-     }
+     if(!strcmp(k, "ssl_ctx")) {
+       lua_pushlightuserdata(L, udata);
+       lua_pushcclosure(L, noit_lua_socket_ssl_ctx, 1);
+       return 1;
+     }
-     break;
-    case 'w':
@@ -508 +555 @@
-      break;
-  }
-eventer_t
+noit.eventer
-  return 0;
-}
@@ -520 +567 @@
-  lua_setmetatable(L, -2);
-  return addr;
+}
+
+static int
+noit_ssl_ctx_index_func(lua_State *L) {
+  int n;
+  const char *k;
+  eventer_ssl_ctx_t **udata, *ssl_ctx;
+  n = lua_gettop(L); /* number of arguments */
+  assert(n == 2);
+  if(!luaL_checkudata(L, 1, "noit.eventer.ssl_ctx")) {
+    luaL_error(L, "metatable error, arg1 not a noit.eventer.ssl_ctx!");
+  }
+  udata = lua_touserdata(L, 1);
+  ssl_ctx = *udata;
+  if(!lua_isstring(L, 2)) {
+    luaL_error(L, "metatable error, arg2 not a string!");
+  }
+  k = lua_tostring(L, 2);
+  switch(*k) {
+    case 'e':
+      if(!strcmp(k,"error")) {
+        lua_pushstring(L,eventer_ssl_get_peer_error(ssl_ctx));
+        return 1;
+      }
+      if(!strcmp(k,"end_time")) {
+        lua_pushinteger(L,eventer_ssl_get_peer_end_time(ssl_ctx));
+        return 1;
+      }
+      break;
+    case 'i':
+      if(!strcmp(k,"issuer")) {
+        lua_pushstring(L,eventer_ssl_get_peer_issuer(ssl_ctx));
+        return 1;
+      }
+      break;
+    case 's':
+      if(!strcmp(k,"subject")) {
+        lua_pushstring(L,eventer_ssl_get_peer_subject(ssl_ctx));
+        return 1;
+      }
+      if(!strcmp(k,"start_time")) {
+        lua_pushinteger(L,eventer_ssl_get_peer_start_time(ssl_ctx));
+        return 1;
+      }
+      break;
+    default:
+      break;
+  }
+  luaL_error(L, "noit.eventer.ssl_ctx no such element: %s", k);
+  return 0;
-}
-
@@ -809 +906 @@
-}
-
+static int
+nl_conf_get_string(lua_State *L) {
+  char *val;
+  const char *path = lua_tostring(L,1);
+  if(path &&
+     noit_conf_get_string(NULL, path, &val)) {
+    lua_pushstring(L,val);
+    free(val);
+  }
+  else lua_pushnil(L);
+  return 1;
+}
+static int
+nl_conf_get_integer(lua_State *L) {
+  int val;
+  const char *path = lua_tostring(L,1);
+  if(path &&
+     noit_conf_get_int(NULL, path, &val)) {
+    lua_pushinteger(L,val);
+  }
+  else lua_pushnil(L);
+  return 1;
+}
+static int
+nl_conf_get_boolean(lua_State *L) {
+  noit_boolean val;
+  const char *path = lua_tostring(L,1);
+  if(path &&
+     noit_conf_get_boolean(NULL, path, &val)) {
+    lua_pushboolean(L,val);
+  }
+  else lua_pushnil(L);
+  return 1;
+}
+static int
+nl_conf_get_float(lua_State *L) {
+  float val;
+  const char *path = lua_tostring(L,1);
+  if(path &&
+     noit_conf_get_float(NULL, path, &val)) {
+    lua_pushnumber(L,val);
+  }
+  else lua_pushnil(L);
+  return 1;
+}
-static const luaL_Reg noitlib[] = {
-  { "sleep", nl_sleep },
@@ -817 +959 @@
-  { "socket_ipv6", nl_socket_ipv6 },
-  { "gunzip", nl_gunzip },
+  { "conf_get", nl_conf_get_string },
+  { "conf_get_string", nl_conf_get_string },
+  { "conf_get_integer", nl_conf_get_integer },
+  { "conf_get_boolean", nl_conf_get_boolean },
+  { "conf_get_number", nl_conf_get_float },
-  { NULL, NULL }
-};
@@ -823 +970 @@
-  luaL_newmetatable(L, "noit.eventer");
-  lua_pushcclosure(L, noit_eventer_index_func, 0);
+  lua_setfield(L, -2, "__index");
+
+  luaL_newmetatable(L, "noit.eventer.ssl_ctx");
+  lua_pushcclosure(L, noit_ssl_ctx_index_func, 0);
-  lua_setfield(L, -2, "__index");
-