use lookup array for dns_type_string()

[project/mdnsd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 6d0cdea..08b808d 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -20,6 +20,7 @@
 #include <libubox/avl.h>
 #include <libubox/uloop.h>
 
 #include <libubox/avl.h>
 #include <libubox/uloop.h>
 

+#include "util.h"

 #include "ubus.h"
 #include "cache.h"
 #include "service.h"
 #include "ubus.h"
 #include "cache.h"
 #include "service.h"


@@ -51,15 +52,15 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct cache_entry *s, *q;
                struct blob_attr *msg)
 {
        struct cache_entry *s, *q;

-       char buffer[MAX_NAME_LEN];
+       char *buffer = (char *) mdns_buf;

        void *c1 = NULL, *c2;
 
        void *c1 = NULL, *c2;
 

-        blob_buf_init(&b, 0);
+       blob_buf_init(&b, 0);

        avl_for_each_element(&entries, s, avl) {
                char *local;
                if (*((char *) s->avl.key) != '_')
                        continue;
        avl_for_each_element(&entries, s, avl) {
                char *local;
                if (*((char *) s->avl.key) != '_')
                        continue;

-               snprintf(buffer, MAX_NAME_LEN, s->avl.key);
+               snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->avl.key);

                local = strstr(buffer, ".local");
                if (local)
                        *local = '\0';
                local = strstr(buffer, ".local");
                if (local)
                        *local = '\0';


@@ -69,7 +70,7 @@ mdns_browse(struct ubus_context *ctx, struct ubus_object *obj,
                if (!c1) {
                        c1 = blobmsg_open_table(&b, buffer);
                }
                if (!c1) {
                        c1 = blobmsg_open_table(&b, buffer);
                }

-               snprintf(buffer, MAX_NAME_LEN, s->entry);
+               snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);

                local = strstr(buffer, "._");
                if (local)
                        *local = '\0';
                local = strstr(buffer, "._");
                if (local)
                        *local = '\0';


@@ -95,15 +96,15 @@ mdns_hosts(struct ubus_context *ctx, struct ubus_object *obj,
                struct blob_attr *msg)
 {
        struct cache_entry *s;
                struct blob_attr *msg)
 {
        struct cache_entry *s;

-       char buffer[MAX_NAME_LEN];
+       char *buffer = (char *) mdns_buf;

        void *c;
 
        void *c;
 

-        blob_buf_init(&b, 0);
+       blob_buf_init(&b, 0);

        avl_for_each_element(&entries, s, avl) {
                char *local;
                if (*((char *) s->avl.key) == '_')
                        continue;
        avl_for_each_element(&entries, s, avl) {
                char *local;
                if (*((char *) s->avl.key) == '_')
                        continue;

-               snprintf(buffer, MAX_NAME_LEN, s->entry);
+               snprintf(buffer, MAX_NAME_LEN, "%s", (const char *) s->entry);

                local = strstr(buffer, "._");
                if (local)
                        *local = '\0';
                local = strstr(buffer, "._");
                if (local)
                        *local = '\0';