Removed SDP conditional initialization

2 files changed, 40 insertions, 102 deletions

diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c
index e6e1de06..f47df37d 100644
--- a/hcid/dbus-database.c
+++ b/hcid/dbus-database.c
@@ -55,8 +55,6 @@
 #include "dbus-security.h"
 #include "dbus-database.h"
 
-static int sdp_server_enable = 0;
-
 static GSList *records = NULL;
 
 struct record_data {
@@ -83,10 +81,7 @@ static void exit_callback(const char *name, void *user_data)
 
 	records = g_slist_remove(records, user_record);
 
-	if (sdp_server_enable)
-		remove_record_from_server(user_record->handle);
-	else
-		unregister_sdp_record(user_record->handle);
+	remove_record_from_server(user_record->handle);
 
 	if (user_record->sender)
 		g_free(user_record->sender);
@@ -112,41 +107,27 @@ static DBusHandlerResult add_service_record(DBusConnection *conn,
 	if (len <= 0)
 		return error_invalid_arguments(conn, msg, NULL);
 
-	user_record = g_new0(struct record_data, 1);
-
-	if (sdp_server_enable) {
-		sdp_record = sdp_extract_pdu(record, &scanned);
-		if (!sdp_record) {
-			error("Parsing of service record failed");
-			g_free(user_record);
-			return error_failed_errno(conn, msg, EIO);
-		}
+	sdp_record = sdp_extract_pdu(record, &scanned);
+	if (!sdp_record) {
+		error("Parsing of service record failed");
+		return error_failed_errno(conn, msg, EIO);
+	}
 
-		if (scanned != len) {
-			error("Size mismatch of service record");
-			g_free(user_record);
-			sdp_record_free(sdp_record);
-			return error_failed_errno(conn, msg, EIO);
-		}
+	if (scanned != len) {
+		error("Size mismatch of service record");
+		sdp_record_free(sdp_record);
+		return error_failed_errno(conn, msg, EIO);
+	}
 
-		if (add_record_to_server(BDADDR_ANY, sdp_record) < 0) {
-			error("Failed to register service record");
-			g_free(user_record);
-			sdp_record_free(sdp_record);
-			return error_failed_errno(conn, msg, EIO);
-		}
+	if (add_record_to_server(BDADDR_ANY, sdp_record) < 0) {
+		error("Failed to register service record");
+		sdp_record_free(sdp_record);
+		return error_failed_errno(conn, msg, EIO);
+	}
 
-		user_record->handle = sdp_record->handle;
-	} else {
-		uint32_t size = len;
+	user_record = g_new0(struct record_data, 1);
 
-		if (register_sdp_binary((uint8_t *) record, size,
-						&user_record->handle) < 0) {
-			error("Failed to register service record");
-			g_free(user_record);
-			return error_failed_errno(conn, msg, errno);
-		}
-	}
+	user_record->handle = sdp_record->handle;
 
 	sender = dbus_message_get_sender(msg);
 
@@ -172,37 +153,22 @@ int add_xml_record(DBusConnection *conn, const char *sender, bdaddr_t *src,
 	struct record_data *user_record;
 	sdp_record_t *sdp_record;
 
-	user_record = g_new0(struct record_data, 1);
-
 	sdp_record = sdp_xml_parse_record(record, strlen(record));
 	if (!sdp_record) {
 		error("Parsing of XML service record failed");
-		g_free(user_record);
 		return -EIO;
 	}
 
-	if (sdp_server_enable) {
-		if (add_record_to_server(src, sdp_record) < 0) {
-			error("Failed to register service record");
-			g_free(user_record);
-			sdp_record_free(sdp_record);
-			return -EIO;
-		}
-
-		user_record->handle = sdp_record->handle;
-	} else {
-		if (register_sdp_record(src, sdp_record) < 0) {
-			error("Failed to register service record");
-			g_free(user_record);
-			sdp_record_free(sdp_record);
-			return -EIO;
-		}
-
-		user_record->handle = sdp_record->handle;
-
+	if (add_record_to_server(src, sdp_record) < 0) {
+		error("Failed to register service record");
 		sdp_record_free(sdp_record);
+		return -EIO;
 	}
 
+	user_record = g_new0(struct record_data, 1);
+
+	user_record->handle = sdp_record->handle;
+
 	user_record->sender = g_strdup(sender);
 
 	records = g_slist_append(records, user_record);
@@ -247,29 +213,17 @@ static DBusHandlerResult update_record(DBusConnection *conn, DBusMessage *msg,
 {
 	int err;
 
-	if (sdp_server_enable) {
-		if (remove_record_from_server(handle) < 0) {
-			sdp_record_free(sdp_record);
-			return error_not_available(conn, msg);
-		}
-
-		sdp_record->handle = handle;
-		err = add_record_to_server(src, sdp_record);
-		if (err < 0) {
-			sdp_record_free(sdp_record);
-			error("Failed to update the service record");
-			return error_failed_errno(conn, msg, EIO);
-		}
-	} else {
-		sdp_data_t *d = sdp_data_alloc(SDP_UINT32, &handle);
-		sdp_attr_replace(sdp_record, SDP_ATTR_RECORD_HANDLE, d);
+	if (remove_record_from_server(handle) < 0) {
+		sdp_record_free(sdp_record);
+		return error_not_available(conn, msg);
+	}
 
-		err = update_sdp_record(handle, sdp_record);
+	sdp_record->handle = handle;
+	err = add_record_to_server(src, sdp_record);
+	if (err < 0) {
 		sdp_record_free(sdp_record);
-		if (err < 0) {
-			error("Failed to update the service record");
-			return error_failed_errno(conn, msg, EIO);
-		}
+		error("Failed to update the service record");
+		return error_failed_errno(conn, msg, EIO);
 	}
 
 	return send_message_and_unref(conn,
@@ -366,10 +320,7 @@ int remove_record(DBusConnection *conn, const char *sender,
 
 	records = g_slist_remove(records, user_record);
 
-	if (sdp_server_enable)
-		remove_record_from_server(handle);
-	else
-		unregister_sdp_record(handle);
+	remove_record_from_server(handle);
 
 	if (user_record->sender)
 		g_free(user_record->sender);
@@ -561,8 +512,3 @@ DBusHandlerResult database_message(DBusConnection *conn,
 
 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
-
-void set_sdp_server_enable(void)
-{
-	sdp_server_enable = 1;
-}
diff --git a/hcid/main.c b/hcid/main.c
index a18d7a32..d9bd51de 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -770,7 +770,7 @@ int main(int argc, char *argv[])
 	struct sigaction sa;
 	GIOChannel *ctl_io, *child_io;
 	uint16_t mtu = 0;
-	int opt, daemonize = 1, debug = 0, sdp = 0, experimental = 0;
+	int opt, daemonize = 1, debug = 0, experimental = 0;
 
 	/* Default HCId settings */
 	memset(&hcid, 0, sizeof(hcid));
@@ -788,7 +788,7 @@ int main(int argc, char *argv[])
 
 	init_defaults();
 
-	while ((opt = getopt(argc, argv, "ndsm:xf:")) != EOF) {
+	while ((opt = getopt(argc, argv, "ndm:xf:")) != EOF) {
 		switch (opt) {
 		case 'n':
 			daemonize = 0;
@@ -798,10 +798,6 @@ int main(int argc, char *argv[])
 			debug = 1;
 			break;
 
-		case 's':
-			sdp = 1;
-			break;
-
 		case 'm':
 			mtu = atoi(optarg);
 			break;
@@ -915,11 +911,8 @@ int main(int argc, char *argv[])
 	/* Initialize already connected devices */
 	init_all_devices(hcid.sock);
 
-	if (sdp) {
-		set_sdp_server_enable();
-		start_sdp_server(mtu, hcid.deviceid, SDP_SERVER_COMPAT);
-		set_service_classes_callback(update_service_classes);
-	}
+	start_sdp_server(mtu, hcid.deviceid, SDP_SERVER_COMPAT);
+	set_service_classes_callback(update_service_classes);
 
 	notify_init();
 
@@ -936,8 +929,7 @@ int main(int argc, char *argv[])
 
 	plugin_cleanup();
 
-	if (sdp)
-		stop_sdp_server();
+	stop_sdp_server();
 
 	free_device_opts();