fix some memory corruption bugs

[catta] / main.c

diff --git a/main.c b/main.c
index 75d03ac6a31ce346b04c3f9b214785c8703f3994..3bf4360bc9cad3168437d6bbc7c58058f6a7cf0e 100644 (file)
--- a/main.c
+++ b/main.c
@@ -4,6 +4,7 @@
 
 #include "flx.h"
 #include "server.h"
+#include "subscribe.h"
 
 static gboolean quit_timeout(gpointer data) {
     g_main_loop_quit(data);
@@ -14,33 +15,65 @@ static gboolean send_timeout(gpointer data) {
     flxServer *flx = data;
     flxKey *k;
 
-    k = flx_key_new("cocaine.local.", FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A);
-    flx_server_send_query(flx, 0, AF_UNSPEC, k);
+    k = flx_key_new("ecstasy.local.", FLX_DNS_CLASS_IN, FLX_DNS_TYPE_TXT);
+    flx_server_post_query(flx, 0, AF_UNSPEC, k);
+    flx_key_unref(k);
+
+    k = flx_key_new("ecstasy.local.", FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A);
+    flx_server_post_query(flx, 0, AF_INET, k);
     flx_key_unref(k);
 
     return FALSE;
 }
 
+static gboolean dump_timeout(gpointer data) {
+    flxServer *flx = data;
+    flx_server_dump(flx, stdout);
+    return TRUE;
+}
+
+static void subscription(flxSubscription *s, flxRecord *r, gint interface, guchar protocol, flxSubscriptionEvent event, gpointer userdata) {
+    gchar *t;
+    
+    g_assert(s);
+    g_assert(r);
+    g_assert(interface > 0);
+    g_assert(protocol != AF_UNSPEC);
+
+    g_message("SUBSCRIPTION: record [%s] on %i.%i is %s", t = flx_record_to_string(r), interface, protocol,
+              event == FLX_SUBSCRIPTION_NEW ? "new" : (event == FLX_SUBSCRIPTION_CHANGE ? "changed" : "removed"));
+
+    g_free(t);
+}
+
+
 int main(int argc, char *argv[]) {
     flxServer *flx;
     gchar *r;
     GMainLoop *loop = NULL;
+    flxSubscription *s;
+    flxKey *k;
 
     flx = flx_server_new(NULL);
 
-    flx_server_add_text(flx, 0, 0, AF_UNSPEC, FALSE, NULL, "hallo");
+    flx_server_add_text(flx, 0, 0, AF_UNSPEC, FALSE, NULL, "hallo", NULL);
+    flx_server_add_service(flx, 0, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);
+
+/*     k = flx_key_new("ecstasy.local.", FLX_DNS_CLASS_IN, FLX_DNS_TYPE_ANY); */
+/*     s = flx_subscription_new(flx, k, 0, AF_UNSPEC, subscription, NULL); */
+/*     flx_key_unref(k); */
 
     loop = g_main_loop_new(NULL, FALSE);
     
-    g_timeout_add(1000*5, quit_timeout, loop);
+    g_timeout_add(1000*30, quit_timeout, loop);
     g_timeout_add(1000, send_timeout, flx);
+    g_timeout_add(1000*20, dump_timeout, flx);
     
     g_main_loop_run(loop);
 
     g_main_loop_unref(loop);
 
-    flx_server_dump(flx, stdout);
-
+/*     flx_subscription_free(s); */
     flx_server_free(flx);
     
     return 0;