commits February 2011

commits@lists.open-mesh.org

1 participants
41 discussions

linux integration; annotated tag, v2.6.38-rc4, created. v2.6.38-rc4
by postmaster＠open-mesh.org 08 Feb '11

08 Feb '11

The annotated tag, v2.6.38-rc4 has been created at 901069c5c5b155322539a94cf337c378848e435a (tag) tagging 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (commit) replaces v2.6.38-rc3 tagged by Linus Torvalds on Mon Feb 7 16:04:06 2011 -0800 - Shortlog ------------------------------------------------------------ Linux 2.6.38-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk1QiIAACgkQF3YsRnbiHLtz9wCeN5LWx5MxL2Kfs4IR+m6Dyg7H vcEAn0lbq0gX8pgkM4vLdt3a/nhxefDR =Zim7 -----END PGP SIGNATURE----- Linus Lüssing (1): batman-adv: Fix kernel panic when fetching vis data on a vis server Sven Eckelmann (3): batman-adv: Remove vis info on hashing errors batman-adv: Remove vis info element in free_info batman-adv: Make vis info stack traversal threadsafe ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2011.0.0-42-gdf09507
by postmaster＠open-mesh.org 08 Feb '11

08 Feb '11

The following commit has been merged in the master branch: commit df095076194cf2e7337b6512114c144b458a9ff4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Feb 8 12:43:54 2011 +0000 batman-adv: Split combined variable declarations Multiple variable declarations in a single statements over multiple lines can be split into multiple variable declarations without changing the actual behavior. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/unicast.c b/unicast.c index 52b52e3..db62b66 100644 --- a/unicast.c +++ b/unicast.c @@ -39,8 +39,8 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, (struct unicast_frag_packet *)skb->data; struct sk_buff *tmp_skb; struct unicast_packet *unicast_packet; - int hdr_len = sizeof(struct unicast_packet), - uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; + int hdr_len = sizeof(struct unicast_packet); + int uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; /* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) { -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.0.0-2-gf0cd07f
by postmaster＠open-mesh.org 07 Feb '11

07 Feb '11

The following commit has been merged in the next branch: commit f0cd07fb1fbc78bf1ef49f03d600fe74b87c9217 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 6 23:26:43 2011 +0000 batman-adv: Linearize fragment packets before merge We access the data inside the skbs of two fragments directly using memmove during the merge. The data of the skb could span over multiple skb pages. An direct access without knowledge about the pages would lead to an invalid memory access. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/unicast.c b/unicast.c index cbf022c..d8d079f 100644 --- a/unicast.c +++ b/unicast.c @@ -40,7 +40,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, struct sk_buff *tmp_skb; struct unicast_packet *unicast_packet; int hdr_len = sizeof(struct unicast_packet), - uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; + uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; /* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) { @@ -50,12 +50,12 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, skb = tfp->skb; } + if (skb_linearize(skb) < 0 || skb_linearize(tmp_skb) < 0) + goto err; + skb_pull(tmp_skb, sizeof(struct unicast_frag_packet)); - if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) { - /* free buffered skb, skb will be freed later */ - kfree_skb(tfp->skb); - return NULL; - } + if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) + goto err; /* move free entry to end */ tfp->skb = NULL; @@ -70,6 +70,11 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, unicast_packet->packet_type = BAT_UNICAST; return skb; + +err: + /* free buffered skb, skb will be freed later */ + kfree_skb(tfp->skb); + return NULL; } static void frag_create_entry(struct list_head *head, struct sk_buff *skb) -- batman-adv

1 0

batman-adv; branch, maint, updated. v2011.0.0-1-g2b9a9e2
by postmaster＠open-mesh.org 07 Feb '11

07 Feb '11

The following commit has been merged in the maint branch: commit 2b9a9e274364be840016ca54b132b294af29a9a0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 6 23:26:43 2011 +0000 batman-adv: Linearize fragment packets before merge We access the data inside the skbs of two fragments directly using memmove during the merge. The data of the skb could span over multiple skb pages. An direct access without knowledge about the pages would lead to an invalid memory access. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/unicast.c b/unicast.c index cbf022c..d8d079f 100644 --- a/unicast.c +++ b/unicast.c @@ -40,7 +40,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, struct sk_buff *tmp_skb; struct unicast_packet *unicast_packet; int hdr_len = sizeof(struct unicast_packet), - uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; + uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; /* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) { @@ -50,12 +50,12 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, skb = tfp->skb; } + if (skb_linearize(skb) < 0 || skb_linearize(tmp_skb) < 0) + goto err; + skb_pull(tmp_skb, sizeof(struct unicast_frag_packet)); - if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) { - /* free buffered skb, skb will be freed later */ - kfree_skb(tfp->skb); - return NULL; - } + if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) + goto err; /* move free entry to end */ tfp->skb = NULL; @@ -70,6 +70,11 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, unicast_packet->packet_type = BAT_UNICAST; return skb; + +err: + /* free buffered skb, skb will be freed later */ + kfree_skb(tfp->skb); + return NULL; } static void frag_create_entry(struct list_head *head, struct sk_buff *skb) -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.0.0-41-gd4153da
by postmaster＠open-mesh.org 07 Feb '11

07 Feb '11

The following commit has been merged in the master branch: commit d4153dac1311f5b0403de0b0695ccb7e3e8c16a7 Author: Linus Lüssing <linus.luessing(a)ascom.ch> Date: Mon Feb 7 00:14:40 2011 +0000 batman-adv: Disallow originator addressing within mesh layer For a host in the mesh network, the batman layer should be transparent. However, we had one exception, data packets within the mesh network which have the same destination as a originator are being routed to that node, although there is no host that node's bat0 interface and therefore gets dropped anyway. This commit removes this exception. Signed-off-by: Linus Lüssing <linus.luessing(a)ascom.ch> diff --git a/unicast.c b/unicast.c index 7b0cb0f..52b52e3 100644 --- a/unicast.c +++ b/unicast.c @@ -300,28 +300,12 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) /* get routing information */ if (is_multicast_ether_addr(ethhdr->h_dest)) { orig_node = (struct orig_node *)gw_get_selected(bat_priv); - if (!orig_node) - goto trans_search; - - kref_get(&orig_node->refcount); - goto find_router; - } else { - rcu_read_lock(); - orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash, - compare_orig, - choose_orig, - ethhdr->h_dest)); - if (!orig_node) { - rcu_read_unlock(); - goto trans_search; + if (orig_node) { + kref_get(&orig_node->refcount); + goto find_router; } - - kref_get(&orig_node->refcount); - rcu_read_unlock(); - goto find_router; } -trans_search: /* check for hna host - increases orig_node refcount */ orig_node = transtable_search(bat_priv, ethhdr->h_dest); -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.0.0-40-g7cabdbc
by postmaster＠open-mesh.org 06 Feb '11

06 Feb '11

The following commit has been merged in the master branch: commit 7cabdbcad6a537696cc2d034a81f538fee996af7 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Feb 6 23:26:43 2011 +0000 batman-adv: Linearize fragment packets before merge We access the data inside the skbs of two fragments directly using memmove during the merge. The data of the skb could span over multiple skb pages. An direct access without knowledge about the pages would lead to an invalid memory access. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/unicast.c b/unicast.c index 6a9ab61..7b0cb0f 100644 --- a/unicast.c +++ b/unicast.c @@ -40,7 +40,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, struct sk_buff *tmp_skb; struct unicast_packet *unicast_packet; int hdr_len = sizeof(struct unicast_packet), - uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; + uni_diff = sizeof(struct unicast_frag_packet) - hdr_len; /* set skb to the first part and tmp_skb to the second part */ if (up->flags & UNI_FRAG_HEAD) { @@ -50,12 +50,12 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, skb = tfp->skb; } + if (skb_linearize(skb) < 0 || skb_linearize(tmp_skb) < 0) + goto err; + skb_pull(tmp_skb, sizeof(struct unicast_frag_packet)); - if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) { - /* free buffered skb, skb will be freed later */ - kfree_skb(tfp->skb); - return NULL; - } + if (pskb_expand_head(skb, 0, tmp_skb->len, GFP_ATOMIC) < 0) + goto err; /* move free entry to end */ tfp->skb = NULL; @@ -70,6 +70,11 @@ static struct sk_buff *frag_merge_packet(struct list_head *head, unicast_packet->packet_type = BAT_UNICAST; return skb; + +err: + /* free buffered skb, skb will be freed later */ + kfree_skb(tfp->skb); + return NULL; } static void frag_create_entry(struct list_head *head, struct sk_buff *skb) -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.0.0-39-gc4a94f3
by postmaster＠open-mesh.org 06 Feb '11

06 Feb '11

The following commit has been merged in the master branch: commit c4a94f32bbe8ecba93a4aa23248723ea5aa1cc9e Author: Linus Lüssing <linus.luessing(a)acsom.ch> Date: Sun Feb 6 23:08:39 2011 +0000 batman-adv: Switch order of types.h and compat.h inclusion The compat.h changes should be transparent for any other of our source files - even for types.h. Therefore switching the order. Signed-off-by: Linus Lüssing <linus.luessing(a)acsom.ch> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index 1ec9986..bd8470d 100644 --- a/main.h +++ b/main.h @@ -114,10 +114,10 @@ #include <net/sock.h> /* struct sock */ #include <linux/jiffies.h> #include <linux/seq_file.h> -#include "types.h" - #include "compat.h" +#include "types.h" + #ifndef REVISION_VERSION #define REVISION_VERSION_STR "" #else -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.0.0-39-gc4a94f3
by postmaster＠open-mesh.org 06 Feb '11

06 Feb '11

The following commit has been merged in the master branch: commit 424864fb1a48c237782290f618cfad35e51199af Author: Linus Lüssing <linus.luessing(a)ascom.ch> Date: Sun Feb 6 23:08:37 2011 +0000 batman-adv: Remove duplicate types.h inclusions types.h is included by main.h, which is included at the beginning of any other c-file anyway. Therefore this commit removes those duplicate inclussions. Signed-off-by: Linus Lüssing <linus.luessing(a)ascom.ch> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/icmp_socket.c b/icmp_socket.c index 10a969c..fc812e1 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -24,7 +24,6 @@ #include <linux/slab.h> #include "icmp_socket.h" #include "send.h" -#include "types.h" #include "hash.h" #include "originator.h" #include "hard-interface.h" diff --git a/icmp_socket.h b/icmp_socket.h index 08b1859..462b190 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_ICMP_SOCKET_H_ #define _NET_BATMAN_ADV_ICMP_SOCKET_H_ -#include "types.h" - #define ICMP_SOCKET "socket" void bat_socket_init(void); diff --git a/main.c b/main.c index e687e7f..658ad5a 100644 --- a/main.c +++ b/main.c @@ -30,7 +30,6 @@ #include "translation-table.h" #include "hard-interface.h" #include "gateway_client.h" -#include "types.h" #include "vis.h" #include "hash.h" diff --git a/routing.c b/routing.c index 2861f18..b792df4 100644 --- a/routing.c +++ b/routing.c @@ -28,7 +28,6 @@ #include "icmp_socket.h" #include "translation-table.h" #include "originator.h" -#include "types.h" #include "ring_buffer.h" #include "vis.h" #include "aggregation.h" diff --git a/routing.h b/routing.h index 8b76424..e2a9872 100644 --- a/routing.h +++ b/routing.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_ROUTING_H_ #define _NET_BATMAN_ADV_ROUTING_H_ -#include "types.h" - void slide_own_bcast_window(struct batman_if *batman_if); void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_packet, diff --git a/send.c b/send.c index 7cc620e..8314276 100644 --- a/send.c +++ b/send.c @@ -25,7 +25,6 @@ #include "translation-table.h" #include "soft-interface.h" #include "hard-interface.h" -#include "types.h" #include "vis.h" #include "aggregation.h" #include "gateway_common.h" diff --git a/send.h b/send.h index bc53ade..b68c272 100644 --- a/send.h +++ b/send.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_SEND_H_ #define _NET_BATMAN_ADV_SEND_H_ -#include "types.h" - int send_skb_packet(struct sk_buff *skb, struct batman_if *batman_if, uint8_t *dst_addr); diff --git a/soft-interface.c b/soft-interface.c index 145e0f7..bd088f8 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -26,7 +26,6 @@ #include "send.h" #include "bat_debugfs.h" #include "translation-table.h" -#include "types.h" #include "hash.h" #include "gateway_common.h" #include "gateway_client.h" diff --git a/translation-table.c b/translation-table.c index a998c25..28a212a 100644 --- a/translation-table.c +++ b/translation-table.c @@ -22,7 +22,6 @@ #include "main.h" #include "translation-table.h" #include "soft-interface.h" -#include "types.h" #include "hash.h" #include "originator.h" diff --git a/translation-table.h b/translation-table.h index a4f3a37..f19931c 100644 --- a/translation-table.h +++ b/translation-table.h @@ -22,8 +22,6 @@ #ifndef _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ #define _NET_BATMAN_ADV_TRANSLATION_TABLE_H_ -#include "types.h" - int hna_local_init(struct bat_priv *bat_priv); void hna_local_add(struct net_device *soft_iface, uint8_t *addr); void hna_local_remove(struct bat_priv *bat_priv, -- batman-adv

1 0

batctl; branch, master, updated. v2011.0.0-13-g6f77463
by postmaster＠open-mesh.org 04 Feb '11

04 Feb '11

The following commit has been merged in the master branch: commit 6f77463027311b49d52bd3aef4d82c8aae27014f Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Feb 4 15:05:00 2011 +0100 batctl: add radiotap wifi packet decapsulation support Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/tcpdump.c b/tcpdump.c index 4443a2a..a715e27 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -460,6 +460,30 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read } } +static int monitor_header_length(unsigned char *packet_buff, ssize_t buff_len, int32_t hw_type) +{ + struct radiotap_header *radiotap_hdr; + switch (hw_type) { + case ARPHRD_IEEE80211_PRISM: + if (buff_len <= (ssize_t)PRISM_HEADER_LEN) + return -1; + else + return PRISM_HEADER_LEN; + + case ARPHRD_IEEE80211_RADIOTAP: + if (buff_len <= (ssize_t)RADIOTAP_HEADER_LEN) + return -1; + + radiotap_hdr = (struct radiotap_header*)packet_buff; + if (buff_len <= radiotap_hdr->it_len) + return -1; + else + return radiotap_hdr->it_len; + } + + return -1; +} + static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) { struct ether_header *eth_hdr; @@ -468,12 +492,6 @@ static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int rea uint16_t fc; int hdr_len; - if (buff_len <= (ssize_t)PRISM_HEADER_LEN) - return; - - buff_len -= PRISM_HEADER_LEN; - packet_buff += PRISM_HEADER_LEN; - /* we assume a minimum size of 38 bytes * (802.11 data frame + LLC) * before we calculate the real size */ @@ -540,6 +558,7 @@ int tcpdump(int argc, char **argv) int ret = EXIT_FAILURE, res, optchar, found_args = 1, max_sock = 0, tmp; int read_opt = USE_BAT_HOSTS; unsigned char packet_buff[2000]; + int monitor_header_len = -1; while ((optchar = getopt(argc, argv, "hnp:")) != -1) { switch (optchar) { @@ -609,6 +628,7 @@ int tcpdump(int argc, char **argv) switch (dump_if->hw_type) { case ARPHRD_ETHER: case ARPHRD_IEEE80211_PRISM: + case ARPHRD_IEEE80211_RADIOTAP: break; default: printf("Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); @@ -685,7 +705,10 @@ int tcpdump(int argc, char **argv) parse_eth_hdr(packet_buff, read_len, read_opt, 0); break; case ARPHRD_IEEE80211_PRISM: - parse_wifi_hdr(packet_buff, read_len, read_opt, 0); + case ARPHRD_IEEE80211_RADIOTAP: + monitor_header_len = monitor_header_length(packet_buff, read_len, dump_if->hw_type); + if (monitor_header_len >= 0) + parse_wifi_hdr(packet_buff + monitor_header_len, read_len - monitor_header_len, read_opt, 0); break; default: /* should not happen */ diff --git a/tcpdump.h b/tcpdump.h index 17eaeb0..4364be1 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -27,6 +27,10 @@ #define ARPHRD_IEEE80211_PRISM 802 #endif +#ifndef ARPHRD_IEEE80211_RADIOTAP +#define ARPHRD_IEEE80211_RADIOTAP 803 +#endif + #define DUMP_TYPE_BATOGM 1 #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 @@ -67,6 +71,13 @@ struct ieee80211_hdr { u_int8_t addr4[6]; } __attribute__ ((packed)); +struct radiotap_header { + u_int8_t it_version; + u_int8_t it_pad; + u_int16_t it_len; + u_int32_t it_present; +} __attribute__((__packed__)); + struct prism_item { u_int32_t did; u_int16_t status; @@ -91,5 +102,6 @@ struct prism_header { }; #define PRISM_HEADER_LEN sizeof(struct prism_header) +#define RADIOTAP_HEADER_LEN sizeof(struct radiotap_header) int tcpdump(int argc, char **argv); -- batctl

1 0

linux integration; annotated tag, v2.6.38-rc3, created. v2.6.38-rc3
by postmaster＠open-mesh.org 01 Feb '11

01 Feb '11

The annotated tag, v2.6.38-rc3 has been created at 70f1e06182fab9290a1f7775ade996e4854dec3a (tag) tagging ebf53826e105f488f4f628703a108e98940d1dc5 (commit) replaces v2.6.38-rc2 tagged by Linus Torvalds on Tue Feb 1 13:06:02 2011 +1000 - Shortlog ------------------------------------------------------------ Linux 2.6.38-rc3 Aka the "fleeing cyclone Yasi" release -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk1HeNgACgkQF3YsRnbiHLunfQCgowit72XuY7dQGUp+u/0Un5YI MPgAn3jFdsfAVRrmw1WiVM0ca0UZyttv =UlSE -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2011