commits April 2011

commits@lists.open-mesh.org

1 participants
94 discussions

batman-adv; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit dc130a61a0cc606f8009cdc013b838e71d73c4fa Author: Linus Lüssing <linus.luessing(a)ascom.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)ascom.ch> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index f66a74d..9292214 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, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit 94fa29abb81710e89adbbaf1eb2833df660fea20 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> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/unicast.c b/unicast.c index 12c1178..121b11d 100644 --- a/unicast.c +++ b/unicast.c @@ -286,7 +286,7 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv) { struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct unicast_packet *unicast_packet; - struct orig_node *orig_node; + struct orig_node *orig_node = NULL; struct batman_if *batman_if; struct neigh_node *router; int data_len = skb->len; @@ -297,11 +297,6 @@ 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); - else - orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash, - compare_orig, - choose_orig, - ethhdr->h_dest)); /* check for hna host */ if (!orig_node) -- batman-adv

1 0

batman-adv; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit 881efd508c3e6dca3a41683bb8cf243bf879c1af Author: Jesper Juhl <jj(a)chaosbits.net> Date: Mon Feb 14 23:38:18 2011 +0100 batman-adv: Remove two duplicate includes. Remove duplicate inclusion of "send.h" and "routing.h" from soft-interface.c Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index bd088f8..7e37077 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -29,14 +29,12 @@ #include "hash.h" #include "gateway_common.h" #include "gateway_client.h" -#include "send.h" #include "bat_sysfs.h" #include <linux/slab.h> #include <linux/ethtool.h> #include <linux/etherdevice.h> #include <linux/if_vlan.h> #include "unicast.h" -#include "routing.h" static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); -- batman-adv

1 0

batman-adv; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit 5caa4a307dcd05b05dee82a5c0b6c4574222873d Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jan 27 16:00:51 2011 +0100 batman-adv: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index 501bf0e..f66a74d 100644 --- a/main.h +++ b/main.h @@ -27,7 +27,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "2011.0.0" +#define SOURCE_VERSION "next" /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

batman-adv; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint 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.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit de1d5d4bc28c18d0652345845648125531d754c8 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 d8d079f..6fc7825 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

batctl; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit c6fcdb6dc9a9a9f9308e72fcbb9462e4f678b57c 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

batctl; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit be749a08dab715f2cacf39c71d409808e8efa42c Merge: c6fcdb6dc9a9a9f9308e72fcbb9462e4f678b57c eee3fc647349f8a0d2b671eed2f0e7375ac113d4 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Apr 17 14:58:13 2011 +0200 batctl: Merge commits from master into next * batctl: avoid error message when command was successful * batctl: Remove subversion/svk revision information * batctl: Remove obsolete creation of source packages Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> -- batctl

1 0

batctl; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit 6fd4ab783b00ba4ff7e3853727ac78ae572eeb23 Merge: be749a08dab715f2cacf39c71d409808e8efa42c 92a485041a2e9a25992217ef03ced8095a1aedb5 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Apr 17 16:38:15 2011 +0200 batctl: Merge commits from master into next * batctl: remove obsolete functions debufs_read/write() Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> -- batctl

1 0

batctl; branch, maint, updated. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the maint branch: commit f810f7d0a914fcb1b1adcb057ae83a426dc983f9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 17 17:35:11 2011 +0200 batctl: update version for release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index a9102b1..98aa40f 100644 --- a/main.h +++ b/main.h @@ -21,7 +21,7 @@ -#define SOURCE_VERSION "next" +#define SOURCE_VERSION "2011.1.0" #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" -- batctl

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2011