Re: Make bluetoothd start w/o SDP Server

Susanne Goldammer
2009-11-12T15:16:19Z

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

Bastien Nocera schrieb:
> On Thu, 2009-11-12 at 15:13 +0100, Susanne Goldammer wrote:
>
>> + "Don't run SDP service (debuggin
>> option)" },
>>
>
> Typo there: s/debuggin/debugging/
>
>
Fixed. New patch attached.

[-- Attachment #2: no_sdp_server_option.patch --]
[-- Type: text/plain, Size: 1422 bytes --]

diff -r -u bluez-4.57/src/main.c bluez-4.57_no_sdp_option/src/main.c
--- bluez-4.57/src/main.c 2009-10-04 05:56:37.000000000 +0200
+++ bluez-4.57_no_sdp_option/src/main.c 2009-11-12 16:09:32.000000000 +0100
@@ -296,6 +296,8 @@
static gboolean option_detach = TRUE;
static gboolean option_debug = FALSE;
static gboolean option_udev = FALSE;
+static gboolean option_runsdp = TRUE;
+

static guint last_adapter_timeout = 0;

@@ -335,6 +337,9 @@
"Enable debug information output" },
{ "udev", 'u', 0, G_OPTION_ARG_NONE, &option_udev,
"Run from udev mode of operation" },
+ { "nosdp", 'S', G_OPTION_FLAG_REVERSE,
+ G_OPTION_ARG_NONE, &option_runsdp,
+ "Don't run SDP service (debugging option)" },
{ NULL },
};

@@ -429,7 +434,13 @@
}
}

- start_sdp_server(mtu, main_opts.deviceid, SDP_SERVER_COMPAT);
+ if (option_runsdp == TRUE)
+ start_sdp_server(mtu, main_opts.deviceid, SDP_SERVER_COMPAT);
+ else {
+ /* see sdpd-server.c: start_sdp_server() -> init_server() */
+ register_public_browse_group();
+ register_server_service();
+ }

/* Loading plugins has to be done after D-Bus has been setup since
* the plugins might wanna expose some paths on the bus. However the
@@ -458,7 +469,11 @@

plugin_cleanup();

- stop_sdp_server();
+ if (option_runsdp == TRUE)
+ stop_sdp_server();
+ else
+ /* see sdpd-server.c: stop_sdp_server() */
+ sdp_svcdb_reset();

agent_exit();