Dump the list of bridge loop avoidance claims via the netlink socket.
Unified · Split
| @@ -91,6 +91,11 @@ enum batadv_tt_client_flags { · 90 unmodified lines | |||
| 91 | * @BATADV_ATTR_BANDWIDTH_UP: Reported uplink bandwidth | 91 | * @BATADV_ATTR_BANDWIDTH_UP: Reported uplink bandwidth |
| 92 | * @BATADV_ATTR_BANDWIDTH_DOWN: Reported downlink bandwidth | 92 | * @BATADV_ATTR_BANDWIDTH_DOWN: Reported downlink bandwidth |
| 93 | * @BATADV_ATTR_ROUTER: Gateway router MAC address | 93 | * @BATADV_ATTR_ROUTER: Gateway router MAC address |
| 94 | * @BATADV_ATTR_BLA_OWN: Flag indicating own originator | ||
| 95 | * @BATADV_ATTR_BLA_ADDRESS: Bridge loop avoidance claim MAC address | ||
| 96 | * @BATADV_ATTR_BLA_VID: BLA VLAN ID | ||
| 97 | * @BATADV_ATTR_BLA_BACKBONE: BLA gateway originator MAC address | ||
| 98 | * @BATADV_ATTR_BLA_CRC: BLA CRC | ||
| 94 | * @__BATADV_ATTR_AFTER_LAST: internal use | 99 | * @__BATADV_ATTR_AFTER_LAST: internal use |
| 95 | * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available | 100 | * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available |
| 96 | * @BATADV_ATTR_MAX: highest attribute number currently defined | 101 | * @BATADV_ATTR_MAX: highest attribute number currently defined |
| @@ -126,6 +131,11 @@ enum batadv_nl_attrs { · 29 unmodified lines | |||
| 126 | BATADV_ATTR_BANDWIDTH_UP, | 131 | BATADV_ATTR_BANDWIDTH_UP, |
| 127 | BATADV_ATTR_BANDWIDTH_DOWN, | 132 | BATADV_ATTR_BANDWIDTH_DOWN, |
| 128 | BATADV_ATTR_ROUTER, | 133 | BATADV_ATTR_ROUTER, |
| 134 | BATADV_ATTR_BLA_OWN, | ||
| 135 | BATADV_ATTR_BLA_ADDRESS, | ||
| 136 | BATADV_ATTR_BLA_VID, | ||
| 137 | BATADV_ATTR_BLA_BACKBONE, | ||
| 138 | BATADV_ATTR_BLA_CRC, | ||
| 129 | /* add attributes above here, update the policy in netlink.c */ | 139 | /* add attributes above here, update the policy in netlink.c */ |
| 130 | __BATADV_ATTR_AFTER_LAST, | 140 | __BATADV_ATTR_AFTER_LAST, |
| 131 | NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST, | 141 | NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST, |
| @@ -146,6 +156,7 @@ enum batadv_nl_attrs { · 14 unmodified lines | |||
| 146 | * @BATADV_CMD_GET_ORIGINATORS: Query list of originators | 156 | * @BATADV_CMD_GET_ORIGINATORS: Query list of originators |
| 147 | * @BATADV_CMD_GET_NEIGHBORS: Query list of neighbours | 157 | * @BATADV_CMD_GET_NEIGHBORS: Query list of neighbours |
| 148 | * @BATADV_CMD_GET_GATEWAYS: Query list of gateways | 158 | * @BATADV_CMD_GET_GATEWAYS: Query list of gateways |
| 159 | * @BATADV_CMD_GET_BLA_CLAIM: Query list of bridge loop avoidance claims | ||
| 149 | * @__BATADV_CMD_AFTER_LAST: internal use | 160 | * @__BATADV_CMD_AFTER_LAST: internal use |
| 150 | * @BATADV_CMD_MAX: highest used command number | 161 | * @BATADV_CMD_MAX: highest used command number |
| 151 | */ | 162 | */ |
| @@ -161,6 +172,7 @@ enum batadv_nl_commands { · 9 unmodified lines | |||
| 161 | BATADV_CMD_GET_ORIGINATORS, | 172 | BATADV_CMD_GET_ORIGINATORS, |
| 162 | BATADV_CMD_GET_NEIGHBORS, | 173 | BATADV_CMD_GET_NEIGHBORS, |
| 163 | BATADV_CMD_GET_GATEWAYS, | 174 | BATADV_CMD_GET_GATEWAYS, |
| 175 | BATADV_CMD_GET_BLA_CLAIM, | ||
| 164 | /* add new commands above here */ | 176 | /* add new commands above here */ |
| 165 | __BATADV_CMD_AFTER_LAST, | 177 | __BATADV_CMD_AFTER_LAST, |
| 166 | BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1 | 178 | BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1 |
| @@ -35,6 +35,7 @@ · 34 unmodified lines | |||
| 35 | #include <linux/list.h> | 35 | #include <linux/list.h> |
| 36 | #include <linux/lockdep.h> | 36 | #include <linux/lockdep.h> |
| 37 | #include <linux/netdevice.h> | 37 | #include <linux/netdevice.h> |
| 38 | #include <linux/netlink.h> | ||
| 38 | #include <linux/rculist.h> | 39 | #include <linux/rculist.h> |
| 39 | #include <linux/rcupdate.h> | 40 | #include <linux/rcupdate.h> |
| 40 | #include <linux/seq_file.h> | 41 | #include <linux/seq_file.h> |
| @@ -45,12 +46,18 @@ · 4 unmodified lines | |||
| 45 | #include <linux/string.h> | 46 | #include <linux/string.h> |
| 46 | #include <linux/workqueue.h> | 47 | #include <linux/workqueue.h> |
| 47 | #include <net/arp.h> | 48 | #include <net/arp.h> |
| 49 | #include <net/genetlink.h> | ||
| 50 | #include <net/netlink.h> | ||
| 51 | #include <net/sock.h> | ||
| 52 | #include <uapi/linux/batman_adv.h> | ||
| 48 | 53 | ||
| 49 | #include "hard-interface.h" | 54 | #include "hard-interface.h" |
| 50 | #include "hash.h" | 55 | #include "hash.h" |
| 51 | #include "log.h" | 56 | #include "log.h" |
| 57 | #include "netlink.h" | ||
| 52 | #include "originator.h" | 58 | #include "originator.h" |
| 53 | #include "packet.h" | 59 | #include "packet.h" |
| 60 | #include "soft-interface.h" | ||
| 54 | #include "sysfs.h" | 61 | #include "sysfs.h" |
| 55 | #include "translation-table.h" | 62 | #include "translation-table.h" |
| 56 | 63 | ||
| @@ -2051,6 +2058,168 @@ out: · 1994 unmodified lines | |||
| 2051 | return 0; | 2058 | return 0; |
| 2052 | } | 2059 | } |
| 2053 | 2060 | ||
| 2061 | /** | ||
| 2062 | * batadv_bla_claim_dump_entry - dump one entry of the claim table | ||
| 2063 | * to a netlink socket | ||
| 2064 | * @msg: buffer for the message | ||
| 2065 | * @portid: netlink port | ||
| 2066 | * @seq: Sequence number of netlink message | ||
| 2067 | * @primary_if: primary interface | ||
| 2068 | * @claim: entry to dump | ||
| 2069 | * | ||
| 2070 | * Return: 0 or error code. | ||
| 2071 | */ | ||
| 2072 | static int | ||
| 2073 | batadv_bla_claim_dump_entry(struct sk_buff *msg, u32 portid, u32 seq, | ||
| 2074 | struct batadv_hard_iface *primary_if, | ||
| 2075 | struct batadv_bla_claim *claim) | ||
| 2076 | { | ||
| 2077 | u8 *primary_addr = primary_if->net_dev->dev_addr; | ||
| 2078 | u16 backbone_crc; | ||
| 2079 | bool is_own; | ||
| 2080 | void *hdr; | ||
| 2081 | int ret = -EINVAL; | ||
| 2082 | |||
| 2083 | hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, | ||
| 2084 | NLM_F_MULTI, BATADV_CMD_GET_BLA_CLAIM); | ||
| 2085 | if (!hdr) { | ||
| 2086 | ret = -ENOBUFS; | ||
| 2087 | goto out; | ||
| 2088 | } | ||
| 2089 | |||
| 2090 | is_own = batadv_compare_eth(claim->backbone_gw->orig, | ||
| 2091 | primary_addr); | ||
| 2092 | |||
| 2093 | spin_lock_bh(&claim->backbone_gw->crc_lock); | ||
| 2094 | backbone_crc = claim->backbone_gw->crc; | ||
| 2095 | spin_unlock_bh(&claim->backbone_gw->crc_lock); | ||
| 2096 | |||
| 2097 | if (is_own) | ||
| 2098 | if (nla_put_flag(msg, BATADV_ATTR_BLA_OWN)) { | ||
| 2099 | genlmsg_cancel(msg, hdr); | ||
| 2100 | goto out; | ||
| 2101 | } | ||
| 2102 | |||
| 2103 | if (nla_put(msg, BATADV_ATTR_BLA_ADDRESS, ETH_ALEN, claim->addr) || | ||
| 2104 | nla_put_u16(msg, BATADV_ATTR_BLA_VID, claim->vid) || | ||
| 2105 | nla_put(msg, BATADV_ATTR_BLA_BACKBONE, ETH_ALEN, | ||
| 2106 | claim->backbone_gw->orig) || | ||
| 2107 | nla_put_u16(msg, BATADV_ATTR_BLA_CRC, | ||
| 2108 | backbone_crc)) { | ||
| 2109 | genlmsg_cancel(msg, hdr); | ||
| 2110 | goto out; | ||
| 2111 | } | ||
| 2112 | |||
| 2113 | genlmsg_end(msg, hdr); | ||
| 2114 | ret = 0; | ||
| 2115 | |||
| 2116 | out: | ||
| 2117 | return ret; | ||
| 2118 | } | ||
| 2119 | |||
| 2120 | /** | ||
| 2121 | * batadv_bla_claim_dump_bucket - dump one bucket of the claim table | ||
| 2122 | * to a netlink socket | ||
| 2123 | * @msg: buffer for the message | ||
| 2124 | * @portid: netlink port | ||
| 2125 | * @seq: Sequence number of netlink message | ||
| 2126 | * @primary_if: primary interface | ||
| 2127 | * @head: bucket to dump | ||
| 2128 | * @idx_skip: How many entries to skip | ||
| 2129 | * | ||
| 2130 | * Return: always 0. | ||
| 2131 | */ | ||
| 2132 | static int | ||
| 2133 | batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, | ||
| 2134 | struct batadv_hard_iface *primary_if, | ||
| 2135 | struct hlist_head *head, int *idx_skip) | ||
| 2136 | { | ||
| 2137 | struct batadv_bla_claim *claim; | ||
| 2138 | int idx = 0; | ||
| 2139 | |||
| 2140 | rcu_read_lock(); | ||
| 2141 | hlist_for_each_entry_rcu(claim, head, hash_entry) { | ||
| 2142 | if (idx++ < *idx_skip) | ||
| 2143 | continue; | ||
| 2144 | if (batadv_bla_claim_dump_entry(msg, portid, seq, | ||
| 2145 | primary_if, claim)) { | ||
| 2146 | *idx_skip = idx - 1; | ||
| 2147 | goto unlock; | ||
| 2148 | } | ||
| 2149 | } | ||
| 2150 | |||
| 2151 | *idx_skip = idx; | ||
| 2152 | unlock: | ||
| 2153 | rcu_read_unlock(); | ||
| 2154 | return 0; | ||
| 2155 | } | ||
| 2156 | |||
| 2157 | /** | ||
| 2158 | * batadv_bla_claim_dump - dump claim table to a netlink socket | ||
| 2159 | * @msg: buffer for the message | ||
| 2160 | * @cb: callback structure containing arguments | ||
| 2161 | * | ||
| 2162 | * Return: message length. | ||
| 2163 | */ | ||
| 2164 | int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb) | ||
| 2165 | { | ||
| 2166 | struct batadv_hard_iface *primary_if = NULL; | ||
| 2167 | int portid = NETLINK_CB(cb->skb).portid; | ||
| 2168 | struct net *net = sock_net(cb->skb->sk); | ||
| 2169 | struct net_device *soft_iface; | ||
| 2170 | struct batadv_hashtable *hash; | ||
| 2171 | struct batadv_priv *bat_priv; | ||
| 2172 | int bucket = cb->args[0]; | ||
| 2173 | struct hlist_head *head; | ||
| 2174 | int idx = cb->args[1]; | ||
| 2175 | int ifindex; | ||
| 2176 | int ret = 0; | ||
| 2177 | |||
| 2178 | ifindex = batadv_netlink_get_ifindex(cb->nlh, | ||
| 2179 | BATADV_ATTR_MESH_IFINDEX); | ||
| 2180 | if (!ifindex) | ||
| 2181 | return -EINVAL; | ||
| 2182 | |||
| 2183 | soft_iface = dev_get_by_index(net, ifindex); | ||
| 2184 | if (!soft_iface || !batadv_softif_is_valid(soft_iface)) { | ||
| 2185 | ret = -ENODEV; | ||
| 2186 | goto out; | ||
| 2187 | } | ||
| 2188 | |||
| 2189 | bat_priv = netdev_priv(soft_iface); | ||
| 2190 | hash = bat_priv->bla.claim_hash; | ||
| 2191 | |||
| 2192 | primary_if = batadv_primary_if_get_selected(bat_priv); | ||
| 2193 | if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) { | ||
| 2194 | ret = -ENOENT; | ||
| 2195 | goto out; | ||
| 2196 | } | ||
| 2197 | |||
| 2198 | while (bucket < hash->size) { | ||
| 2199 | head = &hash->table[bucket]; | ||
| 2200 | |||
| 2201 | if (batadv_bla_claim_dump_bucket(msg, portid, | ||
| 2202 | cb->nlh->nlmsg_seq, | ||
| 2203 | primary_if, head, &idx)) | ||
| 2204 | break; | ||
| 2205 | bucket++; | ||
| 2206 | } | ||
| 2207 | |||
| 2208 | cb->args[0] = bucket; | ||
| 2209 | cb->args[1] = idx; | ||
| 2210 | |||
| 2211 | ret = msg->len; | ||
| 2212 | |||
| 2213 | out: | ||
| 2214 | if (primary_if) | ||
| 2215 | batadv_hardif_put(primary_if); | ||
| 2216 | |||
| 2217 | if (soft_iface) | ||
| 2218 | dev_put(soft_iface); | ||
| 2219 | |||
| 2220 | return ret; | ||
| 2221 | } | ||
| 2222 | |||
| 2054 | /** | 2223 | /** |
| 2055 | * batadv_bla_backbone_table_seq_print_text - print the backbone table in a seq | 2224 | * batadv_bla_backbone_table_seq_print_text - print the backbone table in a seq |
| 2056 | * file | 2225 | * file |
| @@ -23,6 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 24 | 24 | ||
| 25 | struct net_device; | 25 | struct net_device; |
| 26 | struct netlink_callback; | ||
| 26 | struct seq_file; | 27 | struct seq_file; |
| 27 | struct sk_buff; | 28 | struct sk_buff; |
| 28 | 29 | ||
| @@ -35,6 +36,7 @@ bool batadv_bla_is_backbone_gw(struct sk_buff *skb, · 6 unmodified lines | |||
| 35 | struct batadv_orig_node *orig_node, | 36 | struct batadv_orig_node *orig_node, |
| 36 | int hdr_size); | 37 | int hdr_size); |
| 37 | int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); | 38 | int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); |
| 39 | int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); | ||
| 38 | int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, | 40 | int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, |
| 39 | void *offset); | 41 | void *offset); |
| 40 | bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig, | 42 | bool batadv_bla_is_backbone_gw_orig(struct batadv_priv *bat_priv, u8 *orig, |
| @@ -47,7 +49,7 @@ void batadv_bla_update_orig_address(struct batadv_priv *bat_priv, · 6 unmodified lines | |||
| 47 | void batadv_bla_status_update(struct net_device *net_dev); | 49 | void batadv_bla_status_update(struct net_device *net_dev); |
| 48 | int batadv_bla_init(struct batadv_priv *bat_priv); | 50 | int batadv_bla_init(struct batadv_priv *bat_priv); |
| 49 | void batadv_bla_free(struct batadv_priv *bat_priv); | 51 | void batadv_bla_free(struct batadv_priv *bat_priv); |
| 50 | 52 | int batadv_bla_claim_dump(struct sk_buff *msg, struct netlink_callback *cb); | |
| 51 | #define BATADV_BLA_CRC_INIT 0 | 53 | #define BATADV_BLA_CRC_INIT 0 |
| 52 | #else /* ifdef CONFIG_BATMAN_ADV_BLA */ | 54 | #else /* ifdef CONFIG_BATMAN_ADV_BLA */ |
| 53 | 55 | ||
| @@ -112,6 +114,12 @@ static inline void batadv_bla_free(struct batadv_priv *bat_priv) · 58 unmodified lines | |||
| 112 | { | 114 | { |
| 113 | } | 115 | } |
| 114 | 116 | ||
| 117 | static inline int batadv_bla_claim_dump(struct sk_buff *msg, | ||
| 118 | struct netlink_callback *cb) | ||
| 119 | { | ||
| 120 | return -EOPNOTSUPP; | ||
| 121 | } | ||
| 122 | |||
| 115 | #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ | 123 | #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ |
| 116 | 124 | ||
| 117 | #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ | 125 | #endif /* ifndef _NET_BATMAN_ADV_BLA_H_ */ |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | |||
| 38 | #include <uapi/linux/batman_adv.h> | 38 | #include <uapi/linux/batman_adv.h> |
| 39 | 39 | ||
| 40 | #include "bat_algo.h" | 40 | #include "bat_algo.h" |
| 41 | #include "bridge_loop_avoidance.h" | ||
| 41 | #include "gateway_client.h" | 42 | #include "gateway_client.h" |
| 42 | #include "hard-interface.h" | 43 | #include "hard-interface.h" |
| 43 | #include "originator.h" | 44 | #include "originator.h" |
| @@ -91,6 +92,11 @@ static struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { · 47 unmodified lines | |||
| 91 | [BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 }, | 92 | [BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 }, |
| 92 | [BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 }, | 93 | [BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 }, |
| 93 | [BATADV_ATTR_ROUTER] = { .len = ETH_ALEN }, | 94 | [BATADV_ATTR_ROUTER] = { .len = ETH_ALEN }, |
| 95 | [BATADV_ATTR_BLA_OWN] = { .type = NLA_FLAG }, | ||
| 96 | [BATADV_ATTR_BLA_ADDRESS] = { .len = ETH_ALEN }, | ||
| 97 | [BATADV_ATTR_BLA_VID] = { .type = NLA_U16 }, | ||
| 98 | [BATADV_ATTR_BLA_BACKBONE] = { .len = ETH_ALEN }, | ||
| 99 | [BATADV_ATTR_BLA_CRC] = { .type = NLA_U16 }, | ||
| 94 | }; | 100 | }; |
| 95 | 101 | ||
| 96 | /** | 102 | /** |
| @@ -580,6 +586,12 @@ static struct genl_ops batadv_netlink_ops[] = { · 483 unmodified lines | |||
| 580 | .policy = batadv_netlink_policy, | 586 | .policy = batadv_netlink_policy, |
| 581 | .dumpit = batadv_gw_dump, | 587 | .dumpit = batadv_gw_dump, |
| 582 | }, | 588 | }, |
| 589 | { | ||
| 590 | .cmd = BATADV_CMD_GET_BLA_CLAIM, | ||
| 591 | .flags = GENL_ADMIN_PERM, | ||
| 592 | .policy = batadv_netlink_policy, | ||
| 593 | .dumpit = batadv_bla_claim_dump, | ||
| 594 | }, | ||
| 583 | }; | 595 | }; |
| 584 | 596 | ||
| 585 | /** | 597 | /** |