Remove the service agent example

2 files changed, 1 insertions, 508 deletions

diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index be9bd432..3580d51f 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -47,16 +47,12 @@ hcid_LDADD += -lexpat
 endif
 endif
 
-noinst_PROGRAMS = passkey-agent service-agent auth-agent
+noinst_PROGRAMS = passkey-agent auth-agent
 
 passkey_agent_SOURCES = passkey-agent.c
 
 passkey_agent_LDADD = @DBUS_LIBS@
 
-service_agent_SOURCES = service-agent.c
-
-service_agent_LDADD = @DBUS_LIBS@
-
 auth_agent_SOURCES = auth-agent.c
 
 auth_agent_LDADD = @DBUS_LIBS@
diff --git a/hcid/service-agent.c b/hcid/service-agent.c
deleted file mode 100644
index a7d06e75..00000000
--- a/hcid/service-agent.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2005-2007  Marcel Holtmann <marcel@holtmann.org>
- *
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <getopt.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include <dbus/dbus.h>
-
-#define INTERFACE "org.bluez.Manager"
-
-static char *name = NULL;
-static char *description = NULL;
-static char *filename = NULL;
-
-static volatile sig_atomic_t __io_canceled = 0;
-static volatile sig_atomic_t __io_terminated = 0;
-
-static void sig_term(int sig)
-{
-	__io_canceled = 1;
-}
-
-static DBusHandlerResult agent_filter(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	const char *name, *old, *new;
-
-	if (!dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-
-	if (!dbus_message_get_args(msg, NULL,
-			DBUS_TYPE_STRING, &name, DBUS_TYPE_STRING, &old,
-				DBUS_TYPE_STRING, &new, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for NameOwnerChanged signal");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (!strcmp(name, "org.bluez") && *new == '\0') {
-		fprintf(stderr, "Service has been terminated\n");
-		__io_terminated = 1;
-	}
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static DBusHandlerResult start_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-
-	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for service Start method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	printf("Starting example service\n");
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult stop_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-
-	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for service Stop method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	printf("Stopping example service\n");
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult release_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	DBusMessage *reply;
-
-	if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) {
-		fprintf(stderr, "Invalid arguments for service Release method");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	if (!__io_canceled)
-		fprintf(stderr, "Service has been released\n");
-
-	__io_terminated = 1;
-
-	reply = dbus_message_new_method_return(msg);
-	if (!reply) {
-		fprintf(stderr, "Can't create reply message\n");
-		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-	}
-
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
-
-	dbus_connection_send(conn, reply, NULL);
-
-	dbus_connection_flush(conn);
-
-	dbus_message_unref(reply);
-
-	return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult service_message(DBusConnection *conn,
-						DBusMessage *msg, void *data)
-{
-	if (dbus_message_is_method_call(msg, "org.bluez.ServiceAgent", "Start"))
-		return start_message(conn, msg, data);
-
-	if (dbus_message_is_method_call(msg, "org.bluez.ServiceAgent", "Stop"))
-		return stop_message(conn, msg, data);
-
-	if (dbus_message_is_method_call(msg, "org.bluez.ServiceAgent", "Release"))
-		return release_message(conn, msg, data);
-
-	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-static const DBusObjectPathVTable service_table = {
-	.message_function = service_message,
-};
-
-static int append_record_from_blob(DBusMessage *msg)
-{
-	DBusMessageIter iter, array_iter;
-	dbus_message_iter_init_append(msg, &iter);
-	int i;
-
-	unsigned char record[] = {
-			0x35, 0x59, 0x09, 0x00, 0x01, 0x35, 0x03, 0x19,
-	  		0x11, 0x01, 0x09, 0x00, 0x04, 0x35, 0x0c, 0x35,
-	 		0x03, 0x19, 0x01, 0x00, 0x35, 0x05, 0x19, 0x00,
-	  		0x03, 0x08, 0x01, 0x09, 0x00, 0x05, 0x35, 0x03,
-	  		0x19, 0x10, 0x02, 0x09, 0x00, 0x06, 0x35, 0x09,
-	  		0x09, 0x65, 0x6e, 0x09, 0x00, 0x6a, 0x09, 0x01,
-	  		0x00, 0x09, 0x00, 0x09, 0x35, 0x08, 0x35, 0x06,
-	 		0x19, 0x11, 0x01, 0x09, 0x01, 0x00, 0x09, 0x01,
-	  		0x00, 0x25, 0x0b, 0x53, 0x65, 0x72, 0x69, 0x61,
-	  		0x6c, 0x20, 0x50, 0x6f, 0x72, 0x74, 0x09, 0x01,
-	  		0x01, 0x25, 0x08, 0x43, 0x4f, 0x4d, 0x20, 0x50,
-	  		0x6f, 0x72, 0x74 };
-
-	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_BYTE_AS_STRING, &array_iter);
-
-	for (i = 0; i < sizeof(record); i++)
-		dbus_message_iter_append_basic(&array_iter,
-					DBUS_TYPE_BYTE, &record[i]);
-
-	dbus_message_iter_close_container(&iter, &array_iter);
-
-	return 0;
-}
-
-static int append_record_from_file(DBusMessage *msg)
-{
-	struct stat st;
-	char *record;
-	int fd;
-
-	fd = open(filename, O_RDONLY);
-	if (fd < 0)
-		return -1;
-
-	if (fstat(fd, &st) < 0) {
-		close(fd);
-		return -1;
-	}
-
-	record = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	if (!record || record == MAP_FAILED) {
-		close(fd);
-		return -1;
-	}
-
-	dbus_message_append_args(msg, DBUS_TYPE_STRING, &record,
-						DBUS_TYPE_INVALID);
-
-	munmap(record, st.st_size);
-
-	close(fd);
-
-	return 0;
-}
-
-static int add_record(DBusConnection *conn, const char *service_path)
-{
-	DBusMessage *msg, *reply;
-	DBusError error;
-	const char *method;
-	int err;
-
-	method = filename ? "AddServiceRecordFromXML" : "AddServiceRecord";
-		
-	msg = dbus_message_new_method_call("org.bluez", "/org/bluez",
-						INTERFACE, method);
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		return -1;
-	}
-
-	dbus_message_append_args(msg, DBUS_TYPE_STRING, &service_path,
-							DBUS_TYPE_INVALID);
-
-	if (filename)
-		err = append_record_from_file(msg);
-	else
-		err = append_record_from_blob(msg);
-
-	if (err < 0) {
-		fprintf(stderr, "Can't create service record\n");
-		dbus_message_unref(msg);
-		return -1;
-	}
-
-	dbus_error_init(&error);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't register service record\n");
-		if (dbus_error_is_set(&error)) {
-			fprintf(stderr, "%s\n", error.message);
-			dbus_error_free(&error);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	return 0;
-}
-
-static int register_service(DBusConnection *conn, const char *service_path)
-{
-	DBusMessage *msg, *reply;
-	DBusError error;
-
-	if (!dbus_connection_register_object_path(conn, service_path,
-							&service_table, NULL)) {
-		fprintf(stderr, "Can't register object path for service\n");
-		return -1;
-	}
-
-	msg = dbus_message_new_method_call("org.bluez", "/org/bluez",
-					INTERFACE, "RegisterService");
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		return -1;
-	}
-
-	dbus_message_append_args(msg, DBUS_TYPE_STRING, &service_path,
-					DBUS_TYPE_STRING, &name,
-					DBUS_TYPE_STRING, &description,
-							DBUS_TYPE_INVALID);
-
-	dbus_error_init(&error);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't register service agent\n");
-		if (dbus_error_is_set(&error)) {
-			fprintf(stderr, "%s\n", error.message);
-			dbus_error_free(&error);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	return add_record(conn, service_path);
-}
-
-static int unregister_service(DBusConnection *conn, const char *service_path)
-{
-	DBusMessage *msg, *reply;
-	DBusError error;
-
-	msg = dbus_message_new_method_call("org.bluez", "/org/bluez",
-					INTERFACE, "UnregisterService");
-	if (!msg) {
-		fprintf(stderr, "Can't allocate new method call\n");
-		dbus_connection_unref(conn);
-		exit(1);
-	}
-
-	dbus_message_append_args(msg, DBUS_TYPE_STRING, &service_path,
-							DBUS_TYPE_INVALID);
-
-	dbus_error_init(&error);
-
-	reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error);
-
-	dbus_message_unref(msg);
-
-	if (!reply) {
-		fprintf(stderr, "Can't unregister service agent\n");
-		if (dbus_error_is_set(&error)) {
-			fprintf(stderr, "%s\n", error.message);
-			dbus_error_free(&error);
-		}
-		return -1;
-	}
-
-	dbus_message_unref(reply);
-
-	dbus_connection_flush(conn);
-
-	dbus_connection_unregister_object_path(conn, service_path);
-
-	return 0;
-}
-
-static void usage(void)
-{
-	printf("Bluetooth service agent ver %s\n\n", VERSION);
-
-	printf("Usage:\n"
-		"\tservice-agent [--name service-name]"
-			" [--description service-description]"
-			" [--path service-path]"
-			" [--file service-record]\n"
-		"\n");
-}
-
-static struct option main_options[] = {
-	{ "name",		1, 0, 'n' },
-	{ "description",	1, 0, 'd' },
-	{ "path",		1, 0, 'p' },
-	{ "file",		1, 0, 'f' },
-	{ "help",		0, 0, 'h' },
-	{ 0, 0, 0, 0 }
-};
-
-int main(int argc, char *argv[])
-{
-	struct sigaction sa;
-	DBusConnection *conn;
-	char match_string[128], default_path[128], *service_path = NULL;
-	int opt;
-
-	snprintf(default_path, sizeof(default_path),
-				"/org/bluez/service_agent_%d", getpid());
-
-	while ((opt = getopt_long(argc, argv, "+n:d:p:f:h", main_options, NULL)) != EOF) {
-		switch(opt) {
-		case 'n':
-			name = strdup(optarg);
-			break;
-		case 'd':
-			description = strdup(optarg);
-			break;
-		case 'p':
-			if (optarg[0] != '/') {
-				fprintf(stderr, "Invalid path\n");
-				exit(1);
-			}
-			service_path = strdup(optarg);
-			break;
-		case 'f':
-			filename = strdup(optarg);
-			break;
-		case 'h':
-			usage();
-			exit(0);
-		default:
-			exit(1);
-		}
-	}
-
-	argc -= optind;
-	argv += optind;
-	optind = 0;
-
-	if (!service_path)
-		service_path = strdup(default_path);
-
-	conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
-	if (!conn) {
-		fprintf(stderr, "Can't get on system bus");
-		exit(1);
-	}
-
-	if (!name)
-		name = strdup("Example service");
-
-	if (!description)
-		description = strdup("Service agent with an example");
-
-	if (register_service(conn, service_path) < 0) {
-		dbus_connection_unref(conn);
-		exit(1);
-	}
-
-	if (!dbus_connection_add_filter(conn, agent_filter, NULL, NULL))
-		fprintf(stderr, "Can't add signal filter");
-
-	snprintf(match_string, sizeof(match_string),
-			"interface=%s,member=NameOwnerChanged,arg0=%s",
-					DBUS_INTERFACE_DBUS, "org.bluez");
-
-	dbus_bus_add_match(conn, match_string, NULL);
-
-	memset(&sa, 0, sizeof(sa));
-	sa.sa_flags   = SA_NOCLDSTOP;
-	sa.sa_handler = sig_term;
-	sigaction(SIGTERM, &sa, NULL);
-	sigaction(SIGINT,  &sa, NULL);
-
-	while (!__io_canceled && !__io_terminated) {
-		if (dbus_connection_read_write_dispatch(conn, 500) != TRUE)
-			break;
-	}
-
-	if (!__io_terminated)
-		unregister_service(conn, service_path);
-
-	if (name)
-		free(name);
-
-	if (description)
-		free(description);
-
-	if (filename);
-		free(filename);
-
-	dbus_connection_unref(conn);
-
-	return 0;
-}