commits March 2012

commits@lists.open-mesh.org

1 participants
147 discussions

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 4348aade64699ddf67f383a0841e0d0042675178 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:47 2012 +0800 batman-adv: add iface_disable() callback to routing API Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 4ac2d1d..98c41f5 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -52,6 +52,12 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) batman_ogm_packet->ttvn = 0; } +static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) +{ + kfree(hard_iface->packet_buff); + hard_iface->packet_buff = NULL; +} + static void bat_iv_ogm_init_primary(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; @@ -1186,6 +1192,7 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, static struct bat_algo_ops batman_iv __read_mostly = { .name = "BATMAN IV", .bat_iface_enable = bat_iv_ogm_iface_enable, + .bat_iface_disable = bat_iv_ogm_iface_disable, .bat_ogm_init_primary = bat_iv_ogm_init_primary, .bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_schedule = bat_iv_ogm_schedule, diff --git a/hard-interface.c b/hard-interface.c index 4052444..ec2f478 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -409,8 +409,7 @@ void hardif_disable_interface(struct hard_iface *hard_iface) hardif_free_ref(new_if); } - kfree(hard_iface->packet_buff); - hard_iface->packet_buff = NULL; + bat_priv->bat_algo_ops->bat_iface_disable(hard_iface); hard_iface->if_status = IF_NOT_IN_USE; /* delete all references to this hard_iface */ diff --git a/main.c b/main.c index 8bc27e1..c4a9b2b 100644 --- a/main.c +++ b/main.c @@ -209,6 +209,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) /* all algorithms must implement all ops (for now) */ if (!bat_algo_ops->bat_iface_enable || + !bat_algo_ops->bat_iface_disable || !bat_algo_ops->bat_ogm_init_primary || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || diff --git a/types.h b/types.h index 4b92248..b034cf2 100644 --- a/types.h +++ b/types.h @@ -379,6 +379,8 @@ struct bat_algo_ops { char *name; /* init routing info when hard-interface is enabled */ void (*bat_iface_enable)(struct hard_iface *hard_iface); + /* de-init routing info when hard-interface is disabled */ + void (*bat_iface_disable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */ void (*bat_ogm_init_primary)(struct hard_iface *hard_iface); /* init mac addresses of the OGM belonging to this hard-interface */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 13cbee11e423213ba5048b2a04b40cb87b4290b3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 7 17:20:48 2012 +0800 batman-adv: handle routing code initialization properly Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 98c41f5..d944a0b 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -30,10 +30,11 @@ #include "send.h" #include "bat_algo.h" -static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) +static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; unsigned long random_seqno; + int res = -1; /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(unsigned long)); @@ -42,6 +43,9 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) hard_iface->packet_len = BATMAN_OGM_LEN; hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC); + if (!hard_iface->packet_buff) + goto out; + batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff; batman_ogm_packet->header.packet_type = BAT_OGM; batman_ogm_packet->header.version = COMPAT_VERSION; @@ -50,6 +54,11 @@ static void bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) batman_ogm_packet->tq = TQ_MAX_VALUE; batman_ogm_packet->tt_num_changes = 0; batman_ogm_packet->ttvn = 0; + + res = 0; + +out: + return res; } static void bat_iv_ogm_iface_disable(struct hard_iface *hard_iface) diff --git a/hard-interface.c b/hard-interface.c index ec2f478..d6b25e0 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -310,21 +310,17 @@ int hardif_enable_interface(struct hard_iface *hard_iface, pr_err("Can't create batman mesh interface %s: " "already exists as regular interface\n", soft_iface->name); - dev_put(soft_iface); ret = -EINVAL; - goto err; + goto err_dev; } hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); - bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); - - if (!hard_iface->packet_buff) { - bat_err(hard_iface->soft_iface, "Can't add interface packet " - "(%s): out of memory\n", hard_iface->net_dev->name); + ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface); + if (ret < 0) { ret = -ENOMEM; - goto err; + goto err_dev; } hard_iface->if_num = bat_priv->num_ifaces; @@ -375,6 +371,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface, out: return 0; +err_dev: + dev_put(soft_iface); err: hardif_free_ref(hard_iface); return ret; diff --git a/types.h b/types.h index b034cf2..dd78023 100644 --- a/types.h +++ b/types.h @@ -378,7 +378,7 @@ struct bat_algo_ops { struct hlist_node list; char *name; /* init routing info when hard-interface is enabled */ - void (*bat_iface_enable)(struct hard_iface *hard_iface); + int (*bat_iface_enable)(struct hard_iface *hard_iface); /* de-init routing info when hard-interface is disabled */ void (*bat_iface_disable)(struct hard_iface *hard_iface); /* init primary OGM when primary interface is selected */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 052332fb1a2d694fdc10bb0ebef495bbcb6fb06d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Feb 9 16:10:12 2012 +0800 batman-adv: compat layer also needs ifdefs for bridge loop avoidance Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/compat.c b/compat.c index 73a2d8b..35ad397 100644 --- a/compat.c +++ b/compat.c @@ -55,6 +55,7 @@ void free_rcu_tt_local_entry(struct rcu_head *rcu) kfree(tt_local_entry); } +#ifdef CONFIG_BATMAN_ADV_BLA void free_rcu_backbone_gw(struct rcu_head *rcu) { struct backbone_gw *backbone_gw; @@ -62,5 +63,6 @@ void free_rcu_backbone_gw(struct rcu_head *rcu) backbone_gw = container_of(rcu, struct backbone_gw, rcu); kfree(backbone_gw); } +#endif #endif /* < KERNEL_VERSION(3, 0, 0) */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 9c7df129e4e85c3a8aa3e249725fc1587e74ab8c Author: Antonio Quartulli <ordex(a)autistici.org> Date: Wed Nov 23 11:35:44 2011 +0100 batman-adv: add biggest_unsigned_int(x) macro in case of dynamic type variable, it could be needed to compute at compile time its maximal value. This macro helps in doing that for unsigned integer types Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/main.h b/main.h index 2ba8724..e669eea 100644 --- a/main.h +++ b/main.h @@ -231,6 +231,9 @@ static inline bool has_timed_out(unsigned long timestamp, unsigned int timeout) /* Returns the smallest signed integer in two's complement with the sizeof x */ #define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) +/* Returns the biggest unsigned integer with the sizeof x */ +#define biggest_unsigned_int(x) (~(x)0) + /* Checks if a sequence number x is a predecessor/successor of y. * they handle overflows/underflows and can correctly check for a * predecessor/successor unless the variable sequence number has grown by -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 Author: Danny Kukawka <danny.kukawka(a)bisect.de> Date: Wed Feb 8 22:10:47 2012 +0100 batman-adv: use dev_hw_addr_random() instead of random_ether_addr() Use dev_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. Reset the state to NET_ADDR_PERM as soon as the MAC get changed via .ndo_set_mac_address. Signed-off-by: Danny Kukawka <danny.kukawka(a)bisect.de> [lindner_marek(a)yahoo.de: minor flag handling modification] Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/soft-interface.c b/soft-interface.c index 8de8779..7047a47 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -108,6 +108,9 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + if (dev->addr_assign_type & NET_ADDR_RANDOM) + dev->addr_assign_type &= ~NET_ADDR_RANDOM; + return 0; } @@ -323,7 +326,6 @@ static const struct net_device_ops bat_netdev_ops = { static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; ether_setup(dev); @@ -340,8 +342,7 @@ static void interface_setup(struct net_device *dev) dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + dev_hw_addr_random(dev, dev->dev_addr); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 2c9280e830f1eef480f4df23d4d48c1fa5c1a8e4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 10 12:21:55 2012 +0100 batman-adv: Fix daily check regression in blaII 9fd6b0615b5499b270d39a92b8790e206cf75833 introduced some regressions in the daily checks on open-mesh.org. Those were only visible when CONFIG_BATMAN_ADV_BLA was disabled. The reason was the usage of defines to replace the calls for not available functions. The actual c compiler is not able to distinguish between the used and unused variables because it doesn't see the function call anymore. The second problem was the use of simple subscopes where "do {} while(0)" whould have been necessary. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 24d7f16..2758b8c 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -46,9 +46,10 @@ void bla_free(struct bat_priv *bat_priv); #define bla_claim_table_seq_print_text (0) #define bla_is_backbone_gw_orig(...) (0) #define bla_check_bcast_duplist(...) (0) -#define bla_update_orig_address(...) {} +#define bla_update_orig_address(...) do {} while (0) #define bla_init(...) (1) -#define bla_free(...) {} +#define bla_free(...) do {} while (0) + #endif /* ifdef CONFIG_BATMAN_ADV_BLA */ diff --git a/soft-interface.c b/soft-interface.c index 7047a47..0087052 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -135,7 +135,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; unsigned int header_len = 0; int data_len = skb->len, ret; - short vid = -1; + short vid __maybe_unused = -1; bool do_bcast = false; if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) @@ -256,7 +256,7 @@ void interface_rx(struct net_device *soft_iface, struct bat_priv *bat_priv = netdev_priv(soft_iface); struct ethhdr *ethhdr; struct vlan_ethhdr *vhdr; - short vid = -1; + short vid __maybe_unused = -1; /* check if enough space is available for pulling, and pull */ if (!pskb_may_pull(skb, hdr_size)) -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 8e2c2d3e8bbc09020dd4ac7da5f922d79eca02f4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 12 14:35:29 2012 +0100 batman-adv: Remove useless branch for NET_ADDR_RANDOM 910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 introduced a branch for a statement that doesn't need it. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index 0087052..3750e9b 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -108,8 +108,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); - if (dev->addr_assign_type & NET_ADDR_RANDOM) - dev->addr_assign_type &= ~NET_ADDR_RANDOM; + dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; } -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit f86649b10214e8e98bdec161cefa13dcc8cb1e41 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 12 14:35:30 2012 +0100 batman-adv: Backport dev_hw_addr_random 910ccacb9dd2bfac8ce1ac411af514fe72fa84c0 introduced the hardware address initialization using dev_hw_addr_random. This function was added to linux with linux 2.6.36. Older kernel versions have to igore the NET_ADDR_RANDOM variable and use random_ether_addr directly. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/compat.h b/compat.h index e90409f..88866da 100644 --- a/compat.h +++ b/compat.h @@ -104,6 +104,15 @@ static inline int __param_set_copystring(const char *val, } #define param_set_copystring __param_set_copystring +static inline void dev_hw_addr_random(struct net_device *dev, u8 *hwaddr) +{ + random_ether_addr(hwaddr); +} + +/* hack for dev->addr_assign_type &= ~NET_ADDR_RANDOM; */ +#define addr_assign_type ifindex +#define NET_ADDR_RANDOM 0 + #endif /* < KERNEL_VERSION(2, 6, 36) */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit e5cf86d30a9b32feccb6b866a3f23b0e0483a3b0 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:24 2012 +0100 batman-adv: add broadcast duplicate check When multiple backbone gateways relay the same broadcast from the backbone into the mesh, other nodes in the mesh may receive this broadcast multiple times. To avoid this, the crc checksums of received broadcasts are recorded and new broadcast packets with the same content may be dropped if received by another gateway. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index a5e0eb7..4c4b897 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1058,8 +1058,16 @@ out: /* initialize all bla structures */ int bla_init(struct bat_priv *bat_priv) { + int i; + bat_dbg(DBG_BLA, bat_priv, "bla hash registering\n"); + /* initialize the duplicate list */ + for (i = 0; i < DUPLIST_SIZE; i++) + bat_priv->bcast_duplist[i].entrytime = + jiffies - msecs_to_jiffies(DUPLIST_TIMEOUT); + bat_priv->bcast_duplist_curr = 0; + if (bat_priv->claim_hash) return 1; @@ -1077,6 +1085,71 @@ int bla_init(struct bat_priv *bat_priv) /** * @bat_priv: the bat priv with all the soft interface information + * @bcast_packet: originator mac address + * @hdr_size: maximum length of the frame + * + * check if it is on our broadcast list. Another gateway might + * have sent the same packet because it is connected to the same backbone, + * so we have to remove this duplicate. + * + * This is performed by checking the CRC, which will tell us + * with a good chance that it is the same packet. If it is furthermore + * sent by another host, drop it. We allow equal packets from + * the same host however as this might be intended. + * + **/ + +int bla_check_bcast_duplist(struct bat_priv *bat_priv, + struct bcast_packet *bcast_packet, + int hdr_size) +{ + int i, length, curr; + uint8_t *content; + uint16_t crc; + struct bcast_duplist_entry *entry; + + length = hdr_size - sizeof(*bcast_packet); + content = (uint8_t *) bcast_packet; + content += sizeof(*bcast_packet); + + /* calculate the crc ... */ + crc = crc16(0, content, length); + + for (i = 0 ; i < DUPLIST_SIZE; i++) { + curr = (bat_priv->bcast_duplist_curr + i) % DUPLIST_SIZE; + entry = &bat_priv->bcast_duplist[curr]; + + /* we can stop searching if the entry is too old ; + * later entries will be even older */ + if (has_timed_out(entry->entrytime, DUPLIST_TIMEOUT)) + break; + + if (entry->crc != crc) + continue; + + if (compare_eth(entry->orig, bcast_packet->orig)) + continue; + + /* this entry seems to match: same crc, not too old, + * and from another gw. therefore return 1 to forbid it. */ + return 1; + } + /* not found, add a new entry (overwrite the oldest entry) */ + curr = (bat_priv->bcast_duplist_curr + DUPLIST_SIZE - 1) % DUPLIST_SIZE; + entry = &bat_priv->bcast_duplist[curr]; + entry->crc = crc; + entry->entrytime = jiffies; + memcpy(entry->orig, bcast_packet->orig, ETH_ALEN); + bat_priv->bcast_duplist_curr = curr; + + /* allow it, its the first occurence. */ + return 0; +} + + + +/** + * @bat_priv: the bat priv with all the soft interface information * @orig: originator mac address * * check if the originator is a gateway for any VLAN ID. diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index b74940f..9468c24 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -28,6 +28,8 @@ int bla_is_backbone_gw(struct sk_buff *skb, struct orig_node *orig_node, int hdr_size); int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig); +int bla_check_bcast_duplist(struct bat_priv *bat_priv, + struct bcast_packet *bcast_packet, int hdr_size); void bla_update_orig_address(struct bat_priv *bat_priv, struct hard_iface *primary_if, struct hard_iface *oldif); diff --git a/main.h b/main.h index 88aadfa..2ba8724 100644 --- a/main.h +++ b/main.h @@ -83,6 +83,9 @@ #define BLA_PERIOD_LENGTH 10000 /* 10 seconds */ #define BLA_BACKBONE_TIMEOUT (BLA_PERIOD_LENGTH * 3) #define BLA_CLAIM_TIMEOUT (BLA_PERIOD_LENGTH * 10) + +#define DUPLIST_SIZE 16 +#define DUPLIST_TIMEOUT 500 /* 500 ms */ /* don't reset again within 30 seconds */ #define RESET_PROTECTION_MS 30000 #define EXPECTED_SEQNO_RANGE 65536 diff --git a/routing.c b/routing.c index 95b9eb4..4a0e265 100644 --- a/routing.c +++ b/routing.c @@ -1074,6 +1074,10 @@ int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if) spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* check whether this has been sent by another originator before */ + if (bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + goto out; + /* rebroadcast packet */ add_bcast_packet_to_list(bat_priv, skb, 1); diff --git a/types.h b/types.h index 35cd831..ad97e87 100644 --- a/types.h +++ b/types.h @@ -140,6 +140,11 @@ struct neigh_node { spinlock_t tq_lock; /* protects: tq_recv, tq_index */ }; +struct bcast_duplist_entry { + uint8_t orig[ETH_ALEN]; + uint16_t crc; + unsigned long entrytime; +}; struct bat_priv { atomic_t mesh_state; @@ -186,6 +191,8 @@ struct bat_priv { struct list_head tt_req_list; /* list of pending tt_requests */ struct list_head tt_roam_list; struct hashtable_t *vis_hash; + struct bcast_duplist_entry bcast_duplist[DUPLIST_SIZE]; + int bcast_duplist_curr; spinlock_t forw_bat_list_lock; /* protects forw_bat_list */ spinlock_t forw_bcast_list_lock; /* protects */ spinlock_t tt_changes_list_lock; /* protects tt_changes */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2012.1.0-74-g48798bf
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit d0d5770eb02a0f21738231afc0e0bed7848dcf88 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:25 2012 +0100 batman-adv: drop STP over batman Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/soft-interface.c b/soft-interface.c index 2f73869..8de8779 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -129,6 +129,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) struct hard_iface *primary_if = NULL; struct bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; + uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; unsigned int header_len = 0; int data_len = skb->len, ret; short vid = -1; @@ -158,6 +159,11 @@ static 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, skb->skb_iif); + /* don't accept stp packets. STP does not help in meshes. + * better use the bridge loop avoidance ... */ + if (compare_eth(ethhdr->h_dest, stp_addr)) + goto dropped; + if (is_multicast_ether_addr(ethhdr->h_dest)) { do_bcast = true; -- batman-adv

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2012