Attachment 141297 Details for Bug 276650

diff against yast2-bluetooth-2.15.1.tar.bz2

bluez-3.10-sdpd.diff (text/x-diff), 2.33 KB, created by Forgotten User ZhJd0F0L3x on 2007-05-21 16:58:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User ZhJd0F0L3x

Created: 2007-05-21 16:58:26 UTC

Size: 2.33 KB

patch

obsolete

>--- src/Bluetooth.ycp
>+++ src/Bluetooth.ycp
>@@ -106,6 +106,11 @@
>     if (all != nil && size(all) > 0)
>     {
> 	foreach(string var, all, ``{
>+		// the SDP_START variable might be lying around from < bluez-3.10
>+		// ignore it.
>+		if (var == "SDP_START") {
>+		    continue;
>+		}
> 		if (regexpmatch(var, ".*_START$"))
> 		{
> 		    string daemon_name = regexpsub(var, "(.*)_START$", "\\1");
>@@ -114,6 +119,8 @@
> 	    }
> 	);
>     }
>+    // SDP is always there, but built into hcid since bluez-3.10
>+    ret = add(ret, "SDP");
> 
>     return ret;
> }
>@@ -154,6 +161,10 @@
>     // reset daemon list
>     daemons = [];
>     foreach(string service, detected_services, ``{
>+	    if ((service == "SDP" ))
>+	    {
>+		continue;
>+	    }
> 	    // read start status
> 	    boolean service_enabled = (SCR::Read(.sysconfig.bluetooth + (service + "_START")) == "yes");
> 
>@@ -163,6 +174,17 @@
> 	    // read daemon arguments
> 	    string args = (string)SCR::Read(.sysconfig.bluetooth + (service + "_DAEMON_ARGS"));
> 
>+	    if ((service == "HCI"))
>+	    {
>+		boolean sdp_enabled = false;
>+		if (regexpmatch(args, "([ \t]|^)-s([ \t]|$)"))
>+		{
>+		    sdp_enabled = true;
>+		}
>+		daemons = add(daemons, $[ "service" : "SDP", "enabled": sdp_enabled,
>+		    "daemon" : "", "args" : "" ]);
>+	    }
>+
> 	    daemons = add(daemons, $[ "service" : service, "enabled" : service_enabled,
> 		"daemon" : binary, "args" : args ]);
> 	}
>@@ -259,7 +281,31 @@
>     SCR::Write(.sysconfig.bluetooth.START_SERVICES, (enabled) ? "yes" : "no");
> 
>     // write daemon settings
>+    boolean sdp_enabled = false;
>     foreach(map<string,any> d, daemons, ``{
>+	    if ((d["service"]:"") == "SDP")
>+	    {
>+		sdp_enabled = (d["enabled"]:false);
>+	    }
>+	}
>+    );
>+    foreach(map<string,any> d, daemons, ``{
>+	    if ((d["service"]:"") == "SDP")
>+	    {
>+		// SDPD is now handled by passing "-s" to hcid, since bluez-3.10
>+		continue;
>+	    }
>+	    else if ((d["service"]:"") == "HCI")
>+	    {
>+		if (regexpmatch(d["args"]:"", "([ \t]|^)-s([ \t]|$)"))
>+		{
>+		    d["args"] = regexpsub(d["args"]:"", "(.*)([ \t]|^)-s([ \t]|$)(.*)", "\\1 \\4");
>+		}
>+		if (sdp_enabled)
>+		{
>+		    d["args"] = "-s " + (d["args"]:"");
>+		}
>+	    }
> 	    SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_START"), d["enabled"]:false ? "yes" : "no");
> 	    SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_DAEMON_ARGS"), d["args"]:"");
> 	}

Actions: View

Attachments on bug 276650: 141297