nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-mesh-batman-adv: add "routes" to respondd neighbours

Browse Source 
This commit adds counters about the number of imported and selected
routes for each neighbour. The following stanza

    "routes": {
        "imported": 171,
        "selected": 120
    },

means, that 171 routes have been learned from this neighbour, but only 120
of them are selected. (For the other 51 routes, the node prefers other
neighbours that also provide routes to the same destination).

These fields are added to the gluon to identify route flaps. This should
make it easier to troubleshoot connectivity problems that only occur when
the route swaps to a weak link.

After the new field "routes" is added, the neighbours response looks like
this:

    {
      "wifi": [
      ],
      "batadv": {
        "72:4c:e2:db:6f:37": {
          "neighbours": {
            "88:e6:40:20:90:10": {
              "routes": {
                "imported": 171,
                "selected": 171
              },
              "best": true,
              "lastseen": 0.95599999999999996,
              "tq": 247
            }
          }
        }
      },
      "node_id": "525400123457"
    }
This commit is contained in:
lemoer 2022-08-07 01:28:13 +02:00
parent 0acbbaa3cd
commit 589818b369
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
package/gluon-mesh-batman-adv/src/respondd-neighbours.c
View File

@ -74,6 +74,18 @@ static const enum batadv_nl_attrs parse_orig_list_mandatory[] = {
BATADV_ATTR_LAST_SEEN_MSECS,
};
void increment_json_int_by_key(struct json_object *obj, const char *key) {
struct json_object *old_obj;
int new_val;
json_object_object_get_ex(obj, key, &old_obj);
new_val = json_object_get_int(old_obj)+1;
json_object_object_del(obj, key);
json_object_object_add(obj, key, json_object_new_int(new_val));
}
static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
{
struct nlattr *attrs[BATADV_ATTR_MAX+1];
@ -114,19 +126,12 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
hardif = nla_get_u32(attrs[BATADV_ATTR_HARD_IFINDEX]);
lastseen = nla_get_u32(attrs[BATADV_ATTR_LAST_SEEN_MSECS]);
if (memcmp(orig, dest, 6) != 0)
return NL_OK;
ifname = if_indextoname(hardif, ifname_buf);
if (!ifname)
return NL_OK;
sprintf(mac1, "%02x:%02x:%02x:%02x:%02x:%02x",
orig[0], orig[1], orig[2], orig[3], orig[4], orig[5]);
struct json_object *obj = json_object_new_object();
if (!obj)
return NL_OK;
dest[0], dest[1], dest[2], dest[3], dest[4], dest[5]);
struct json_object *interface;
if (!json_object_object_get_ex(opts->interfaces, ifname, &interface)) {
@ -134,10 +139,34 @@ static int parse_orig_list_netlink_cb(struct nl_msg *msg, void *arg)
json_object_object_add(opts->interfaces, ifname, interface);
}
struct json_object *obj;
struct json_object *routes;
if (!json_object_object_get_ex(interface, mac1, &obj)) {
obj = json_object_new_object();
json_object_object_add(interface, mac1, obj);
routes = json_object_new_object();
json_object_object_add(routes, "imported", json_object_new_int(0));
json_object_object_add(routes, "selected", json_object_new_int(0));
json_object_object_add(obj, "routes", routes);
}
if (!routes) {
json_object_object_get_ex(obj, "routes", &routes);
}
if (!!attrs[BATADV_ATTR_FLAG_BEST]) {
increment_json_int_by_key(routes, "selected");
}
increment_json_int_by_key(routes, "imported");
if (memcmp(orig, dest, 6) != 0) {
return NL_OK;
}
json_object_object_add(obj, "tq", json_object_new_int(tq));
json_object_object_add(obj, "lastseen", json_object_new_double(lastseen / 1000.));
json_object_object_add(obj, "best", json_object_new_boolean(!!attrs[BATADV_ATTR_FLAG_BEST]));
json_object_object_add(interface, mac1, obj);
return NL_OK;
}