Hi,
here is the third version of the throughput meter support. It is just a rebased version of the patchset with two little bugfixes. Both problems were detected and reported by Antonio:
* batctl didn't check if the test_time is > 0 before doing a division * batman-adv wasn't returning an error to batctl when dst was not reachable
I am currently unsure how we should proceed regarding the ICMP packet type used to communicate to the userspace ([PATCH 2/3]). Andrew+Matthias already prepared a netlink patchset which looks quite good and which should be tested+applied. The consequence for this patchset would be that patch 2 should be completely dropped and instead the tp_meter should become its own command in the netlink interface of batman-adv. Any opinions about that (order in which patches should be applied/netlink interface should be handled) by the Simon, Antonio, Marek, Matthias or Andrew?
Antonio Quartulli (4): batman-adv: return netdev status in the TX path batman-adv: use another ICMP packet when sending command from userspace batman-adv: throughput meter implementation batctl: introduce throughput meter support
net/batman-adv/Makefile | 1 + net/batman-adv/fragmentation.c | 41 +- net/batman-adv/fragmentation.h | 6 +- net/batman-adv/icmp_socket.c | 225 +++--- net/batman-adv/icmp_socket.h | 5 +- net/batman-adv/main.c | 6 +- net/batman-adv/main.h | 24 +- net/batman-adv/packet.h | 120 ++++ net/batman-adv/routing.c | 33 +- net/batman-adv/send.c | 25 +- net/batman-adv/soft-interface.c | 2 + net/batman-adv/tp_meter.c | 1453 +++++++++++++++++++++++++++++++++++++++ net/batman-adv/tp_meter.h | 34 + net/batman-adv/types.h | 113 +++ 14 files changed, 1944 insertions(+), 144 deletions(-)
Makefile | 2 +- main.c | 6 ++ main.h | 1 + man/batctl.8 | 24 +++++- packet.h | 120 ++++++++++++++++++++++++++++++ tcpdump.c | 14 +++- tp_meter.c | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tp_meter.h | 22 ++++++ 8 files changed, 421 insertions(+), 4 deletions(-)
Kind regards, Sven