Changeset 7d70182829211f6a49777014122994e32dc0cd43

Timestamp:

02/19/10 21:17:28 (3 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[4c30f2f6ffcd958c2364f1fa1e90b2ddcfef173d]

git-author:

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

Message:

Add option params to noit.socket()

noit.socket(family, proto) like noit.socket('inet', 'udp')

For sockets, added

local returncode, data, ip, port = noit.socket:recv()

local returncode, err = noit.socket:sendto(buffer, ip, port)

local returncode, err = noit.socket:send(buffer)

refs #261

Files:

• src/modules/lua.c (modified) (1 diff)
• src/modules/lua_noit.c (modified) (12 diffs)
• src/modules/lua_noit.h (modified) (1 diff)

src/modules/lua.c

@@ -174 +174 @@
-noit_lua_module_set_description(lua_State *L) {
-  noit_module_t *module;
-  if(lua_gettop(L) != 1) luaL_error(L, "wrong number of arguments");
-  module = lua_touserdata(L, lua_upvalueindex(1));
-
-
+
+
+
+
+
+
-}
-static int
-noit_lua_module_set_name(lua_State *L) {
-  noit_module_t *module;
-  if(lua_gettop(L) != 1) luaL_error(L, "wrong number of arguments");
-  module = lua_touserdata(L, lua_upvalueindex(1));
-
-
+
+
+
+
+
+
-}
-static int
-noit_lua_module_set_xml_description(lua_State *L) {
-  noit_module_t *module;
-  if(lua_gettop(L) != 1) luaL_error(L, "wrong number of arguments");
-  module = lua_touserdata(L, lua_upvalueindex(1));
-
-
+
+
+
+
+
+
-}
-static int

src/modules/lua_noit.c

@@ -60 +60 @@
-#define DEFLATE_CHUNK_SIZE 32768
-
+#define LUA_DISPATCH(n, f) \
+     if(!strcmp(k, #n)) { \
+       lua_pushlightuserdata(L, udata); \
+       lua_pushcclosure(L, f, 1); \
+       return 1; \
+     }
+#define LUA_RETSTRING(n, g) \
+     if(!strcmp(k, #n)) { \
+       lua_pushstring(L, g); \
+       return 1; \
+     }
+#define LUA_RETINTEGER(n, g) \
+     if(!strcmp(k, #n)) { \
+       lua_pushinteger(L, g); \
+       return 1; \
+     }
+
-static void
-nl_extended_free(void *vcl) {
@@ -65 +82 @@
-  if(cl->inbuff) free(cl->inbuff);
-  free(cl);
+}
+static int
+lua_push_inet_ntop(lua_State *L, struct sockaddr *r) {
+  char remote_str[128];
+  int len;
+  switch(r->sa_family) {
+    case AF_INET:
+      len = sizeof(struct sockaddr_in);
+      inet_ntop(AF_INET, &((struct sockaddr_in *)r)->sin_addr,
+                remote_str, len);
+      lua_pushstring(L, remote_str);
+      lua_pushinteger(L, ntohs(((struct sockaddr_in *)r)->sin_port));
+      break;
+    case AF_INET6:
+      len = sizeof(struct sockaddr_in6);
+      inet_ntop(AF_INET6, &((struct sockaddr_in6 *)r)->sin6_addr,
+                remote_str, len);
+      lua_pushstring(L, remote_str);
+      lua_pushinteger(L, ntohs(((struct sockaddr_in6 *)r)->sin6_port));
+      break;
+    default:
+      lua_pushnil(L);
+      lua_pushnil(L);
+  }
+  return 2;
-}
-static void
@@ -116 +158 @@
-  noit_lua_resume(ci, args);
-  return 0;
+}
+static int
+noit_lua_socket_recv_complete(eventer_t e, int mask, void *vcl,
+                              struct timeval *now) {
+  noit_lua_check_info_t *ci;
+  struct nl_slcl *cl = vcl;
+  int rv, args = 0;
+  void *inbuff = NULL;
+  socklen_t alen;
+
+  ci = get_ci(cl->L);
+  assert(ci);
+
+  if(mask & EVENTER_EXCEPTION) {
+    lua_pushinteger(cl->L, -1);
+    args = 1;
+    goto alldone;
+  }
+
+  inbuff = malloc(cl->read_goal);
+  if(!inbuff) {
+    lua_pushinteger(cl->L, -1);
+    args = 1;
+    goto alldone;
+  }
+
+  alen = sizeof(cl->address);
+  while((rv = recvfrom(e->fd, inbuff, cl->read_goal, 0,
+                       (struct sockaddr *)&cl->address, &alen)) == -1 &&
+        errno == EINTR);
+  if(rv < 0) {
+    if(errno == EAGAIN) {
+      free(inbuff);
+      return EVENTER_READ | EVENTER_EXCEPTION;
+    }
+    lua_pushinteger(cl->L, rv);
+    lua_pushstring(cl->L, strerror(errno));
+    args = 2;
+  }
+  else {
+    lua_pushinteger(cl->L, rv);
+    lua_pushlstring(cl->L, inbuff, rv);
+    args = 2;
+    args += lua_push_inet_ntop(cl->L, (struct sockaddr *)&cl->address);
+  }
+
+ alldone:
+  if(inbuff) free(inbuff);
+  eventer_remove_fd(e->fd);
+  noit_lua_check_deregister_event(ci, e, 0);
+  *(cl->eptr) = eventer_alloc();
+  memcpy(*cl->eptr, e, sizeof(*e));
+  noit_lua_check_register_event(ci, *cl->eptr);
+  noit_lua_resume(ci, args);
+  return 0;
+}
+static int
+noit_lua_socket_recv(lua_State *L) {
+  int args, rv;
+  struct nl_slcl *cl;
+  noit_lua_check_info_t *ci;
+  eventer_t e, *eptr;
+  void *inbuff;
+  socklen_t alen;
+
+  ci = get_ci(L);
+  assert(ci);
+
+  eptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(eptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  e = *eptr;
+  cl = e->closure;
+  cl->read_goal = lua_tointeger(L, 2);
+  inbuff = malloc(cl->read_goal);
+
+  alen = sizeof(cl->address);
+  while((rv = recvfrom(e->fd, inbuff, cl->read_goal, 0,
+                       (struct sockaddr *)&cl->address, &alen)) == -1 &&
+        errno == EINTR);
+  if(rv < 0) {
+    if(errno == EAGAIN) {
+      e->callback = noit_lua_socket_recv_complete;
+      e->mask = EVENTER_READ | EVENTER_EXCEPTION;
+      eventer_add(e);
+      free(inbuff);
+      return noit_lua_yield(ci, 0);
+    }
+    lua_pushinteger(cl->L, rv);
+    lua_pushstring(cl->L, strerror(errno));
+    args = 2;
+  }
+  else {
+    lua_pushinteger(cl->L, rv);
+    lua_pushlstring(cl->L, inbuff, rv);
+    args = 2;
+    args += lua_push_inet_ntop(cl->L, (struct sockaddr *)&cl->address);
+  }
+  free(inbuff);
+  return args;
+}
+static int
+noit_lua_socket_send_complete(eventer_t e, int mask, void *vcl,
+                              struct timeval *now) {
+  noit_lua_check_info_t *ci;
+  struct nl_slcl *cl = vcl;
+  int sbytes;
+  int args = 0;
+
+  ci = get_ci(cl->L);
+  assert(ci);
+
+  if(mask & EVENTER_EXCEPTION) {
+    lua_pushinteger(cl->L, -1);
+    args = 1;
+    goto alldone;
+  }
+  if(cl->sendto) {
+    while((sbytes = sendto(e->fd, cl->outbuff, cl->write_goal, 0,
+                           (struct sockaddr *)&cl->address,
+                           cl->address.sin4.sin_family==AF_INET ?
+                               sizeof(cl->address.sin4) :
+                               sizeof(cl->address.sin6))) == -1 &&
+          errno == EINTR);
+  }
+  else {
+    while((sbytes = send(e->fd, cl->outbuff, cl->write_goal, 0)) == -1 &&
+          errno == EINTR);
+  }
+  if(sbytes > 0) {
+    lua_pushinteger(cl->L, sbytes);
+    args = 1;
+  }
+  else if(sbytes == -1 && errno == EAGAIN) {
+    return EVENTER_WRITE | EVENTER_EXCEPTION;
+  }
+  else {
+    lua_pushinteger(cl->L, sbytes);
+    args = 1;
+    if(sbytes == -1) {
+      lua_pushstring(cl->L, strerror(errno));
+      args++;
+    }
+  }
+
+ alldone:
+  eventer_remove_fd(e->fd);
+  noit_lua_check_deregister_event(ci, e, 0);
+  *(cl->eptr) = eventer_alloc();
+  memcpy(*cl->eptr, e, sizeof(*e));
+  noit_lua_check_register_event(ci, *cl->eptr);
+  noit_lua_resume(ci, args);
+  return 0;
+}
+static int
+noit_lua_socket_send(lua_State *L) {
+  noit_lua_check_info_t *ci;
+  eventer_t e, *eptr;
+  const void *bytes;
+  size_t nbytes;
+  ssize_t sbytes;
+
+  ci = get_ci(L);
+  assert(ci);
+
+  eptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(eptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  e = *eptr;
+  if(lua_gettop(L) != 2)
+    luaL_error(L, "noit.socket.send with bad arguments");
+  bytes = lua_tolstring(L, 2, &nbytes);
+
+  while((sbytes = send(e->fd, bytes, nbytes, 0)) == -1 && errno == EINTR);
+  if(sbytes < 0 && errno == EAGAIN) {
+    struct nl_slcl *cl;
+    /* continuation */
+    cl = e->closure;
+    cl->write_sofar = 0;
+    cl->outbuff = bytes;
+    cl->write_goal = nbytes;
+    cl->sendto = 0;
+    e->callback = noit_lua_socket_send_complete;
+    e->mask = EVENTER_WRITE | EVENTER_EXCEPTION;
+    eventer_add(e);
+    return noit_lua_yield(ci, 0);
+  }
+  lua_pushinteger(L, sbytes);
+  if(sbytes < 0) {
+    lua_pushstring(L, strerror(errno));
+    return 2;
+  }
+  return 1;
+}
+
+static int
+noit_lua_socket_sendto(lua_State *L) {
+  noit_lua_check_info_t *ci;
+  eventer_t e, *eptr;
+  const char *target;
+  unsigned short port;
+  int8_t family;
+  int rv;
+  const void *bytes;
+  size_t nbytes;
+  ssize_t sbytes;
+  union {
+    struct sockaddr_in sin4;
+    struct sockaddr_in6 sin6;
+  } a;
+
+  ci = get_ci(L);
+  assert(ci);
+
+  eptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(eptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  e = *eptr;
+  if(lua_gettop(L) != 4)
+    luaL_error(L, "noit.socket.sendto with bad arguments");
+  bytes = lua_tolstring(L, 2, &nbytes);
+  target = lua_tostring(L, 3);
+  port = lua_tointeger(L, 4);
+
+  family = AF_INET;
+  rv = inet_pton(family, target, &a.sin4.sin_addr);
+  if(rv != 1) {
+    family = AF_INET6;
+    rv = inet_pton(family, target, &a.sin6.sin6_addr);
+    if(rv != 1) {
+      noitL(noit_stderr, "Cannot translate '%s' to IP\n", target);
+      memset(&a, 0, sizeof(a));
+      lua_pushinteger(L, -1);
+      lua_pushfstring(L, "Cannot translate '%s' to IP\n", target);
+      return 2;
+    }
+    else {
+      /* We've IPv6 */
+      a.sin6.sin6_family = AF_INET6;
+      a.sin6.sin6_port = htons(port);
+    }
+  }
+  else {
+    a.sin4.sin_family = family;
+    a.sin4.sin_port = htons(port);
+  }
+
+  while((sbytes = sendto(e->fd, bytes, nbytes, 0, (struct sockaddr *)&a,
+                         family==AF_INET ? sizeof(a.sin4)
+                                         : sizeof(a.sin6))) == -1 &&
+        errno == EINTR);
+  if(sbytes < 0 && errno == EAGAIN) {
+    struct nl_slcl *cl;
+    /* continuation */
+    cl = e->closure;
+    cl->write_sofar = 0;
+    cl->outbuff = bytes;
+    cl->write_goal = nbytes;
+    cl->sendto = 1;
+    e->callback = noit_lua_socket_send_complete;
+    e->mask = EVENTER_WRITE | EVENTER_EXCEPTION;
+    eventer_add(e);
+    return noit_lua_yield(ci, 0);
+  }
+  lua_pushinteger(L, sbytes);
+  if(sbytes < 0) {
+    lua_pushstring(L, strerror(errno));
+    return 2;
+  }
+  return 1;
-}
-static int
@@ -518 +830 @@
-  switch(*k) {
-    case 'c':
-
-
-
-
-
+
-     break;
-    case 'r':
-
-
-
-
-
+
+
-     break;
-    case 's':
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-     break;
-    case 'w':
-
-
-
-
-
+
-     break;
-    default:
@@ -585 +880 @@
-  switch(*k) {
-    case 'e':
-
-
-
-
-
-
-
-
+
+
-      break;
-    case 'i':
-
-
-
-
+
-      break;
-    case 's':
-
-
-
-
-
-
-
-
+
+
-      break;
-    default:
@@ -759 +1039 @@
-}
-static int
-tcp(lua_State *L, int family
+internal(lua_State *L, int family, int proto
-  struct nl_slcl *cl;
-  noit_lua_check_info_t *ci;
@@ -766 +1046 @@
-  eventer_t e;
-
-SOCK_STREAM
+proto
-  if(fd < 0) {
-    lua_pushnil(L);
@@ -800 +1080 @@
-static int
-nl_socket(lua_State *L) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1200 +1495 @@
-  switch(*k) {
-    case 'a':
-
-
-
-
-
-
+
+
-      break;
-    case 'c':
-
-
-
-
-
-
-
-
-
-
+
+
-      break;
-    case 'n':
-
-
-
-
-
+
-      break;
-    default:
@@ -1278 +1557 @@
-  switch(*k) {
-    case 'r':
-
-
-
-
-
+
-     break;
-    case 'x':
-
-
-
-
-
+
-     break;
-    default:
@@ -1306 +1577 @@
-  { "md5_hex", nl_md5_hex },
-  { "pcre", nl_pcre },
-  { "socket_ipv6", nl_socket_ipv6 },
-  { "gunzip", nl_gunzip },
-  { "conf_get", nl_conf_get_string },
@@ -1359 +1629 @@
-  eventer_name_callback("lua/socket_write",
-                        noit_lua_socket_write_complete);
+  eventer_name_callback("lua/socket_send",
+                        noit_lua_socket_send_complete);
-  eventer_name_callback("lua/socket_connect",
-                        noit_lua_socket_connect_complete);

src/modules/lua_noit.h

@@ -90 +90 @@
-  size_t write_goal;
-  eventer_t *eptr;
+
+  int sendto; /* whether this send is a sendto call */
+  union {
+    struct sockaddr_in sin4;
+    struct sockaddr_in6 sin6;
+  } address;
+
-  lua_State *L;
-};