Changeset 1774a2db88a0c683623716a678d38d508802f8eb

Timestamp:

02/02/11 01:45:35 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[87e8a7c5242cb8108f494d787f6548c873e82743]

git-author:

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

Message:

fixes #346

Files:

• src/modules/lua_noit.c (modified) (3 diffs)
• src/utils/Makefile.in (modified) (1 diff)
• src/utils/noit_b32.c (added)
• src/utils/noit_b32.h (added)

src/modules/lua_noit.c

@@ -55 +55 @@
-#include "utils/noit_log.h"
-#include "utils/noit_str.h"
+#include "utils/noit_b32.h"
-#include "utils/noit_b64.h"
-#include "eventer/eventer.h"
@@ -984 +985 @@
-  lua_pop(L, 1); /* "string" table */
-  return 0;
+}
+static int
+nl_base32_decode(lua_State *L) {
+  size_t inlen, decoded_len;
+  const char *message;
+  unsigned char *decoded;
+
+  if(lua_gettop(L) != 1) luaL_error(L, "bad call to noit.decode");
+
+  message = lua_tolstring(L, 1, &inlen);
+  decoded = malloc(MAX(1,inlen));
+  if(!decoded) luaL_error(L, "out-of-memory");
+  decoded_len = noit_b32_decode(message, inlen, decoded, MAX(1,inlen));
+  lua_pushlstring(L, (char *)decoded, decoded_len);
+  return 1;
+}
+static int
+nl_base32_encode(lua_State *L) {
+  size_t inlen, encoded_len;
+  const unsigned char *message;
+  char *encoded;
+
+  if(lua_gettop(L) != 1) luaL_error(L, "bad call to noit.encode");
+
+  message = (const unsigned char *)lua_tolstring(L, 1, &inlen);
+  encoded_len = (((inlen + 7) / 5) * 8) + 1;
+  encoded = malloc(encoded_len);
+  if(!encoded) luaL_error(L, "out-of-memory");
+  encoded_len = noit_b32_encode(message, inlen, encoded, encoded_len);
+  lua_pushlstring(L, (char *)encoded, encoded_len);
+  return 1;
-}
-static int
@@ -1825 +1857 @@
-  { "dns", nl_dns_lookup },
-  { "log", nl_log },
+  { "base32_decode", nl_base32_decode },
+  { "base32_encode", nl_base32_encode },
-  { "base64_decode", nl_base64_decode },
-  { "base64_encode", nl_base64_encode },

src/utils/Makefile.in

@@ -11 +11 @@
-
-OBJS=noit_hash.o noit_skiplist.o noit_log.o noit_sem.o noit_str.o \
-
+b32.o noit_
-        noit_getip.o noit_lockfile.o \
-        @ATOMIC_OBJS@