summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-05-22 16:24:58 +0200
committerLubomir Rintel <lkundrak@v3.sk>2018-06-26 16:21:55 +0200
commit56a6c53de04ba5567bbede792be840c9e3847c9b (patch)
treeb36d88afeb80b53b8d89ebeaed807f855d51384e
parent7c1f3650a14cd565533475515e0e3ed1c26c8fce (diff)
downloadNetworkManager-56a6c53de04ba5567bbede792be840c9e3847c9b.tar.gz
introspection: add o.fd.NM.Device.Lowpan interface
It's for 6LoWPAN devices. "o.fd.NM.Device.6Lowpan" wouldn't be a valid interface name -- just skip the leading numeral, that's what kernel also does on similiar occassions.
-rw-r--r--Makefile.am6
-rw-r--r--introspection/meson.build1
-rw-r--r--introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml24
-rw-r--r--libnm-core/nm-dbus-interface.h1
4 files changed, 31 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 1f25c8387e..52d8da8761 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -204,6 +204,8 @@ introspection_sources = \
introspection/org.freedesktop.NetworkManager.Device.Infiniband.h \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.c \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.h \
+ introspection/org.freedesktop.NetworkManager.Device.Lowpan.c \
+ introspection/org.freedesktop.NetworkManager.Device.Lowpan.h \
introspection/org.freedesktop.NetworkManager.Device.Macsec.c \
introspection/org.freedesktop.NetworkManager.Device.Macsec.h \
introspection/org.freedesktop.NetworkManager.Device.Macvlan.c \
@@ -310,7 +312,8 @@ DBUS_INTERFACE_DOCS = \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Wired.xml \
docs/api/dbus-org.freedesktop.NetworkManager.IP4Config.xml \
docs/api/dbus-org.freedesktop.NetworkManager.Device.Statistics.xml \
- docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml
+ docs/api/dbus-org.freedesktop.NetworkManager.DnsManager.xml \
+ docs/api/dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml
introspection/%.c: introspection/%.xml
@$(MKDIR_P) introspection/
@@ -343,6 +346,7 @@ dbusinterfaces_DATA = \
introspection/org.freedesktop.NetworkManager.Device.Generic.xml \
introspection/org.freedesktop.NetworkManager.Device.Infiniband.xml \
introspection/org.freedesktop.NetworkManager.Device.IPTunnel.xml \
+ introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml \
introspection/org.freedesktop.NetworkManager.Device.Macsec.xml \
introspection/org.freedesktop.NetworkManager.Device.Macvlan.xml \
introspection/org.freedesktop.NetworkManager.Device.Modem.xml \
diff --git a/introspection/meson.build b/introspection/meson.build
index a84bba7915..57d6a196c1 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -15,6 +15,7 @@ ifaces = [
'org.freedesktop.NetworkManager.Device.Generic',
'org.freedesktop.NetworkManager.Device.Infiniband',
'org.freedesktop.NetworkManager.Device.IPTunnel',
+ 'org.freedesktop.NetworkManager.Device.Lowpan',
'org.freedesktop.NetworkManager.Device.Macsec',
'org.freedesktop.NetworkManager.Device.Macvlan',
'org.freedesktop.NetworkManager.Device.Modem',
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
new file mode 100644
index 0000000000..c0317be6c3
--- /dev/null
+++ b/introspection/org.freedesktop.NetworkManager.Device.Lowpan.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/">
+ <!--
+ org.freedesktop.NetworkManager.Device.Lowpan:
+ @short_description: 6LoWPAN Device
+
+ -->
+ <interface name="org.freedesktop.NetworkManager.Device.Lowpan">
+
+ <!--
+ HwAddress:
+
+ The active hardware address of the device.
+ -->
+ <property name="HwAddress" type="s" access="read"/>
+
+ <!--
+ Parent:
+
+ The object path of the parent device.
+ -->
+ <property name="Parent" type="o" access="read"/>
+ </interface>
+</node>
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h
index 1e98a89ee9..ae78755eb6 100644
--- a/libnm-core/nm-dbus-interface.h
+++ b/libnm-core/nm-dbus-interface.h
@@ -76,6 +76,7 @@
#define NM_DBUS_INTERFACE_DEVICE_GRE NM_DBUS_INTERFACE_DEVICE ".Gre"
#define NM_DBUS_INTERFACE_DEVICE_IP_TUNNEL NM_DBUS_INTERFACE_DEVICE ".IPTunnel"
#define NM_DBUS_INTERFACE_DEVICE_WPAN NM_DBUS_INTERFACE_DEVICE ".Wpan"
+#define NM_DBUS_INTERFACE_DEVICE_6LOWPAN NM_DBUS_INTERFACE_DEVICE ".Lowpan"
#define NM_DBUS_INTERFACE_DEVICE_STATISTICS NM_DBUS_INTERFACE_DEVICE ".Statistics"
#define NM_DBUS_INTERFACE_CHECKPOINT NM_DBUS_INTERFACE ".Checkpoint"