Repository : ssh://git@diktynna/batctl On branches: main,main

commit 048e007e636b3caa6bbcfd3a424aabad92555f21 Author: Sven Eckelmann sven@narfation.org Date: Sun Feb 2 13:39:32 2025 +0100

batctl: Use consistent name for mesh interface

The way how the virtual interface is called inside the batman-adv source code is not consistent. The genl headers call it meshif and the rest of the code calls is (mostly) softif.

The genl definitions cannot be touched because they are part of the UAPI. But the rest of the batman-adv code can be touched to have a consistent name again.

The bulk of the renaming was done using

sed -i -e 's/soft(-|_| |)i([nf])/mesh\1i\2/g' \ -e 's/SOFT(-|_| |)I([NF])/MESH\1I\2/g'

and then it was adjusted slightly when proofreading the changes.

Signed-off-by: Sven Eckelmann sven@narfation.org

048e007e636b3caa6bbcfd3a424aabad92555f21 README.rst | 2 +- batman_adv.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst index 3495fba..61e1020 100644 --- a/README.rst +++ b/README.rst @@ -451,7 +451,7 @@ R/Roaming: this client moved to another node but it is still kept for consistency reasons until the next OGM is sent. P/noPurge: - this client represents the local soft interface and will never be deleted. + this client represents the local mesh interface and will never be deleted. N/New: this client has recently been added but is not advertised in the mesh until the next OGM is sent (for consistency reasons). diff --git a/batman_adv.h b/batman_adv.h index 35dc016..936bcac 100644 --- a/batman_adv.h +++ b/batman_adv.h @@ -342,7 +342,7 @@ enum batadv_nl_attrs { BATADV_ATTR_MCAST_FLAGS_PRIV,

/** - * @BATADV_ATTR_VLANID: VLAN id on top of soft interface + * @BATADV_ATTR_VLANID: VLAN id on top of mesh interface */ BATADV_ATTR_VLANID,

@@ -380,7 +380,7 @@ enum batadv_nl_attrs { /** * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop * avoidance feature is enabled. This feature detects and avoids loops - * between the mesh and devices bridged with the soft interface + * between the mesh and devices bridged with the mesh interface */ BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,

@@ -509,7 +509,7 @@ enum batadv_nl_commands { BATADV_CMD_UNSPEC,

/** - * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh + * @BATADV_CMD_GET_MESH: Get attributes from mesh(if) */ BATADV_CMD_GET_MESH,

@@ -535,7 +535,7 @@ enum batadv_nl_commands {

/** * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the - * current softif + * current mesh(if) */ BATADV_CMD_GET_HARDIF,

@@ -591,25 +591,25 @@ enum batadv_nl_commands { BATADV_CMD_GET_MCAST_FLAGS,

/** - * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh + * @BATADV_CMD_SET_MESH: Set attributes for mesh(if) */ BATADV_CMD_SET_MESH,

/** * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the - * current softif + * current mesh(if) */ BATADV_CMD_SET_HARDIF,

/** * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the - * current softif + * current mesh(if) */ BATADV_CMD_GET_VLAN,

/** * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the - * current softif + * current mesh(if) */ BATADV_CMD_SET_VLAN,

@@ -691,7 +691,7 @@ enum batadv_ifla_attrs { */ IFLA_BATADV_ALGO_NAME,

- /* add attributes above here, update the policy in soft-interface.c */ + /* add attributes above here, update the policy in mesh-interface.c */

/** * @__IFLA_BATADV_MAX: internal use