X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=34135c53c7df3fab907b024c9033d67dfd373cad;hb=7dce450bdc23ea306a61e00f914481e29ebcb176;hp=139279c6808cf42da61bfe10245dcb8242ba5809;hpb=0a985aa6c5453fe09bf0a3a79fe66d49c698b309;p=catta

diff --git a/main.c b/main.c
index 139279c..34135c5 100644
--- a/main.c
+++ b/main.c
@@ -1,38 +1,22 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <stdlib.h>
 
-#include "flx.h"
-#include "server.h"
-#include "subscribe.h"
+#include "Avahi.h"
 
 static gboolean quit_timeout(gpointer data) {
     g_main_loop_quit(data);
     return FALSE;
 }
 
-static gboolean send_timeout(gpointer data) {
-    flxServer *flx = data;
-    flxKey *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);
+    AvahiServer *Avahi = data;
+    avahi_server_dump(Avahi, stdout);
     return TRUE;
 }
 
-static void subscription(flxSubscription *s, flxRecord *r, gint interface, guchar protocol, flxSubscriptionEvent event, gpointer userdata) {
+static void subscription(AvahiSubscription *s, AvahiRecord *r, gint interface, guchar protocol, AvahiSubscriptionEvent event, gpointer userdata) {
     gchar *t;
     
     g_assert(s);
@@ -40,41 +24,51 @@ static void subscription(flxSubscription *s, flxRecord *r, gint interface, gucha
     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_message("SUBSCRIPTION: record [%s] on %i.%i is %s", t = avahi_record_to_string(r), interface, protocol,
+              event == AVAHI_SUBSCRIPTION_NEW ? "new" : (event == AVAHI_SUBSCRIPTION_CHANGE ? "changed" : "removed"));
 
     g_free(t);
 }
 
+static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, gpointer userdata) {
+    g_message("entry group state: %i", state);
+}
 
 int main(int argc, char *argv[]) {
-    flxServer *flx;
+    AvahiServer *Avahi;
     gchar *r;
     GMainLoop *loop = NULL;
-    flxSubscription *s;
-    flxKey *k;
+    AvahiSubscription *s;
+    AvahiKey *k;
+    AvahiEntryGroup *g;
 
-    flx = flx_server_new(NULL);
+    Avahi = avahi_server_new(NULL);
 
-    flx_server_add_text(flx, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE, NULL, "hallo", NULL);
-    flx_server_add_service(flx, 0, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);
+/*     g = avahi_entry_group_new(Avahi, entry_group_callback, NULL);  */
+    
+/*    avahi_server_add_text(Avahi, g, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, NULL, "hallo", NULL); */
+/*      avahi_server_add_service(Avahi, g, 0, AF_UNSPEC, "_http._tcp", "gurke", NULL, NULL, 80, "foo", NULL);  */
+    
+/*     avahi_entry_group_commit(g);  */
 
-/*     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); */
+    avahi_server_dump(Avahi, stdout);
+    
+    
+/*     k = avahi_key_new("ecstasy.local.", AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_ANY); */
+/*     s = avahi_subscription_new(Avahi, k, 0, AF_UNSPEC, subscription, NULL); */
+/*     avahi_key_unref(k); */
 
     loop = g_main_loop_new(NULL, FALSE);
     
-    g_timeout_add(1000*30, quit_timeout, loop);
-    g_timeout_add(1000, send_timeout, flx);
-    g_timeout_add(1000*20, dump_timeout, flx);
+  /*   g_timeout_add(1000*20, dump_timeout, Avahi); */
+/*     g_timeout_add(1000*30, quit_timeout, loop); */
     
     g_main_loop_run(loop);
-
     g_main_loop_unref(loop);
 
-/*     flx_subscription_free(s); */
-    flx_server_free(flx);
+/*     avahi_subscription_free(s); */
+    /* avahi_entry_group_free(g);  */
+    avahi_server_free(Avahi);
     
     return 0;
 }