diff --git a/lib/neighbours.py b/lib/neighbours.py index 639d8ed3482cf3be7ae02fabecb880c12a612b7e..f037adf330e1f610e88023d74ff0e3a5854270f1 100644 --- a/lib/neighbours.py +++ b/lib/neighbours.py @@ -33,7 +33,7 @@ class Neighbours(Respondd): def getMeshInterfaces(batmanInterface): ret = {} - lines = lib.helper.call(['batctl', '-m', batmanInterface, 'if']) + lines = lib.helper.call(['batctl', 'meshif', batmanInterface, 'if']) for line in lines: lineMatch = re.match(r'^([^:]*)', line) interface = lineMatch.group(1) @@ -52,7 +52,7 @@ class Neighbours(Respondd): meshInterfaces = self.getMeshInterfaces(self._config['batman']) - lines = lib.helper.call(['batctl', '-m', self._config['batman'], 'o', '-n']) + lines = lib.helper.call(['batctl', 'meshif', self._config['batman'], 'o', '-n']) for line in lines: # * e2:ad:db:b7:66:63 2.712s (175) be:b7:25:4f:8f:96 [mesh-vpn-l2tp-1] lineMatch = re.match(r'^[ \*\t]*([0-9a-f:]+)[ ]*([\d\.]*)s[ ]*\(([ ]*\d*)\)[ ]*([0-9a-f:]+)[ ]*\[[ ]*(.*)\]', line, re.I) diff --git a/lib/nodeinfo.py b/lib/nodeinfo.py index f4bdedfad5598a6c2e010afda8db25a3622af133..6267b7f2432506710e1530b67facfc3ff6e8f366 100644 --- a/lib/nodeinfo.py +++ b/lib/nodeinfo.py @@ -30,7 +30,7 @@ class Nodeinfo(Respondd): def getBatmanInterfaces(self, batmanInterface): ret = {} - lines = lib.helper.call(['batctl', '-m', batmanInterface, 'if']) + lines = lib.helper.call(['batctl', 'meshif', batmanInterface, 'if']) for line in lines: lineMatch = re.match(r'^([^:]*)', line) interface = lineMatch.group(0) @@ -77,7 +77,7 @@ class Nodeinfo(Respondd): @staticmethod def getVPNFlag(batmanInterface): - lines = lib.helper.call(['batctl', '-m', batmanInterface, 'gw_mode']) + lines = lib.helper.call(['batctl', 'meshif', batmanInterface, 'gw_mode']) if re.match(r'^server', lines[0]): return True else: diff --git a/lib/respondd_client.py b/lib/respondd_client.py index 13e5c910b4454acb7c76976552cd9c317bfe30cb..44c9d92c436904fc28f86e44b44bc203cbcf7787 100644 --- a/lib/respondd_client.py +++ b/lib/respondd_client.py @@ -42,7 +42,7 @@ class ResponddClient: self._sock.setsockopt(socket.SOL_SOCKET,socket.SO_BINDTODEVICE,bytes(self._config['bridge'].encode())) self._sock.bind(('::', self._config['port'])) - lines = lib.helper.call(['batctl', '-m', self._config['batman'], 'if']) + lines = lib.helper.call(['batctl', 'meshif', self._config['batman'], 'if']) for line in lines: lineMatch = re.match(r'^([^:]*)', line) self.joinMCAST(self._sock, self._config['addr'], lineMatch.group(1)) diff --git a/lib/statistics.py b/lib/statistics.py index db2e14d57b1234c3beeb3b7c38c3790c3d3539c8..714dd34cdadc42cf044f455b3da73028ace81a06 100644 --- a/lib/statistics.py +++ b/lib/statistics.py @@ -19,7 +19,7 @@ class Statistics(Respondd): macBridge = lib.helper.getInterfaceMAC(self._config['bridge']) - lines = lib.helper.call(['batctl', '-m', self._config['batman'], 'tl', '-n']) + lines = lib.helper.call(['batctl', 'meshif', self._config['batman'], 'tl', '-n']) for line in lines: # batman-adv -> translation-table.c -> batadv_tt_local_seq_print_text # R = BATADV_TT_CLIENT_ROAM @@ -139,7 +139,7 @@ class Statistics(Respondd): def getGateway(self): ret = None - lines = lib.helper.call(['batctl', '-m', self._config['batman'], 'gwl', '-n']) + lines = lib.helper.call(['batctl', 'meshif', self._config['batman'], 'gwl', '-n']) for line in lines: lineMatch = re.match(r'(\*|=>)\s+([0-9a-f:]+)\s\([\d \.]+\)\s+([0-9a-f:]+)', line) if lineMatch: