* add initial implmenentation of a "simple protocol" for usage with nss-mdns

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@113 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 98 insertions, 80 deletions

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 9a02391..3875865 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -29,106 +29,108 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "simple-protocol.h"
+
 #define DBUS_SERVICE_AVAHI "org.freedesktop.Avahi"
 
 static DBusHandlerResult
 do_register (DBusConnection *conn, DBusMessage *message)
 {
-	DBusError error;
-	char *s;
+    DBusError error;
+    char *s;
 
-	dbus_error_init (&error);
+    dbus_error_init (&error);
 
-	dbus_message_get_args (message, &error,
-			DBUS_TYPE_STRING, &s,
-			DBUS_TYPE_INVALID);
+    dbus_message_get_args (message, &error,
+                           DBUS_TYPE_STRING, &s,
+                           DBUS_TYPE_INVALID);
 
-	if (dbus_error_is_set (&error))
-	{
-		g_warning ("Error parsing register attempt");
-		dbus_error_free (&error);
+    if (dbus_error_is_set (&error))
+    {
+        g_warning ("Error parsing register attempt");
+        dbus_error_free (&error);
 
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
 
-	g_message ("Register received from: %s", s);
+    g_message ("Register received from: %s", s);
 
-	return DBUS_HANDLER_RESULT_HANDLED;
+    return DBUS_HANDLER_RESULT_HANDLED;
 }
 
 static DBusHandlerResult
 signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
 {
-	GMainLoop *loop = user_data;
-	DBusError error;
-
-	dbus_error_init (&error);
-
-	g_message ("dbus: interface=%s, path=%s, member=%s",
-			dbus_message_get_interface (message),
-			dbus_message_get_path (message),
-			dbus_message_get_member (message));
-
-	if (dbus_message_is_signal (message,
-				DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-				"Disconnected"))
-	{
-		/* No, we shouldn't quit, but until we get somewhere
-		 * usefull such that we can restore our state, we will */
-		g_warning ("Disconnnected from d-bus");
-
-		g_main_loop_quit (loop);
-		return DBUS_HANDLER_RESULT_HANDLED;
-	} else if (dbus_message_is_method_call (message, DBUS_SERVICE_AVAHI,
-				"Register"))
-	{
-		return do_register (conn, message);
-	} else if (dbus_message_is_signal (message,
-				DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
-				"ServiceAcquired"))
-	{
-		char *name;
-
-		dbus_message_get_args (message, &error,
-				DBUS_TYPE_STRING, &name,
-				DBUS_TYPE_INVALID);
-
-		if (dbus_error_is_set (&error))
-		{
-			g_warning ("Error parsing NameAcquired message");
-			dbus_error_free (&error);
-
-			return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-		}
-
-		g_message ("dbus: ServiceAcquired (%s)", name);
-
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-	g_message ("dbus: missed event");
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    GMainLoop *loop = user_data;
+    DBusError error;
+
+    dbus_error_init (&error);
+
+    g_message ("dbus: interface=%s, path=%s, member=%s",
+               dbus_message_get_interface (message),
+               dbus_message_get_path (message),
+               dbus_message_get_member (message));
+
+    if (dbus_message_is_signal (message,
+                                DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+                                "Disconnected"))
+    {
+        /* No, we shouldn't quit, but until we get somewhere
+         * usefull such that we can restore our state, we will */
+        g_warning ("Disconnnected from d-bus");
+
+        g_main_loop_quit (loop);
+        return DBUS_HANDLER_RESULT_HANDLED;
+    } else if (dbus_message_is_method_call (message, DBUS_SERVICE_AVAHI,
+                                            "Register"))
+    {
+        return do_register (conn, message);
+    } else if (dbus_message_is_signal (message,
+                                       DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
+                                       "ServiceAcquired"))
+    {
+        char *name;
+
+        dbus_message_get_args (message, &error,
+                               DBUS_TYPE_STRING, &name,
+                               DBUS_TYPE_INVALID);
+
+        if (dbus_error_is_set (&error))
+        {
+            g_warning ("Error parsing NameAcquired message");
+            dbus_error_free (&error);
+
+            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+        }
+
+        g_message ("dbus: ServiceAcquired (%s)", name);
+
+        return DBUS_HANDLER_RESULT_HANDLED;
+    }
+
+    g_message ("dbus: missed event");
+
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
-		
+                
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
-    DBusConnection *bus;
+    DBusConnection *bus = NULL;
     DBusError error;
+    gint r = -1;
 
     loop = g_main_loop_new(NULL, FALSE);
 
     dbus_error_init (&error);
 
-
     bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 
     if (bus == NULL)
     {
-	    g_warning ("dbus_bus_get(): %s", error.message);
-	    dbus_error_free (&error);
+        g_warning ("dbus_bus_get(): %s", error.message);
+        dbus_error_free (&error);
 
-	    return -1;
+        goto finish;
     }
 
     dbus_connection_setup_with_g_main (bus, NULL);
@@ -138,27 +140,43 @@ int main(int argc, char *argv[]) {
 
     if (dbus_error_is_set (&error))
     {
-	    g_warning ("dbus_error_is_set (): %s", error.message);
-	    dbus_error_free (&error);
+        g_warning ("dbus_error_is_set (): %s", error.message);
+        dbus_error_free (&error);
 
-	    return -1;
+        goto finish;
     }
 
     dbus_connection_add_filter (bus, signal_filter, loop, NULL);
     dbus_bus_add_match (bus,
-		    "type='method_call',interface='org.freedesktop.Avahi'",
-		    &error);
+                        "type='method_call',interface='org.freedesktop.Avahi'",
+                        &error);
 
     if (dbus_error_is_set (&error))
     {
-	    g_warning ("dbus_bus_add_match (): %s", error.message);
-	    dbus_error_free (&error);
+        g_warning ("dbus_bus_add_match (): %s", error.message);
+        dbus_error_free (&error);
 
-	    return -1;
+        goto finish;
     }
 
+    if (simple_protocol_setup(NULL) < 0)
+        goto finish;
+
     g_main_loop_run(loop);
-    g_main_loop_unref(loop);
+
+    r = 0;
     
-    return 0;
+finish:
+
+    simple_protocol_shutdown();
+
+    if (bus) {
+        dbus_connection_disconnect(bus);
+        dbus_connection_unref(bus);
+    }
+
+    if (loop)
+        g_main_loop_unref(loop);
+
+    return r;
 }