commits June 2011

commits@lists.open-mesh.org

1 participants
58 discussions

batctl; branch, master, updated. v2011.1.0-30-g912eb07
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 912eb07efc66ced6109f90e868b13eb39f8e7516 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 12 11:10:38 2011 +0200 batman-adv: Force packed placment of tt_change Every data structure which is used to send data over the wire must be fixed in layout to prevent incompatibility between different architectures. Those incompatibilities could be generated by extra bytes between members and at the end of the structure. tt_changes_fill_buffer and tt_len use that structure to copy the correct amount of data from an internal structure to the actual packet. We must ensure that this packet buffer only has data which can be interpreted by any architecture. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 0c3e44d..ef7476f 100644 --- a/packet.h +++ b/packet.h @@ -202,6 +202,6 @@ struct roam_adv_packet { struct tt_change { uint8_t flags; uint8_t addr[ETH_ALEN]; -}; +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batctl

1 0

batctl; branch, master, updated. v2011.1.0-32-g5963ad5
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 992f63b7d8330fe0729734d3d833ed51d81abe91 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 5 23:49:16 2011 +0200 batctl: Remove unused but set variable in roam and tt dump functions Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/tcpdump.c b/tcpdump.c index 3e68844..85d461e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -253,12 +253,10 @@ static void dump_vlan(unsigned char *packet_buff, ssize_t buff_len, int read_opt static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct tt_query_packet *tt_query_packet; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct tt_query_packet), "BAT TT"); - ether_header = (struct ether_header *)packet_buff; tt_query_packet = (struct tt_query_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) @@ -280,12 +278,10 @@ static void dump_batman_tt(unsigned char *packet_buff, ssize_t buff_len, int rea static void dump_batman_roam(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { - struct ether_header *ether_header; struct roam_adv_packet *roam_adv_packet; LEN_CHECK((size_t)buff_len - sizeof(struct ether_header), sizeof(struct roam_adv_packet), "BAT ROAM"); - ether_header = (struct ether_header *)packet_buff; roam_adv_packet = (struct roam_adv_packet *)(packet_buff + sizeof(struct ether_header)); if (!time_printed) -- batctl

1 0

batctl; branch, master, updated. v2011.1.0-32-g5963ad5
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit f7dd5bcb5cb04fa0011c4afe2105fcca753ad346 Merge: 992f63b7d8330fe0729734d3d833ed51d81abe91 1c6d3d71dbd3b1711980cf109e02d179f68990d9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jun 10 23:45:28 2011 +0200 Merge branch 'master' of git://git.open-mesh.org/batctl -- batctl

1 0

batctl; branch, master, updated. v2011.1.0-32-g5963ad5
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 5963ad553db1dc75eb76396cbe403c1b891c0ef1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 12 11:10:38 2011 +0200 batctl: Force packed placment of tt_change Every data structure which is used to send data over the wire must be fixed in layout to prevent incompatibility between different architectures. Those incompatibilities could be generated by extra bytes between members and at the end of the structure. tt_changes_fill_buffer and tt_len use that structure to copy the correct amount of data from an internal structure to the actual packet. We must ensure that this packet buffer only has data which can be interpreted by any architecture. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 0c3e44d..ef7476f 100644 --- a/packet.h +++ b/packet.h @@ -202,6 +202,6 @@ struct roam_adv_packet { struct tt_change { uint8_t flags; uint8_t addr[ETH_ALEN]; -}; +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batctl

1 0

batman-adv; branch, master, updated. v2011.1.0-151-g17852fa
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 17852faeb269bc72f6ff542e21c0b3056fb99c48 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 26 21:31:45 2011 +0200 batman-adv: improved gateway tq-based selection If a client issues a DHCPREQUEST for renewal, the packet is dropped if the old destination (the old gateway for the client) TQ is smaller than the current best gateway TQ less GW_THRESHOLD Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/gateway_client.c b/gateway_client.c index 64505ee..d90463a 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -25,11 +25,17 @@ #include "gateway_common.h" #include "hard-interface.h" #include "originator.h" +#include "routing.h" #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/udp.h> #include <linux/if_vlan.h> +/* This is the offset of the options field in a dhcp packet starting at + * the beginning of the dhcp header */ +#define DHCP_OPTIONS_OFFSET 240 +#define DHCP_REQUEST 3 + static void gw_node_free_ref(struct gw_node *gw_node) { if (atomic_dec_and_test(&gw_node->refcount)) @@ -509,14 +515,75 @@ out: return ret; } -int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb) +static bool is_type_dhcprequest(struct sk_buff *skb, int header_len) +{ + int ret = false; + unsigned char *p; + int pkt_len; + + if (skb_linearize(skb) < 0) + goto out; + + pkt_len = skb_headlen(skb); + + if (pkt_len < header_len + DHCP_OPTIONS_OFFSET + 1) + goto out; + + p = skb->data + header_len + DHCP_OPTIONS_OFFSET; + pkt_len -= header_len + DHCP_OPTIONS_OFFSET + 1; + + /* Access the dhcp option lists. Each entry is made up by: + * - octect 1: option type + * - octect 2: option data len (only if type != 255 and 0) + * - octect 3: option data */ + while (*p != 255 && !ret) { + /* p now points to the first octect: option type */ + if (*p == 53) { + /* type 53 is the message type option. + * Jump the len octect and go to the data octect */ + if (pkt_len < 2) + goto out; + p += 2; + + /* check if the message type is what we need */ + if (*p == DHCP_REQUEST) + ret = true; + break; + } else if (*p == 0) { + /* option type 0 (padding), just go forward */ + if (pkt_len < 1) + goto out; + pkt_len--; + p++; + } else { + /* This is any other option. So we get the length... */ + if (pkt_len < 1) + goto out; + pkt_len--; + p++; + + /* ...and then we jump over the data */ + if (pkt_len < *p) + goto out; + pkt_len -= *p; + p += (*p); + } + } +out: + return ret; +} + +int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb, + struct orig_node *old_gw) { struct ethhdr *ethhdr; struct iphdr *iphdr; struct ipv6hdr *ipv6hdr; struct udphdr *udphdr; struct gw_node *curr_gw; + struct neigh_node *neigh_curr = NULL, *neigh_old = NULL; unsigned int header_len = 0; + int ret = 1; if (atomic_read(&bat_priv->gw_mode) == GW_MODE_OFF) return 0; @@ -584,7 +651,30 @@ int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb) if (!curr_gw) return 0; + /* If old_gw != NULL then this packet is unicast. + * So, at this point we have to check the message type: if it is a + * DHCPREQUEST we have to decide whether to drop it or not */ + if (old_gw && curr_gw->orig_node != old_gw) { + if (is_type_dhcprequest(skb, header_len)) { + /* If the dhcp packet has been sent to a different gw, + * we have to evaluate whether the old gw is still + * reliable enough */ + neigh_curr = find_router(bat_priv, curr_gw->orig_node, + NULL); + neigh_old = find_router(bat_priv, old_gw, NULL); + if (!neigh_curr || !neigh_old) + goto free_neigh; + if (neigh_curr->tq_avg - neigh_old->tq_avg < + GW_THRESHOLD) + ret = -1; + } + } +free_neigh: + if (neigh_old) + neigh_node_free_ref(neigh_old); + if (neigh_curr) + neigh_node_free_ref(neigh_curr); if (curr_gw) gw_node_free_ref(curr_gw); - return 1; + return ret; } diff --git a/gateway_client.h b/gateway_client.h index 1ce8c60..b9b983c 100644 --- a/gateway_client.h +++ b/gateway_client.h @@ -31,6 +31,7 @@ void gw_node_update(struct bat_priv *bat_priv, void gw_node_delete(struct bat_priv *bat_priv, struct orig_node *orig_node); void gw_node_purge(struct bat_priv *bat_priv); int gw_client_seq_print_text(struct seq_file *seq, void *offset); -int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb); +int gw_is_target(struct bat_priv *bat_priv, struct sk_buff *skb, + struct orig_node *old_gw); #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */ diff --git a/main.h b/main.h index 7f3768e..059866c 100644 --- a/main.h +++ b/main.h @@ -91,7 +91,6 @@ enum mesh_state { #define BCAST_QUEUE_LEN 256 #define BATMAN_QUEUE_LEN 256 - enum uev_action { UEV_ADD = 0, UEV_DEL, @@ -102,6 +101,8 @@ enum uev_type { UEV_GW = 0 }; +#define GW_THRESHOLD 50 + /* * Debug Messages */ diff --git a/soft-interface.c b/soft-interface.c index b268f85..7aeed0d 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -30,6 +30,7 @@ #include "gateway_common.h" #include "gateway_client.h" #include "bat_sysfs.h" +#include "originator.h" #include <linux/slab.h> #include <linux/ethtool.h> #include <linux/etherdevice.h> @@ -561,6 +562,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) struct bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; struct softif_neigh *curr_softif_neigh = NULL; + struct orig_node *orig_node = NULL; int data_len = skb->len, ret; short vid = -1; bool do_bcast = false; @@ -595,8 +597,10 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) /* Register the client MAC in the transtable */ tt_local_add(soft_iface, ethhdr->h_source); - if (is_multicast_ether_addr(ethhdr->h_dest)) { - ret = gw_is_target(bat_priv, skb); + orig_node = transtable_search(bat_priv, ethhdr->h_dest); + if (is_multicast_ether_addr(ethhdr->h_dest) || + (orig_node && orig_node->gw_flags)) { + ret = gw_is_target(bat_priv, skb, orig_node); if (ret < 0) goto dropped; @@ -656,6 +660,8 @@ end: softif_neigh_free_ref(curr_softif_neigh); if (primary_if) hardif_free_ref(primary_if); + if (orig_node) + orig_node_free_ref(orig_node); return NETDEV_TX_OK; } -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-150-gc792264
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit c7922649c3d888c52eefa7c034abe60fd6c33b4f Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Jun 12 11:58:58 2011 +0200 batman-adv: throw uevent in userspace on gateway add/change/del event In case of new default gw, changing the default gw or deleting the default gw a uevent is triggered with type=gw, action=add/change/del and data={GW_ORIG_ADDRESS} (if any). Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/gateway_client.c b/gateway_client.c index 69868a8..64505ee 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -179,6 +179,7 @@ void gw_election(struct bat_priv *bat_priv) { struct gw_node *curr_gw = NULL, *next_gw = NULL; struct neigh_node *router = NULL; + char gw_addr[18] = { '\0' }; /** * The batman daemon checks here if we already passed a full originator @@ -200,6 +201,8 @@ void gw_election(struct bat_priv *bat_priv) goto out; if (next_gw) { + sprintf(gw_addr, "%pM", next_gw->orig_node->orig); + router = orig_node_get_router(next_gw->orig_node); if (!router) { gw_deselect(bat_priv); @@ -210,12 +213,14 @@ void gw_election(struct bat_priv *bat_priv) if ((curr_gw) && (!next_gw)) { bat_dbg(DBG_BATMAN, bat_priv, "Removing selected gateway - no gateway in range\n"); + throw_uevent(bat_priv, UEV_GW, UEV_DEL, NULL); } else if ((!curr_gw) && (next_gw)) { bat_dbg(DBG_BATMAN, bat_priv, "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n", next_gw->orig_node->orig, next_gw->orig_node->gw_flags, router->tq_avg); + throw_uevent(bat_priv, UEV_GW, UEV_ADD, gw_addr); } else { bat_dbg(DBG_BATMAN, bat_priv, "Changing route to gateway %pM " @@ -223,6 +228,7 @@ void gw_election(struct bat_priv *bat_priv) next_gw->orig_node->orig, next_gw->orig_node->gw_flags, router->tq_avg); + throw_uevent(bat_priv, UEV_GW, UEV_CHANGE, gw_addr); } gw_select(bat_priv, next_gw); -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-149-g6a17ecc
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 6a17ecc4603be7f065c38b288d038a0082bbf21d Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Apr 27 00:22:00 2011 +0200 batman-adv: gateway election code refactoring The gateway election mechanism has been a little revised. Now the gw_election is trigered by an atomic_t flag (gw_reselect) which is is set to 1 in case of election needed, avoding to set curr_gw to NULL. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/gateway_client.c b/gateway_client.c index 24aee56..69868a8 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -20,6 +20,7 @@ */ #include "main.h" +#include "bat_sysfs.h" #include "gateway_client.h" #include "gateway_common.h" #include "hard-interface.h" @@ -97,40 +98,19 @@ static void gw_select(struct bat_priv *bat_priv, struct gw_node *new_gw_node) void gw_deselect(struct bat_priv *bat_priv) { - gw_select(bat_priv, NULL); + atomic_set(&bat_priv->gw_reselect, 1); } -void gw_election(struct bat_priv *bat_priv) +static struct gw_node *gw_get_best_gw_node(struct bat_priv *bat_priv) { - struct hlist_node *node; - struct gw_node *gw_node, *curr_gw = NULL, *curr_gw_tmp = NULL; struct neigh_node *router; - uint8_t max_tq = 0; + struct hlist_node *node; + struct gw_node *gw_node, *curr_gw = NULL; uint32_t max_gw_factor = 0, tmp_gw_factor = 0; + uint8_t max_tq = 0; int down, up; - /** - * The batman daemon checks here if we already passed a full originator - * cycle in order to make sure we don't choose the first gateway we - * hear about. This check is based on the daemon's uptime which we - * don't have. - **/ - if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT) - return; - - curr_gw = gw_get_selected_gw_node(bat_priv); - if (curr_gw) - goto out; - rcu_read_lock(); - if (hlist_empty(&bat_priv->gw_list)) { - bat_dbg(DBG_BATMAN, bat_priv, - "Removing selected gateway - " - "no gateway in range\n"); - gw_deselect(bat_priv); - goto unlock; - } - hlist_for_each_entry_rcu(gw_node, node, &bat_priv->gw_list, list) { if (gw_node->deleted) continue; @@ -139,6 +119,9 @@ void gw_election(struct bat_priv *bat_priv) if (!router) continue; + if (!atomic_inc_not_zero(&gw_node->refcount)) + goto next; + switch (atomic_read(&bat_priv->gw_sel_class)) { case 1: /* fast connection */ gw_bandwidth_to_kbit(gw_node->orig_node->gw_flags, @@ -151,8 +134,12 @@ void gw_election(struct bat_priv *bat_priv) if ((tmp_gw_factor > max_gw_factor) || ((tmp_gw_factor == max_gw_factor) && - (router->tq_avg > max_tq))) - curr_gw_tmp = gw_node; + (router->tq_avg > max_tq))) { + if (curr_gw) + gw_node_free_ref(curr_gw); + curr_gw = gw_node; + atomic_inc(&curr_gw->refcount); + } break; default: /** @@ -163,8 +150,12 @@ void gw_election(struct bat_priv *bat_priv) * soon as a better gateway appears which has * $routing_class more tq points) **/ - if (router->tq_avg > max_tq) - curr_gw_tmp = gw_node; + if (router->tq_avg > max_tq) { + if (curr_gw) + gw_node_free_ref(curr_gw); + curr_gw = gw_node; + atomic_inc(&curr_gw->refcount); + } break; } @@ -174,42 +165,75 @@ void gw_election(struct bat_priv *bat_priv) if (tmp_gw_factor > max_gw_factor) max_gw_factor = tmp_gw_factor; + gw_node_free_ref(gw_node); + +next: neigh_node_free_ref(router); } + rcu_read_unlock(); - if (curr_gw != curr_gw_tmp) { - router = orig_node_get_router(curr_gw_tmp->orig_node); - if (!router) - goto unlock; + return curr_gw; +} - if ((curr_gw) && (!curr_gw_tmp)) - bat_dbg(DBG_BATMAN, bat_priv, - "Removing selected gateway - " - "no gateway in range\n"); - else if ((!curr_gw) && (curr_gw_tmp)) - bat_dbg(DBG_BATMAN, bat_priv, - "Adding route to gateway %pM " - "(gw_flags: %i, tq: %i)\n", - curr_gw_tmp->orig_node->orig, - curr_gw_tmp->orig_node->gw_flags, - router->tq_avg); - else - bat_dbg(DBG_BATMAN, bat_priv, - "Changing route to gateway %pM " - "(gw_flags: %i, tq: %i)\n", - curr_gw_tmp->orig_node->orig, - curr_gw_tmp->orig_node->gw_flags, - router->tq_avg); +void gw_election(struct bat_priv *bat_priv) +{ + struct gw_node *curr_gw = NULL, *next_gw = NULL; + struct neigh_node *router = NULL; - neigh_node_free_ref(router); - gw_select(bat_priv, curr_gw_tmp); + /** + * The batman daemon checks here if we already passed a full originator + * cycle in order to make sure we don't choose the first gateway we + * hear about. This check is based on the daemon's uptime which we + * don't have. + **/ + if (atomic_read(&bat_priv->gw_mode) != GW_MODE_CLIENT) + goto out; + + if (!atomic_dec_not_zero(&bat_priv->gw_reselect)) + goto out; + + curr_gw = gw_get_selected_gw_node(bat_priv); + + next_gw = gw_get_best_gw_node(bat_priv); + + if (curr_gw == next_gw) + goto out; + + if (next_gw) { + router = orig_node_get_router(next_gw->orig_node); + if (!router) { + gw_deselect(bat_priv); + goto out; + } } -unlock: - rcu_read_unlock(); + if ((curr_gw) && (!next_gw)) { + bat_dbg(DBG_BATMAN, bat_priv, + "Removing selected gateway - no gateway in range\n"); + } else if ((!curr_gw) && (next_gw)) { + bat_dbg(DBG_BATMAN, bat_priv, + "Adding route to gateway %pM (gw_flags: %i, tq: %i)\n", + next_gw->orig_node->orig, + next_gw->orig_node->gw_flags, + router->tq_avg); + } else { + bat_dbg(DBG_BATMAN, bat_priv, + "Changing route to gateway %pM " + "(gw_flags: %i, tq: %i)\n", + next_gw->orig_node->orig, + next_gw->orig_node->gw_flags, + router->tq_avg); + } + + gw_select(bat_priv, next_gw); + out: if (curr_gw) gw_node_free_ref(curr_gw); + if (next_gw) + gw_node_free_ref(next_gw); + if (router) + neigh_node_free_ref(router); } void gw_check_election(struct bat_priv *bat_priv, struct orig_node *orig_node) diff --git a/main.c b/main.c index c2b06b7..e367e69 100644 --- a/main.c +++ b/main.c @@ -113,6 +113,7 @@ int mesh_init(struct net_device *soft_iface) if (vis_init(bat_priv) < 1) goto err; + atomic_set(&bat_priv->gw_reselect, 0); atomic_set(&bat_priv->mesh_state, MESH_ACTIVE); goto end; diff --git a/types.h b/types.h index 11e8569..85cf122 100644 --- a/types.h +++ b/types.h @@ -201,6 +201,7 @@ struct bat_priv { struct delayed_work orig_work; struct delayed_work vis_work; struct gw_node __rcu *curr_gw; /* rcu protected pointer */ + atomic_t gw_reselect; struct hard_iface __rcu *primary_if; /* rcu protected pointer */ struct vis_info *my_vis_info; }; -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-148-g92f4aaa
by postmaster＠open-mesh.org 12 Jun '11

12 Jun '11

The following commit has been merged in the master branch: commit 92f4aaa2be1ca293d459a671010680e23b651973 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jun 12 11:10:38 2011 +0200 batman-adv: Force packed placment of tt_change Every data structure which is used to send data over the wire must be fixed in layout to prevent incompatibility between different architectures. Those incompatibilities could be generated by extra bytes between members and at the end of the structure. tt_changes_fill_buffer and tt_len use that structure to copy the correct amount of data from an internal structure to the actual packet. We must ensure that this packet buffer only has data which can be interpreted by any architecture. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 0c3e44d..ef7476f 100644 --- a/packet.h +++ b/packet.h @@ -202,6 +202,6 @@ struct roam_adv_packet { struct tt_change { uint8_t flags; uint8_t addr[ETH_ALEN]; -}; +} __packed; #endif /* _NET_BATMAN_ADV_PACKET_H_ */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-147-gd2586d6
by postmaster＠open-mesh.org 11 Jun '11

11 Jun '11

The following commit has been merged in the master branch: commit d2586d6d5e7a2a8d98b8239ba8f21cf982e4d6a7 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Tue Apr 26 18:26:01 2011 +0200 batman-adv: add wrapper function to throw uevent in userspace Using throw_uevent() is now possible to trigger uevent signal that can be recognised in userspace. Uevents will be triggered through the /devices/virtual/net/{MESH_IFACE} kobject. A triggered uevent has three properties: - type: the event class. Who generates the event (only 'gw' is currently defined). Corresponds to the BATTYPE uevent variable. - action: the associated action with the event ('add'/'change'/'del' are currently defined). Corresponds to the BAACTION uevent variable. - data: any useful data for the userspace. Corresponds to the BATDATA uevent variable. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/bat_sysfs.c b/bat_sysfs.c index 63738ec..cd15deb 100644 --- a/bat_sysfs.c +++ b/bat_sysfs.c @@ -40,6 +40,20 @@ static struct bat_priv *kobj_to_batpriv(struct kobject *obj) return netdev_priv(net_dev); } +#define UEV_TYPE_VAR "BATTYPE=" +#define UEV_ACTION_VAR "BATACTION=" +#define UEV_DATA_VAR "BATDATA=" + +static char *uev_action_str[] = { + "add", + "del", + "change" +}; + +static char *uev_type_str[] = { + "gw" +}; + /* Use this, if you have customized show and store functions */ #define BAT_ATTR(_name, _mode, _show, _store) \ struct bat_attribute bat_attr_##_name = { \ @@ -601,3 +615,60 @@ void sysfs_del_hardif(struct kobject **hardif_obj) kobject_put(*hardif_obj); *hardif_obj = NULL; } + +int throw_uevent(struct bat_priv *bat_priv, enum uev_type type, + enum uev_action action, const char *data) +{ + int ret = -1; + struct hard_iface *primary_if = NULL; + struct kobject *bat_kobj; + char *uevent_env[4] = { NULL, NULL, NULL, NULL }; + + primary_if = primary_if_get_selected(bat_priv); + if (!primary_if) + goto out; + + bat_kobj = &primary_if->soft_iface->dev.kobj; + + uevent_env[0] = kmalloc(strlen(UEV_TYPE_VAR) + + strlen(uev_type_str[type]) + 1, + GFP_ATOMIC); + if (!uevent_env[0]) + goto out; + + sprintf(uevent_env[0], "%s%s", UEV_TYPE_VAR, uev_type_str[type]); + + uevent_env[1] = kmalloc(strlen(UEV_ACTION_VAR) + + strlen(uev_action_str[action]) + 1, + GFP_ATOMIC); + if (!uevent_env[1]) + goto out; + + sprintf(uevent_env[1], "%s%s", UEV_ACTION_VAR, uev_action_str[action]); + + /* If the event is DEL, ignore the data field */ + if (action != UEV_DEL) { + uevent_env[2] = kmalloc(strlen(UEV_DATA_VAR) + + strlen(data) + 1, GFP_ATOMIC); + if (!uevent_env[2]) + goto out; + + sprintf(uevent_env[2], "%s%s", UEV_DATA_VAR, data); + } + + ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env); +out: + kfree(uevent_env[0]); + kfree(uevent_env[1]); + kfree(uevent_env[2]); + + if (primary_if) + hardif_free_ref(primary_if); + + if (ret) + bat_dbg(DBG_BATMAN, bat_priv, "Impossible to send " + "uevent for (%s,%s,%s) event (err: %d)\n", + uev_type_str[type], uev_action_str[action], + (action == UEV_DEL ? "NULL" : data), ret); + return ret; +} diff --git a/bat_sysfs.h b/bat_sysfs.h index 02f1fa7..a3f75a7 100644 --- a/bat_sysfs.h +++ b/bat_sysfs.h @@ -38,5 +38,7 @@ int sysfs_add_meshif(struct net_device *dev); void sysfs_del_meshif(struct net_device *dev); int sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev); void sysfs_del_hardif(struct kobject **hardif_obj); +int throw_uevent(struct bat_priv *bat_priv, enum uev_type type, + enum uev_action action, const char *data); #endif /* _NET_BATMAN_ADV_SYSFS_H_ */ diff --git a/main.h b/main.h index 9a969d5..7f3768e 100644 --- a/main.h +++ b/main.h @@ -91,6 +91,17 @@ enum mesh_state { #define BCAST_QUEUE_LEN 256 #define BATMAN_QUEUE_LEN 256 + +enum uev_action { + UEV_ADD = 0, + UEV_DEL, + UEV_CHANGE +}; + +enum uev_type { + UEV_GW = 0 +}; + /* * Debug Messages */ -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.1.0-146-gaa33f41
by postmaster＠open-mesh.org 10 Jun '11

10 Jun '11

The following commit has been merged in the master branch: commit aa33f41065d88b7d15c8ce51d932bd168d6ea44d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Jun 9 17:10:25 2011 +0200 batman-adv: use NO_FLAGS define to initialize empty flag fields The definition NO_FLAGS was introduced to make the code more readable and shall be used to initialize flag fields. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/aggregation.c b/aggregation.c index ef26011..ede0a56 100644 --- a/aggregation.c +++ b/aggregation.c @@ -146,7 +146,7 @@ static void new_aggregated_packet(const unsigned char *packet_buff, forw_packet_aggr->own = own_packet; forw_packet_aggr->if_incoming = if_incoming; forw_packet_aggr->num_packets = 0; - forw_packet_aggr->direct_link_flags = 0; + forw_packet_aggr->direct_link_flags = NO_FLAGS; forw_packet_aggr->send_time = send_time; /* save packet direct link flag status */ diff --git a/gateway_client.c b/gateway_client.c index cf7f95e..24aee56 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -322,7 +322,7 @@ void gw_node_update(struct bat_priv *bat_priv, gw_node->deleted = 0; - if (new_gwflags == 0) { + if (new_gwflags == NO_FLAGS) { gw_node->deleted = jiffies; bat_dbg(DBG_BATMAN, bat_priv, "Gateway %pM removed from gateway list\n", @@ -335,7 +335,7 @@ void gw_node_update(struct bat_priv *bat_priv, goto unlock; } - if (new_gwflags == 0) + if (new_gwflags == NO_FLAGS) goto unlock; gw_node_add(bat_priv, orig_node, new_gwflags); diff --git a/hard-interface.c b/hard-interface.c index cf972c3..db7aacf 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -331,7 +331,7 @@ int hardif_enable_interface(struct hard_iface *hard_iface, batman_packet = (struct batman_packet *)(hard_iface->packet_buff); batman_packet->packet_type = BAT_PACKET; batman_packet->version = COMPAT_VERSION; - batman_packet->flags = 0; + batman_packet->flags = NO_FLAGS; batman_packet->ttl = 2; batman_packet->tq = TQ_MAX_VALUE; batman_packet->tt_num_changes = 0; diff --git a/send.c b/send.c index 0c5d671..a150c7c 100644 --- a/send.c +++ b/send.c @@ -334,7 +334,7 @@ void schedule_own_packet(struct hard_iface *hard_iface) batman_packet->gw_flags = (uint8_t)atomic_read(&bat_priv->gw_bandwidth); else - batman_packet->gw_flags = 0; + batman_packet->gw_flags = NO_FLAGS; atomic_inc(&hard_iface->seqno); -- batman-adv

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits June 2011