Convert serial service to a plugin

1 files changed, 21 insertions, 52 deletions

diff --git a/serial/main.c b/serial/main.c
index 3554eeeb..466ee883 100644
--- a/serial/main.c
+++ b/serial/main.c
@@ -25,70 +25,39 @@
 #include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <glib.h>
 
-#include "logging.h"
-#include "dbus.h"
+#include <errno.h>
+#include <sys/types.h>
 
-#include "manager.h"
+#include <dbus/dbus.h>
 
-static GMainLoop *main_loop;
+#include "plugin.h"
+#include "dbus.h"
+#include "manager.h"
 
-static void sig_term(int sig)
-{
-	g_main_loop_quit(main_loop);
-}
+static DBusConnection *conn;
 
-int main(int argc, char *argv[])
+static int serial_init(void)
 {
-	DBusConnection *conn;
-	struct sigaction sa;
-
-	start_logging("serial", "Bluetooth Serial Port daemon");
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_flags = SA_NOCLDSTOP;
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-
-	sa.sa_handler = SIG_IGN;
-	sigaction(SIGCHLD, &sa, NULL);
-	sigaction(SIGPIPE, &sa, NULL);
-
-	enable_debug();
-
-	main_loop = g_main_loop_new(NULL, FALSE);
+	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+	if (conn == NULL)
+		return -EIO;
 
-	conn = dbus_bus_system_setup_with_main_loop(NULL, NULL, NULL);
-	if (!conn) {
-		g_main_loop_unref(main_loop);
-		exit(EXIT_FAILURE);
-	}
-
-	if (serial_init(conn) < 0) {
+	if (serial_manager_init(conn) < 0) {
 		dbus_connection_unref(conn);
-		g_main_loop_unref(main_loop);
-		exit(EXIT_FAILURE);
+		return -EIO;
 	}
 
-	if (argc > 1 && !strcmp(argv[1], "-s"))
-		register_external_service(conn, "serial", "Serial service", "");
+	register_external_service(conn, "serial", "Serial service", "");
 
-	g_main_loop_run(main_loop);
+	return 0;
+}
 
-	serial_exit();
+static void serial_exit(void)
+{
+	serial_manager_exit();
 
 	dbus_connection_unref(conn);
-
-	g_main_loop_unref(main_loop);
-
-	info("Exit");
-
-	stop_logging();
-
-	return 0;
 }
+
+BLUETOOTH_PLUGIN_DEFINE("serial", serial_init, serial_exit)