From 06e0a7f62e2f594784c01ce232e040dae333dc18 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 19 Jan 2007 16:19:50 +0000 Subject: Make the echo service useful for testing again --- daemon/Makefile.am | 7 +- daemon/echo.c | 279 ++++++----------------------------------------- daemon/service-agent.xml | 20 ---- 3 files changed, 37 insertions(+), 269 deletions(-) delete mode 100644 daemon/service-agent.xml diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 2f13ade2..9f7a4a0e 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -7,7 +7,7 @@ glib_cflags = glib_ldadd = endif -noinst_PROGRAMS = bluetoothd +noinst_PROGRAMS = bluetoothd bluetoothd_echo bluetoothd_SOURCES = main.c system.h \ manager.h manager.c database.h database.c \ @@ -17,6 +17,11 @@ bluetoothd_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \ $(top_builddir)/sdpd/libsdpserver.a \ $(top_builddir)/common/libhelper.a +bluetoothd_echo_SOURCES = echo.c + +bluetoothd_echo_LDADD = $(glib_ldadd) @DBUS_LIBS@ @BLUEZ_LIBS@ \ + $(top_builddir)/common/libhelper.a + if EXPAT bluetoothd_LDADD += -lexpat endif diff --git a/daemon/echo.c b/daemon/echo.c index 56c52164..8f6e5643 100644 --- a/daemon/echo.c +++ b/daemon/echo.c @@ -25,277 +25,60 @@ #include #endif -#include -#include -#include #include -#include +#include +#include -#include -#include +#include -#include +#include "dbus.h" +#include "glib-ectomy.h" +#include "logging.h" -#define AGENT_PATH "/org/bluez/echo" +static GMainLoop *main_loop = NULL; -static DBusGConnection *conn; +static DBusConnection *system_bus = NULL; -typedef struct { - GObject parent; - GIOChannel *server; - guint channel; -} ServiceAgent; - -typedef struct { - GObjectClass parent; -} ServiceAgentClass; - -static GObjectClass *parent_class; - -G_DEFINE_TYPE(ServiceAgent, service_agent, G_TYPE_OBJECT) - -#define SERVICE_AGENT_OBJECT_TYPE (service_agent_get_type()) - -#define SERVICE_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - SERVICE_AGENT_OBJECT_TYPE, ServiceAgent)) - -static void service_agent_finalize(GObject *obj) -{ - parent_class->finalize(obj); -} - -static void service_agent_init(ServiceAgent *obj) -{ - obj->server = NULL; - obj->channel = 23; -} - -enum { - PROP_0, - PROP_CHANNEL -}; - -static void service_agent_set_property(GObject *object, guint prop_id, - const GValue *value, GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_CHANNEL: - SERVICE_AGENT(object)->channel = g_value_get_uint(value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - break; - } -} - -static void service_agent_get_property(GObject *object, guint prop_id, - GValue *value, GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_CHANNEL: - g_value_set_uint(value, SERVICE_AGENT(object)->channel); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); - break; - } -} - -static void service_agent_class_init(ServiceAgentClass *klass) -{ - GObjectClass *gobject_class; - - parent_class = g_type_class_peek_parent(klass); - - gobject_class = G_OBJECT_CLASS(klass); - gobject_class->finalize = service_agent_finalize; - - gobject_class->set_property = service_agent_set_property; - gobject_class->get_property = service_agent_get_property; - - g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_CHANNEL, - g_param_spec_uint("channel", NULL, NULL, - 1, 30, 23, G_PARAM_READWRITE)); -} - -static ServiceAgent *service_agent_new(const char *path) -{ - ServiceAgent *agent; - - agent = g_object_new(SERVICE_AGENT_OBJECT_TYPE, NULL); - - dbus_g_connection_register_g_object(conn, path, G_OBJECT(agent)); - - return agent; -} - -static gboolean session_event(GIOChannel *chan, GIOCondition cond, gpointer data) -{ - unsigned char buf[672]; - gsize len; - GIOError err; - int sk, ret; - - if (cond & (G_IO_HUP | G_IO_ERR)) { - g_io_channel_unref(chan); - return FALSE; - } - - err = g_io_channel_read(chan, (gchar *) buf, sizeof(buf), &len); - if (err == G_IO_ERROR_AGAIN) - return TRUE; - - sk = g_io_channel_unix_get_fd(chan); - - ret = write(sk, buf, len); - - return TRUE; -} - -static gboolean connect_event(GIOChannel *chan, GIOCondition cond, gpointer data) +static void sig_term(int sig) { - GIOChannel *io; - struct sockaddr_rc addr; - socklen_t optlen; - int sk, nsk; - - sk = g_io_channel_unix_get_fd(chan); - - memset(&addr, 0, sizeof(addr)); - optlen = sizeof(addr); - - nsk = accept(sk, (struct sockaddr *) &addr, &optlen); - if (nsk < 0) - return TRUE; - - io = g_io_channel_unix_new(nsk); - g_io_channel_set_close_on_unref(io, TRUE); - - g_io_add_watch(io, G_IO_IN | G_IO_HUP | G_IO_ERR, - session_event, NULL); - - return TRUE; + g_main_loop_quit(main_loop); } -static gboolean service_agent_start(ServiceAgent *agent, - DBusGMethodInvocation *context) +static void sig_hup(int sig) { - struct sockaddr_rc addr; - int sk; - - if (agent->server) - return FALSE; - - sk = socket(PF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); - if (sk < 0) - return FALSE; - - memset(&addr, 0, sizeof(addr)); - addr.rc_family = AF_BLUETOOTH; - bacpy(&addr.rc_bdaddr, BDADDR_ANY); - addr.rc_channel = agent->channel; - - if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) { - close(sk); - return FALSE; - } - - if (listen(sk, 10)) { - close(sk); - return FALSE; - } - - agent->server = g_io_channel_unix_new(sk); - g_io_channel_set_close_on_unref(agent->server, TRUE); - - g_io_add_watch(agent->server, G_IO_IN, connect_event, NULL); - - dbus_g_method_return(context, NULL); - - return TRUE; } -static gboolean service_agent_stop(ServiceAgent *agent, - DBusGMethodInvocation *context) -{ - if (agent->server) { - g_io_channel_close(agent->server); - g_io_channel_unref(agent->server); - agent->server = NULL; - } - - dbus_g_method_return(context, NULL); - - return TRUE; -} - -static gboolean service_agent_release(ServiceAgent *agent, GError **error) -{ - if (agent->server) { - g_io_channel_close(agent->server); - g_io_channel_unref(agent->server); - agent->server = NULL; - } - - return TRUE; -} - -#include "service-agent-glue.h" - -static int register_service_agent(void) +int main(int argc, char *argv[]) { - DBusGProxy *object; - GError *error = NULL; - const char *name = "Echo service"; - const char *desc = "Simple serial port profile based echo service"; - void *agent; + struct sigaction sa; - agent = service_agent_new(AGENT_PATH); - if (!agent) - return -1; + start_logging("echo", "Bluetooth echo service ver %s", VERSION); - object = dbus_g_proxy_new_for_name(conn, "org.bluez", - "/org/bluez", "org.bluez.Manager"); + 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_hup; + sigaction(SIGHUP, &sa, NULL); - dbus_g_proxy_call(object, "RegisterService", &error, - G_TYPE_STRING, AGENT_PATH, - G_TYPE_STRING, name, - G_TYPE_STRING, desc, - G_TYPE_INVALID, G_TYPE_INVALID); + main_loop = g_main_loop_new(NULL, FALSE); - if (error != NULL) { - g_error_free(error); - return -1; + system_bus = init_dbus(NULL, NULL, NULL); + if (!system_bus) { + error("Connection to system bus failed"); + exit(1); } - return 0; -} - -int main(int argc, char *argv[]) -{ - GMainLoop *mainloop; - GError *error = NULL; - - g_type_init(); - - mainloop = g_main_loop_new(NULL, FALSE); - - conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); - if (error != NULL) { - g_printerr("Connecting to system bus failed: %s\n", - error->message); - g_error_free(error); - exit(EXIT_FAILURE); - } + g_main_loop_run(main_loop); - dbus_g_object_type_install_info(SERVICE_AGENT_OBJECT_TYPE, - &dbus_glib_service_agent_object_info); + dbus_connection_unref(system_bus); - register_service_agent(); + g_main_loop_unref(main_loop); - g_main_loop_run(mainloop); + info("Exit"); - dbus_g_connection_unref(conn); + stop_logging(); return 0; } diff --git a/daemon/service-agent.xml b/daemon/service-agent.xml deleted file mode 100644 index 0e5b80f9..00000000 --- a/daemon/service-agent.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -- cgit