Changeset b4aa23f3434227874cce728d4f56f2e3c74b4e98

Timestamp:

07/03/12 21:17:58 (1 year ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1341350278 -0400

git-parent:

[618dd9f44bc6087b76e06e01b9d71dd16de7f1bd]

git-author:

Philip Maddox <pmaddox@circonus.com> 1341346134 -0400

Message:

Added DHCP check

Files:

• docs/config/modules/noit.module.dhcp.xml (added)
• src/modules-lua/Makefile.in (modified) (1 diff)
• src/modules-lua/noit/extras.lua (modified) (1 diff)
• src/modules-lua/noit/module/dhcp.lua (added)
• src/modules/lua_noit.c (modified) (4 diffs)
• src/noit.conf.in (modified) (1 diff)

src/modules-lua/Makefile.in

@@ -44 +44 @@
-        noit/module/nrpe.lua \
-        noit/module/redis.lua \
-
+
+
-
-all:

src/modules-lua/noit/extras.lua

@@ -60 +60 @@
-end
-
+function iptonumber(str)
+  local num = 0
+  for elem in str:gmatch("%d+") do
+    num = (num * 256) + elem
+  end
+  return num
+end
+

src/modules/lua_noit.c

@@ -447 +447 @@
-  int8_t family;
-  int rv;
+  int flag;
-  union {
-    struct sockaddr_in sin4;
@@ -483 +484 @@
-    a.sin4.sin_family = family;
-    a.sin4.sin_port = htons(port);
+    a.sin4.sin_addr.s_addr = INADDR_ANY;
+    memset (a.sin4.sin_zero, 0, sizeof (a.sin4.sin_zero));
-  }
-
@@ -494 +497 @@
-  lua_pushstring(L, strerror(errno));
-  return 2;
+}
+static int
+noit_lua_socket_setsockopt(lua_State *L) {
+  noit_lua_check_info_t *ci;
+  eventer_t e, *eptr;
+  int rv;
+  const char *type;
+  int type_val;
+  int value;
+
+  ci = get_ci(L);
+  assert(ci);
+
+  if(lua_gettop(L) != 3) {
+    lua_pushinteger(L, -1);
+    lua_pushfstring(L, "setsockopt(type, value) wrong arguments");
+    return 2;
+  }
+  eptr = lua_touserdata(L, lua_upvalueindex(1));
+  if(eptr != lua_touserdata(L, 1))
+    luaL_error(L, "must be called as method");
+  e = *eptr;
+  type = lua_tostring(L, 2);
+  value = lua_tointeger(L, 3);
+
+  if (strcmp(type, "SO_BROADCAST") == 0)
+    type_val = SO_BROADCAST;
+  else if (strcmp(type, "SO_REUSEADDR") == 0)
+    type_val = SO_REUSEADDR;
+  else if (strcmp(type, "SO_KEEPALIVE") == 0)
+    type_val = SO_KEEPALIVE;
+  else if (strcmp(type, "SO_LINGER") == 0)
+    type_val = SO_LINGER;
+  else if (strcmp(type, "SO_OOBINLINE") == 0)
+    type_val = SO_OOBINLINE;
+  else if (strcmp(type, "SO_SNDBUF") == 0)
+    type_val = SO_SNDBUF;
+  else if (strcmp(type, "SO_RCVBUF") == 0)
+    type_val = SO_RCVBUF;
+  else if (strcmp(type, "SO_DONTROUTE") == 0)
+    type_val = SO_DONTROUTE;
+  else if (strcmp(type, "SO_RCVLOWAT") == 0)
+    type_val = SO_RCVLOWAT;
+  else if (strcmp(type, "SO_RCVTIMEO") == 0)
+    type_val = SO_RCVTIMEO;
+  else if (strcmp(type, "SO_SNDLOWAT") == 0)
+    type_val = SO_SNDLOWAT;
+  else if (strcmp(type, "SO_SNDTIMEO") == 0)
+    type_val = SO_SNDTIMEO;
+  else {
+    lua_pushinteger(L, -1);
+    lua_pushfstring(L, "Socket  operation '%s' not supported\n", type);
+    return 2;
+  }
+
+  if (setsockopt(e->fd, SOL_SOCKET, type_val, (char*)&value, sizeof(value)) < 0) {
+    lua_pushinteger(L, -1);
+    lua_pushfstring(L, strerror(errno));
+    return 2;
+  }
+  lua_pushinteger(L, 0);
+  return 1;
-}
-static int
@@ -918 +983 @@
-     LUA_DISPATCH(send, noit_lua_socket_send);
-     LUA_DISPATCH(sendto, noit_lua_socket_sendto);
+     LUA_DISPATCH(setsockopt, noit_lua_socket_setsockopt);
-     LUA_DISPATCH(ssl_upgrade_socket, noit_lua_socket_connect_ssl);
-     LUA_DISPATCH(ssl_ctx, noit_lua_socket_ssl_ctx);

src/noit.conf.in

@@ -74 +74 @@
-    <module loader="lua" name="smtp" object="noit.module.smtp"/>
-    <module loader="lua" name="ntp" object="noit.module.ntp"/>
+    <module loader="lua" name="dhcp" object="noit.module.dhcp"/>
-    <jezebel>
-      <config><url>http://127.0.0.1:8083/dispatch</url></config>