batctl: add sys framework for VLAN support
PATCH v8 1/1 batctl: add sys framework for VLAN support
Allow the batctl tool to take advantage of changes from commit e4ff5c153dab054a6cd1c4132f87bc5e77127456 "add sys framework for VLAN" recently added to batman-adv, so that users can execute commands in a per VLAN fashion.
If no directory entry corresponding to the user-selected device is found at the standard location for non VLAN interfaces (/sys/class/net/${device}/mesh/), 'batctl' now looks into directory:
/sys/devices/virtual/net/${base_device}/mesh/vlan${vid}
Information on VLAN devices (base device, vid) necessary to construct the
directory path is acquired by parsing /proc/net/vlan/${device}.
Where:
-${base_device}: the batman device on top of which the VLAN is sitting
-${device}: the device interface for the VLAN,
-${vid}: the identifier assigned to the VLAN.If the user-selected command is not supported by the VLAN, an appropriate error is shown.
---
Notable changes in V8
-changed displayed error when the default or specified interface is not present
from "could not open file '%s': no such file or directory" to "'${device}' is not a valid batman interface"
Notable changes in V7
-fixed missing variable initialization
-changed free & malloc to realloc
-fixed various styling issues
-removed unrelated changes
Notable changes in V6
-fixed error in string length computation
-moved some more variable declarations at the beginning of functions
Notable changes in V5
-fixed use of sizeof instead of strlen to compute length of string -use of getline instead of fgets
-avoid using fixed-size buffer in 'get_basedev_vid'
-moved constant string declarations, local to functions 'get_basedev_vid'
and 'handle_sys_setting', from sys.c to sys.h. Now uses #define like other path declarations.
-fixed scanf error condition check
-fixed malloc error condition check
-moved variable declarations at the beginning of functions
functions.c | 3 +++ main.c | 2 +- man/batctl.8 | 4 ++-- sys.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sys.h | 3 +++ 5 files changed, 83 insertions(+), 3 deletions(-)
functions.c +3 -0
@@ -135,6 +135,9 @@ static void file_open_problem_dbg(char *dir, char *fname, char *full_path)fprintf (stderr,"Error - the folder '/sys/' was not found on the system\n" );fprintf (stderr,"Please make sure that the sys filesystem is properly mounted\n" );return ; + }else if (strstr (dir,"/sys/devices/virtual/" )) { +fprintf (stderr,"The selected feature '%s' is not supported for vlans\n" , fname); +return ; } }
main.c +1 -1
@@ -49,7 +49,7 @@ void print_usage(void)fprintf (stderr,"Usage: batctl [options] command|debug table [parameters]\n" );fprintf (stderr,"options:\n" ); -fprintf (stderr," \t-m mesh interface (default 'bat0')\n" ); +fprintf (stderr," \t-m mesh interface or mesh-based VLAN interface (default 'bat0')\n" );fprintf (stderr," \t-h print this help (or 'batctl <command|debug table> -h' for the parameter help)\n" );fprintf (stderr," \t-v print version\n" );fprintf (stderr,"\n" );
man/batctl.8 +2 -2
@@ -42,7 +42,7 @@ behaviour or using the B.A.T.M.A.N. advanced protocol. .SH OPTIONS .TP .I \fBoptions: -\-m specify mesh interface (default 'bat0') +\-m specify mesh interface or a mesh-based VLAN interface (default 'bat0') .br \-h print general batctl help .br
@@ -61,7 +61,7 @@ originator interval. The interval is in units of milliseconds. .br .IP "\fBap_isolation\fP|\fBap\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current ap isolation setting is displayed. Otherwise the parameter is used to enable or -disable ap isolation. +disable ap isolation. This command can be used in conjunction with "-m" option to target per VLAN configurations. .br .IP "\fBbridge_loop_avoidance\fP|\fBbl\fP [\fB0\fP|\fB1\fP]" If no parameter is given the current bridge loop avoidance setting is displayed. Otherwise the parameter is used to enable
sys.c +74 -0
91 lines not on this page · raw message
sys.h +3 -0
@@ -30,6 +30,9 @@#define SYS_IFACE_DIR SYS_IFACE_PATH"/%s/"#define SYS_MESH_IFACE_FMT SYS_IFACE_PATH"/%s/batman_adv/mesh_iface"#define SYS_IFACE_STATUS_FMT SYS_IFACE_PATH"/%s/batman_adv/iface_status" +#define PROC_VLAN_PATH "/proc/net/vlan/" +#define SYS_VLAN_PATH "/sys/devices/virtual/net/%s/mesh/vlan%d/" +#define VLAN_ID_MAX_LEN 4enum batctl_settings_list {BATCTL_SETTINGS_ORIG_INTERVAL ,
Signature · 1 line
1.8.3.2