diff options
author | Inga Stotland <johan.hedberg@gmail.com> | 2018-06-21 23:32:00 -0700 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2018-07-06 13:03:33 +0200 |
commit | ef05f4957dce261ca4aa4def2d360015f8be6eed (patch) | |
tree | 9b50f62c2cfe1f61e359641e459772e800493a5a | |
parent | f0d0c48e82e485d79393bcd30091cfdc5ee201e7 (diff) | |
download | bluez-ef05f4957dce261ca4aa4def2d360015f8be6eed.tar.gz |
tools: Move meshctl sources under tools/mesh directory
This is a temporary location until the unified mesh solution is provided
-rw-r--r-- | Makefile.tools | 28 | ||||
-rw-r--r-- | tools/mesh/README (renamed from mesh/README) | 0 | ||||
-rw-r--r-- | tools/mesh/agent.c (renamed from mesh/agent.c) | 4 | ||||
-rw-r--r-- | tools/mesh/agent.h (renamed from mesh/agent.h) | 0 | ||||
-rw-r--r-- | tools/mesh/config-client.c (renamed from mesh/config-client.c) | 14 | ||||
-rw-r--r-- | tools/mesh/config-model.h (renamed from mesh/config-model.h) | 0 | ||||
-rw-r--r-- | tools/mesh/config-server.c (renamed from mesh/config-server.c) | 14 | ||||
-rw-r--r-- | tools/mesh/crypto.c (renamed from mesh/crypto.c) | 4 | ||||
-rw-r--r-- | tools/mesh/crypto.h (renamed from mesh/crypto.h) | 0 | ||||
-rw-r--r-- | tools/mesh/gatt.c (renamed from mesh/gatt.c) | 10 | ||||
-rw-r--r-- | tools/mesh/gatt.h (renamed from mesh/gatt.h) | 0 | ||||
-rw-r--r-- | tools/mesh/keys.h (renamed from mesh/keys.h) | 0 | ||||
-rw-r--r-- | tools/mesh/local_node.json (renamed from mesh/local_node.json) | 0 | ||||
-rw-r--r-- | tools/mesh/mesh-net.h (renamed from mesh/mesh-net.h) | 0 | ||||
-rw-r--r-- | tools/mesh/net.c (renamed from mesh/net.c) | 16 | ||||
-rw-r--r-- | tools/mesh/net.h (renamed from mesh/net.h) | 0 | ||||
-rw-r--r-- | tools/mesh/node.c (renamed from mesh/node.c) | 16 | ||||
-rw-r--r-- | tools/mesh/node.h (renamed from mesh/node.h) | 0 | ||||
-rw-r--r-- | tools/mesh/onoff-model.c (renamed from mesh/onoff-model.c) | 14 | ||||
-rw-r--r-- | tools/mesh/onoff-model.h (renamed from mesh/onoff-model.h) | 0 | ||||
-rw-r--r-- | tools/mesh/prov-db.c (renamed from mesh/prov-db.c) | 14 | ||||
-rw-r--r-- | tools/mesh/prov-db.h (renamed from mesh/prov-db.h) | 0 | ||||
-rw-r--r-- | tools/mesh/prov.c (renamed from mesh/prov.c) | 16 | ||||
-rw-r--r-- | tools/mesh/prov.h (renamed from mesh/prov.h) | 0 | ||||
-rw-r--r-- | tools/mesh/prov_db.json (renamed from mesh/prov_db.json) | 0 | ||||
-rw-r--r-- | tools/mesh/util.c (renamed from mesh/util.c) | 6 | ||||
-rw-r--r-- | tools/mesh/util.h (renamed from mesh/util.h) | 0 |
27 files changed, 78 insertions, 78 deletions
diff --git a/Makefile.tools b/Makefile.tools index 42c1f2735..f81fd0a4c 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -296,25 +296,25 @@ if MESH bin_PROGRAMS += tools/meshctl tools_meshctl_SOURCES = tools/meshctl.c \ - mesh/mesh-net.h \ - mesh/node.h mesh/node.c \ - mesh/gatt.h mesh/gatt.c \ - mesh/crypto.h mesh/crypto.c \ - mesh/keys.h \ - mesh/net.h mesh/net.c \ - mesh/prov.h mesh/prov.c \ - mesh/util.h mesh/util.c \ - mesh/agent.h mesh/agent.c \ - mesh/prov-db.h mesh/prov-db.c \ - mesh/config-model.h mesh/config-client.c \ - mesh/config-server.c \ - mesh/onoff-model.h mesh/onoff-model.c + tools/mesh/mesh-net.h \ + tools/mesh/node.h tools/mesh/node.c \ + tools/mesh/gatt.h tools/mesh/gatt.c \ + tools/mesh/crypto.h tools/mesh/crypto.c \ + tools/mesh/keys.h \ + tools/mesh/net.h tools/mesh/net.c \ + tools/mesh/prov.h tools/mesh/prov.c \ + tools/mesh/util.h tools/mesh/util.c \ + tools/mesh/agent.h tools/mesh/agent.c \ + tools/mesh/prov-db.h tools/mesh/prov-db.c \ + tools/mesh/config-model.h tools/mesh/config-client.c \ + tools/mesh/config-server.c \ + tools/mesh/onoff-model.h tools/mesh/onoff-model.c tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \ lib/libbluetooth-internal.la \ @GLIB_LIBS@ @DBUS_LIBS@ -ljson-c -lreadline endif -EXTRA_DIST += mesh/local_node.json mesh/prov_db.json +EXTRA_DIST += tools/mesh/local_node.json tools/mesh/prov_db.json if DEPRECATED bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \ diff --git a/mesh/README b/tools/mesh/README index ea561efc8..ea561efc8 100644 --- a/mesh/README +++ b/tools/mesh/README diff --git a/mesh/agent.c b/tools/mesh/agent.c index b8a14f015..08e498541 100644 --- a/mesh/agent.c +++ b/tools/mesh/agent.c @@ -35,8 +35,8 @@ #include <lib/bluetooth.h> #include "src/shared/shell.h" -#include "mesh/util.h" -#include "mesh/agent.h" +#include "tools/mesh/util.h" +#include "tools/mesh/agent.h" struct input_request { oob_type_t type; diff --git a/mesh/agent.h b/tools/mesh/agent.h index 9db4321fc..9db4321fc 100644 --- a/mesh/agent.h +++ b/tools/mesh/agent.h diff --git a/mesh/config-client.c b/tools/mesh/config-client.c index b6b02ef93..df2643622 100644 --- a/mesh/config-client.c +++ b/tools/mesh/config-client.c @@ -39,13 +39,13 @@ #include "src/shared/shell.h" #include "src/shared/util.h" -#include "mesh/mesh-net.h" -#include "mesh/keys.h" -#include "mesh/net.h" -#include "mesh/node.h" -#include "mesh/prov-db.h" -#include "mesh/util.h" -#include "mesh/config-model.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/keys.h" +#include "tools/mesh/net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/prov-db.h" +#include "tools/mesh/util.h" +#include "tools/mesh/config-model.h" #define MIN_COMPOSITION_LEN 16 diff --git a/mesh/config-model.h b/tools/mesh/config-model.h index a5b811365..a5b811365 100644 --- a/mesh/config-model.h +++ b/tools/mesh/config-model.h diff --git a/mesh/config-server.c b/tools/mesh/config-server.c index 2d6576375..55035bacf 100644 --- a/mesh/config-server.c +++ b/tools/mesh/config-server.c @@ -39,13 +39,13 @@ #include "src/shared/util.h" #include "src/shared/shell.h" -#include "mesh/mesh-net.h" -#include "mesh/keys.h" -#include "mesh/net.h" -#include "mesh/node.h" -#include "mesh/prov-db.h" -#include "mesh/util.h" -#include "mesh/config-model.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/keys.h" +#include "tools/mesh/net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/prov-db.h" +#include "tools/mesh/util.h" +#include "tools/mesh/config-model.h" static bool server_msg_recvd(uint16_t src, uint8_t *data, uint16_t len, void *user_data) diff --git a/mesh/crypto.c b/tools/mesh/crypto.c index efb9df8ac..9935612cf 100644 --- a/mesh/crypto.c +++ b/tools/mesh/crypto.c @@ -43,8 +43,8 @@ #endif #include "src/shared/util.h" -#include "mesh/mesh-net.h" -#include "mesh/crypto.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/crypto.h" static int alg_new(int fd, const void *keyval, socklen_t keylen, size_t mic_size) diff --git a/mesh/crypto.h b/tools/mesh/crypto.h index e8f16f35d..e8f16f35d 100644 --- a/mesh/crypto.h +++ b/tools/mesh/crypto.h diff --git a/mesh/gatt.c b/tools/mesh/gatt.c index 693577a3a..2c29c09b5 100644 --- a/mesh/gatt.c +++ b/tools/mesh/gatt.c @@ -40,11 +40,11 @@ #include "gdbus/gdbus.h" #include "lib/bluetooth.h" #include "lib/uuid.h" -#include "mesh/node.h" -#include "mesh/util.h" -#include "mesh/gatt.h" -#include "mesh/prov.h" -#include "mesh/net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/util.h" +#include "tools/mesh/gatt.h" +#include "tools/mesh/prov.h" +#include "tools/mesh/net.h" #define MESH_PROV_DATA_OUT_UUID_STR "00002adc-0000-1000-8000-00805f9b34fb" #define MESH_PROXY_DATA_OUT_UUID_STR "00002ade-0000-1000-8000-00805f9b34fb" diff --git a/mesh/gatt.h b/tools/mesh/gatt.h index 2878587b1..2878587b1 100644 --- a/mesh/gatt.h +++ b/tools/mesh/gatt.h diff --git a/mesh/keys.h b/tools/mesh/keys.h index 477ff1309..477ff1309 100644 --- a/mesh/keys.h +++ b/tools/mesh/keys.h diff --git a/mesh/local_node.json b/tools/mesh/local_node.json index 5ffa7ada1..5ffa7ada1 100644 --- a/mesh/local_node.json +++ b/tools/mesh/local_node.json diff --git a/mesh/mesh-net.h b/tools/mesh/mesh-net.h index 76a98224c..76a98224c 100644 --- a/mesh/mesh-net.h +++ b/tools/mesh/mesh-net.h diff --git a/mesh/net.c b/tools/mesh/net.c index 20dfcb8a8..d1b3f79dd 100644 --- a/mesh/net.c +++ b/tools/mesh/net.c @@ -35,14 +35,14 @@ #include "src/shared/util.h" #include "src/shared/shell.h" -#include "mesh/crypto.h" -#include "mesh/gatt.h" -#include "mesh/mesh-net.h" -#include "mesh/util.h" -#include "mesh/keys.h" -#include "mesh/node.h" -#include "mesh/prov-db.h" -#include "mesh/net.h" +#include "tools/mesh/crypto.h" +#include "tools/mesh/gatt.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/util.h" +#include "tools/mesh/keys.h" +#include "tools/mesh/node.h" +#include "tools/mesh/prov-db.h" +#include "tools/mesh/net.h" struct address_range { diff --git a/mesh/net.h b/tools/mesh/net.h index b388d616c..b388d616c 100644 --- a/mesh/net.h +++ b/tools/mesh/net.h diff --git a/mesh/node.c b/tools/mesh/node.c index 9ff741962..d23315ce4 100644 --- a/mesh/node.c +++ b/tools/mesh/node.c @@ -39,14 +39,14 @@ #include "src/shared/util.h" #include "src/shared/shell.h" #include "gdbus/gdbus.h" -#include "mesh/mesh-net.h" -#include "mesh/config-model.h" -#include "mesh/node.h" -#include "mesh/keys.h" -#include "mesh/gatt.h" -#include "mesh/net.h" -#include "mesh/prov-db.h" -#include "mesh/util.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/config-model.h" +#include "tools/mesh/node.h" +#include "tools/mesh/keys.h" +#include "tools/mesh/gatt.h" +#include "tools/mesh/net.h" +#include "tools/mesh/prov-db.h" +#include "tools/mesh/util.h" struct mesh_model { struct mesh_model_ops cbs; diff --git a/mesh/node.h b/tools/mesh/node.h index a5b5c7520..a5b5c7520 100644 --- a/mesh/node.h +++ b/tools/mesh/node.h diff --git a/mesh/onoff-model.c b/tools/mesh/onoff-model.c index 49be089aa..b52afe2c8 100644 --- a/mesh/onoff-model.c +++ b/tools/mesh/onoff-model.c @@ -40,13 +40,13 @@ #include "src/shared/shell.h" #include "src/shared/util.h" -#include "mesh/mesh-net.h" -#include "mesh/keys.h" -#include "mesh/net.h" -#include "mesh/node.h" -#include "mesh/prov-db.h" -#include "mesh/util.h" -#include "mesh/onoff-model.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/keys.h" +#include "tools/mesh/net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/prov-db.h" +#include "tools/mesh/util.h" +#include "tools/mesh/onoff-model.h" static uint8_t trans_id; static uint16_t onoff_app_idx = APP_IDX_INVALID; diff --git a/mesh/onoff-model.h b/tools/mesh/onoff-model.h index 31599056d..31599056d 100644 --- a/mesh/onoff-model.h +++ b/tools/mesh/onoff-model.h diff --git a/mesh/prov-db.c b/tools/mesh/prov-db.c index 019b4e173..05b2547fd 100644 --- a/mesh/prov-db.c +++ b/tools/mesh/prov-db.c @@ -42,13 +42,13 @@ #include "src/shared/util.h" #include "src/shared/shell.h" -#include "mesh/mesh-net.h" -#include "mesh/crypto.h" -#include "mesh/keys.h" -#include "mesh/net.h" -#include "mesh/node.h" -#include "mesh/util.h" -#include "mesh/prov-db.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/crypto.h" +#include "tools/mesh/keys.h" +#include "tools/mesh/net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/util.h" +#include "tools/mesh/prov-db.h" #define CHECK_KEY_IDX_RANGE(x) (((x) >= 0) && ((x) <= 4095)) diff --git a/mesh/prov-db.h b/tools/mesh/prov-db.h index b8584a8c3..b8584a8c3 100644 --- a/mesh/prov-db.h +++ b/tools/mesh/prov-db.h diff --git a/mesh/prov.c b/tools/mesh/prov.c index d1b855552..acbc5a1c8 100644 --- a/mesh/prov.c +++ b/tools/mesh/prov.c @@ -41,14 +41,14 @@ #include "src/shared/shell.h" #include "gdbus/gdbus.h" -#include "mesh/node.h" -#include "mesh/gatt.h" -#include "mesh/crypto.h" -#include "mesh/mesh-net.h" -#include "mesh/util.h" -#include "mesh/agent.h" -#include "mesh/prov.h" -#include "mesh/net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/gatt.h" +#include "tools/mesh/crypto.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/util.h" +#include "tools/mesh/agent.h" +#include "tools/mesh/prov.h" +#include "tools/mesh/net.h" /* Provisioning Security Levels */ #define MESH_PROV_SEC_HIGH 2 diff --git a/mesh/prov.h b/tools/mesh/prov.h index 2587df8fb..2587df8fb 100644 --- a/mesh/prov.h +++ b/tools/mesh/prov.h diff --git a/mesh/prov_db.json b/tools/mesh/prov_db.json index 74a03128d..74a03128d 100644 --- a/mesh/prov_db.json +++ b/tools/mesh/prov_db.json diff --git a/mesh/util.c b/tools/mesh/util.c index d38d87514..47abc0b24 100644 --- a/mesh/util.c +++ b/tools/mesh/util.c @@ -33,9 +33,9 @@ #include "src/shared/shell.h" #include "src/shared/util.h" -#include "mesh/mesh-net.h" -#include "mesh/node.h" -#include "mesh/util.h" +#include "tools/mesh/mesh-net.h" +#include "tools/mesh/node.h" +#include "tools/mesh/util.h" void set_menu_prompt(const char *name, const char *id) { diff --git a/mesh/util.h b/tools/mesh/util.h index c3facfa73..c3facfa73 100644 --- a/mesh/util.h +++ b/tools/mesh/util.h |