gluon-announced: multiple datatypes, compression

gluon/gluon-announced/Makefile

@@ -1,40 +1,34 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-announced
-PKG_VERSION:=1
+PKG_VERSION:=2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/gluon-announced
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=announced support
-  DEPENDS:=+gluon-announce
+  DEPENDS:=+liblua +gluon-announce
 endef
 
 define Package/gluon-announced/description
 	Gluon community wifi mesh firmware framework: announced support
 endef
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
-endef
-
 define Package/gluon-announced/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gluon-announced $(1)/usr/bin/
 endef
 
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
 $(eval $(call BuildPackage,gluon-announced))

gluon/gluon-announced/files/etc/hotplug.d/iface/10-gluon-announced

@@ -21,7 +21,7 @@ restart_announced () {
 	DEVS=$(cat $DEVLIST | while read dev iface;do echo -n " -i $dev";done)
 
 	service_stop $DAEMON
-	service_start $DAEMON -g ff02:0:0:0:0:0:2:1001 -p 1001 -s '/lib/gluon/announce/collect.lua nodeinfo' $DEVS
+	service_start $DAEMON -g ff02:0:0:0:0:0:2:1001 -p 1001 $DEVS
 }
 
 case "$ACTION" in
@@ -32,7 +32,7 @@ case "$ACTION" in
 		DEVICE=$(ifname_to_dev $INTERFACE)
 		MESH=$(cat /sys/class/net/$DEVICE/batman_adv/mesh_iface)
 
-		[ $MESH = "bat0" ] || exit 0
+		[ $MESH = "bat0" -o $INTERFACE = "client" ] || exit 0
 
 		DEVS="$(cat $DEVLIST; echo $DEVICE $INTERFACE)"
 

gluon/gluon-announced/files/lib/gluon/announced/helper.lua

@@ -0,0 +1,34 @@
+local announce = require 'gluon.announce'
+
+local json = require 'luci.json'
+local ltn12 = require 'luci.ltn12'
+
+local announce_base = '/lib/gluon/announce/'
+
+local function collect(type)
+  return announce.collect_dir(announce_base .. type .. '.d')
+end
+
+function request(query)
+  if query:match('^nodeinfo') then
+    return json.encode(collect('nodeinfo'))
+  end
+
+  local m = query:match('^GET ([a-z ]+)')
+  if m then
+    local data = {}
+
+    for q in m:gmatch('([a-z]+)') do
+      local ok, val = pcall(collect, q)
+      if ok then
+        data[q] = val
+      end
+    end
+
+    if next(data) then
+      return deflate(json.encode(data))
+    end
+  end
+
+  return nil
+end

gluon/gluon-announced/src/CMakeLists.txt

@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 2.6)
+
+INCLUDE(FindPkgConfig)
+
+pkg_check_modules(LUA REQUIRED lua>=5.1)
+
+PROJECT(gluon-announced C)
+
+ADD_DEFINITIONS(-Os -Wall --std=gnu99 -Wmissing-declarations)
+
+SET(SOURCES gluon-announced.c)
+
+ADD_DEFINITIONS(${LUA_CFLAGS})
+ADD_EXECUTABLE(gluon-announced ${SOURCES})
+TARGET_LINK_LIBRARIES(gluon-announced ${LUA_LIBRARIES} dl m)
+INSTALL(TARGETS gluon-announced
+	RUNTIME DESTINATION bin
+)

gluon/gluon-announced/src/Makefile

@@ -1,6 +0,0 @@
-all: gluon-announced
-
-gluon-announced: gluon-announced.c
-
-clean:
-	rm gluon-announced

gluon/gluon-announced/src/gluon-announced.c

@@ -32,54 +32,36 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#include "miniz.c"
+
+#define HELPER "/lib/gluon/announced/helper.lua"
 
 void usage() {
-  puts("Usage: gluon-announced [-h] -g <group> -p <port> -i <if0> [-i <if1> ..] -s <script>");
+  puts("Usage: gluon-announced [-h] -g <group> -p <port> -i <if0> [-i <if1> ..]");
   puts("  -g <ip6>         multicast group, e.g. ff02:0:0:0:0:0:2:1001");
   puts("  -p <int>         port number to listen on");
   puts("  -i <string>      interface on which the group is joined");
-  puts("  -s <string>      script to be executed for each request");
   puts("  -h               this help\n");
 }
 
-/* The maximum size of output returned is limited to 8192 bytes (including
+int l_deflate(lua_State *L) {
- * terminating null byte) for now. If this turns out to be problem, a
+  size_t in_length, out_length;
- * dynamic buffer should be implemented instead of increasing the
+  char *in, *out;
- * limit.
- */
-#define BUFFER 8192
 
-char *run_script(size_t *length, const char *script) {
+  in = luaL_checklstring(L, -1, &in_length);
-  FILE *f;
-  char *buffer;
 
-  buffer = calloc(BUFFER, sizeof(char));
+  out_length = in_length * 2;
+  out = malloc(out_length);
 
-  if (buffer == NULL) {
+  compress(out, &out_length, in, in_length);
-    fprintf(stderr, "couldn't allocate buffer\n");
-    return NULL;
-  }
 
-  f = popen(script, "r");
+  lua_pushlstring(L, out, out_length);
+  free(out);
 
-  size_t read_bytes = 0;
+  return 1;
-  while (1) {
-    ssize_t ret = fread(buffer+read_bytes, sizeof(char), BUFFER-read_bytes, f);
-
-    if (ret <= 0)
-      break;
-
-    read_bytes += ret;
-  }
-
-  int ret = pclose(f);
-
-  if (ret != 0)
-    fprintf(stderr, "script exited with status %d\n", ret);
-
-  *length = read_bytes;
-
-  return buffer;
 }
 
 void join_mcast(const int sock, const struct in6_addr addr, const char *iface) {
@@ -102,7 +84,7 @@ error:
   return;
 }
 
-#define REQUESTSIZE 64
+#define REQUESTSIZE 256
 
 char *recvrequest(const int sock, struct sockaddr *client_addr, socklen_t *clilen) {
   char request_buffer[REQUESTSIZE];
@@ -120,10 +102,10 @@ char *recvrequest(const int sock, struct sockaddr *client_addr, socklen_t *clile
   if (request == NULL)
     perror("Could not receive request");
 
-  return strsep(&request, "\r\n\t ");
+  return request;
 }
 
-void serve(const int sock, const char *script) {
+void serve(const int sock, lua_State *L) {
   char *request;
   socklen_t clilen;
   struct sockaddr_in6 client_addr;
@@ -133,29 +115,36 @@ void serve(const int sock, const char *script) {
   while (1) {
     request = recvrequest(sock, (struct sockaddr*)&client_addr, &clilen);
 
-    int cmp = strcmp(request, "nodeinfo");
+    lua_getglobal(L, "request");
+    lua_pushstring(L, request);
     free(request);
 
-    if (cmp != 0)
+    if (lua_pcall(L, 1, 1, 0)) {
-      continue;
+      perror("pcall on request failed");
+      exit(EXIT_FAILURE);
+    }
 
-    char *msg;
+    const char *msg;
     size_t msg_length;
-    msg = run_script(&msg_length, script);
+    msg = lua_tolstring(L, -1, &msg_length);
+
+    if (msg == NULL) {
+      lua_pop(L, -1);
+      continue;
+    }
 
     if (sendto(sock, msg, msg_length, 0, (struct sockaddr *)&client_addr, sizeof(client_addr)) < 0) {
       perror("sendto failed");
       exit(EXIT_FAILURE);
     }
 
-    free(msg);
+    lua_pop(L, -1);
   }
 }
 
 int main(int argc, char **argv) {
   int sock;
   struct sockaddr_in6 server_addr = {};
-  char *script = NULL;
   struct in6_addr mgroup_addr;
 
   sock = socket(PF_INET6, SOCK_DGRAM, 0);
@@ -173,7 +162,7 @@ int main(int argc, char **argv) {
   int group_set = 0;
 
   int c;
-  while ((c = getopt(argc, argv, "p:g:s:i:h")) != -1)
+  while ((c = getopt(argc, argv, "p:g:i:h")) != -1)
     switch (c) {
       case 'p':
         server_addr.sin6_port = htons(atoi(optarg));
@@ -185,10 +174,6 @@ int main(int argc, char **argv) {
         }
 
         group_set = 1;
-        break;
-      case 's':
-        script = optarg;
-
         break;
       case 'i':
         if (!group_set) {
@@ -205,17 +190,28 @@ int main(int argc, char **argv) {
         fprintf(stderr, "Invalid parameter %c ignored.\n", c);
     }
 
-  if (script == NULL) {
-    fprintf(stderr, "No script given\n");
-    exit(EXIT_FAILURE);
-  }
-
   if (bind(sock, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
     perror("bind failed");
     exit(EXIT_FAILURE);
   }
 
-  serve(sock, script);
+  lua_State *L = lua_open();
+  luaL_openlibs(L);
+
+  lua_pushcfunction(L, l_deflate);
+  lua_setglobal(L, "deflate");
+
+  if (luaL_loadfile(L, HELPER)) {
+    perror("Could not load helper.lua");
+    exit(EXIT_FAILURE);
+  }
+
+  if (lua_pcall(L, 0, 0, 0)) {
+    perror("pcall failed");
+    exit(EXIT_FAILURE);
+  }
+
+  serve(sock, L);
 
   return EXIT_FAILURE;
 }