From ea20559599bb3ced8cce4c53585e315b556b8832 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 14 Sep 2018 15:27:57 +0200 Subject: [PATCH] tools: Change net.connman.iwd.hwsim to net.connman.hwsim --- autotests/util/hwsim.py | 12 ++++++------ doc/hwsim-radio-api.txt | 14 +++++++------- doc/hwsim-rules-api.txt | 10 +++++----- tools/hwsim-dbus.conf | 8 ++++---- tools/hwsim.c | 4 ++-- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/autotests/util/hwsim.py b/autotests/util/hwsim.py index 724d79e8..a4eacbc4 100755 --- a/autotests/util/hwsim.py +++ b/autotests/util/hwsim.py @@ -8,12 +8,12 @@ from enum import Enum import iwd -HWSIM_SERVICE = 'net.connman.iwd.hwsim' -HWSIM_RULE_MANAGER_INTERFACE = 'net.connman.iwd.hwsim.RuleManager' -HWSIM_RULE_INTERFACE = 'net.connman.iwd.hwsim.Rule' -HWSIM_RADIO_MANAGER_INTERFACE = 'net.connman.iwd.hwsim.RadioManager' -HWSIM_RADIO_INTERFACE = 'net.connman.iwd.hwsim.Radio' -HWSIM_INTERFACE_INTERFACE = 'net.connman.iwd.hwsim.Interface' +HWSIM_SERVICE = 'net.connman.hwsim' +HWSIM_RULE_MANAGER_INTERFACE = 'net.connman.hwsim.RuleManager' +HWSIM_RULE_INTERFACE = 'net.connman.hwsim.Rule' +HWSIM_RADIO_MANAGER_INTERFACE = 'net.connman.hwsim.RadioManager' +HWSIM_RADIO_INTERFACE = 'net.connman.hwsim.Radio' +HWSIM_INTERFACE_INTERFACE = 'net.connman.hwsim.Interface' HWSIM_AGENT_MANAGER_PATH = '/' diff --git a/doc/hwsim-radio-api.txt b/doc/hwsim-radio-api.txt index 0d0ca7ad..7303c33d 100644 --- a/doc/hwsim-radio-api.txt +++ b/doc/hwsim-radio-api.txt @@ -1,14 +1,14 @@ RadioManager hierarchy ====================== -Service net.connman.iwd.hwsim -Interface net.connman.iwd.hwsim.RadioManager [Experimental] +Service net.connman.hwsim +Interface net.connman.hwsim.RadioManager [Experimental] Object path / Methods object CreateRadio(string name, boolean p2p_device) Add one virtual radio device to the simulator, a path to a new object with the - net.connman.iwd.hwsim.Radio interface is returned. + net.connman.hwsim.Radio interface is returned. The radio is created with one network interface of the type "managed" (Station) and optionally one P2P Device interface. The name parameter may be @@ -18,8 +18,8 @@ Methods object CreateRadio(string name, boolean p2p_device) use the default name if the requested name can not be used. -Service net.connman.iwd.hwsim -Interface net.connman.iwd.hwsim.Radio [Experimental] +Service net.connman.hwsim +Interface net.connman.hwsim.Radio [Experimental] Object path /{radio0,radio1,...} Methods void Remove() @@ -55,8 +55,8 @@ Properties string Name [readonly] kept by the simulator. Only present if one of these custom domains is in use. -Service net.connman.iwd.hwsim -Interface net.connman.iwd.hwsim.Interface [Experimental] +Service net.connman.hwsim +Interface net.connman.hwsim.Interface [Experimental] Object path /{radio0,radio1,...}/{1,2,...} Methods void SendFrame(string addr, uint32 freq, int32 signal, diff --git a/doc/hwsim-rules-api.txt b/doc/hwsim-rules-api.txt index 9bef1aff..0002db36 100644 --- a/doc/hwsim-rules-api.txt +++ b/doc/hwsim-rules-api.txt @@ -1,8 +1,8 @@ RuleManager hierarchy ===================== -Service net.connman.iwd.hwsim -Interface net.connman.iwd.hwsim.RuleManager [Experimental] +Service net.connman.hwsim +Interface net.connman.hwsim.RuleManager [Experimental] Object path / Methods object AddRule() @@ -18,8 +18,8 @@ Methods object AddRule() priority property. See below for specifics on those properties. -Service net.connman.iwd.hwsim -Interface net.connman.iwd.hwsim.Rule [Experimental] +Service net.connman.hwsim +Interface net.connman.hwsim.Rule [Experimental] Object path /{rule0,rule1,...} Methods void Remove() @@ -31,7 +31,7 @@ Properties string Source and Destination addresses refer to the hardware addresses of the source and the destination radios as given by the - net.connman.iwd.hwsim.Radio.Addresses property + net.connman.hwsim.Radio.Addresses property on the radio object (see hwsim-radio-api.txt). While those addresses initially match the network interface mac addresses, and that present in the diff --git a/tools/hwsim-dbus.conf b/tools/hwsim-dbus.conf index 09ea6d88..ec081361 100644 --- a/tools/hwsim-dbus.conf +++ b/tools/hwsim-dbus.conf @@ -8,16 +8,16 @@ - - + + - + - + diff --git a/tools/hwsim.c b/tools/hwsim.c index ab05d836..a4031cfb 100644 --- a/tools/hwsim.c +++ b/tools/hwsim.c @@ -39,7 +39,7 @@ #include "src/storage.h" #include "src/mpdu.h" -#define HWSIM_SERVICE "net.connman.iwd.hwsim" +#define HWSIM_SERVICE "net.connman.hwsim" #define HWSIM_RADIO_MANAGER_INTERFACE HWSIM_SERVICE ".RadioManager" #define HWSIM_RADIO_INTERFACE HWSIM_SERVICE ".Radio" @@ -2123,7 +2123,7 @@ static void request_name_callback(struct l_dbus *dbus, bool success, static void ready_callback(void *user_data) { - l_dbus_name_acquire(dbus, "net.connman.iwd.hwsim", false, false, true, + l_dbus_name_acquire(dbus, HWSIM_SERVICE, false, false, true, request_name_callback, NULL); if (!l_dbus_object_manager_enable(dbus))