commits April 2011

commits@lists.open-mesh.org

1 participants
94 discussions

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 457d921d4bbd49ffca15e90ebfa5650bb2b67576 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Jan 27 17:50:30 2011 +0100 batctl: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index eeccb0f..a9102b1 100644 --- a/main.h +++ b/main.h @@ -21,7 +21,7 @@ -#define SOURCE_VERSION "2011.0.0" +#define SOURCE_VERSION "next" #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" -- 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 a8926828bcf3afd9b3f88d7b547bc0b152c8a8d3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 1 22:09:31 2011 +0100 batctl: add raw wifi packet decapsulation support Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/tcpdump.c b/tcpdump.c index dad4049..4443a2a 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -29,6 +29,7 @@ #include <sys/time.h> #include <arpa/inet.h> #include <net/if.h> +#include <net/if_arp.h> #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/tcp.h> @@ -459,6 +460,75 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read } } +static void parse_wifi_hdr(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) +{ + struct ether_header *eth_hdr; + struct ieee80211_hdr *wifi_hdr; + unsigned char *shost, *dhost; + 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 */ + if (buff_len <= 38) + return; + + wifi_hdr = (struct ieee80211_hdr *)packet_buff; + fc = ntohs(wifi_hdr->frame_control); + + /* not carrying payload */ + if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) + return; + + /* encrypted packet */ + if (fc & IEEE80211_FCTL_PROTECTED) + return; + + shost = wifi_hdr->addr2; + if (fc & IEEE80211_FCTL_FROMDS) + shost = wifi_hdr->addr3; + else if (fc & IEEE80211_FCTL_TODS) + shost = wifi_hdr->addr4; + + dhost = wifi_hdr->addr1; + if (fc & IEEE80211_FCTL_TODS) + dhost = wifi_hdr->addr3; + + hdr_len = 24; + if ((fc & IEEE80211_FCTL_FROMDS) && (fc & IEEE80211_FCTL_TODS)) + hdr_len = 30; + + if (fc & IEEE80211_STYPE_QOS_DATA) + hdr_len += 2; + + /* LLC */ + hdr_len += 8; + hdr_len -= sizeof(struct ether_header); + + if (buff_len <= hdr_len) + return; + + buff_len -= hdr_len; + packet_buff += hdr_len; + + eth_hdr = (struct ether_header *)packet_buff; + memmove(eth_hdr->ether_shost, shost, ETH_ALEN); + memmove(eth_hdr->ether_dhost, dhost, ETH_ALEN); + + /* printf("parse_wifi_hdr(): ether_type: 0x%04x\n", ntohs(eth_hdr->ether_type)); + printf("parse_wifi_hdr(): shost: %s\n", ether_ntoa_long((struct ether_addr *)eth_hdr->ether_shost)); + printf("parse_wifi_hdr(): dhost: %s\n", ether_ntoa_long((struct ether_addr *)eth_hdr->ether_dhost)); */ + + parse_eth_hdr(packet_buff, buff_len, read_opt, time_printed); +} + int tcpdump(int argc, char **argv) { struct ifreq req; @@ -527,6 +597,27 @@ int tcpdump(int argc, char **argv) memset(&req, 0, sizeof (struct ifreq)); strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); + if (res < 0) { + printf("Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); + close(dump_if->raw_sock); + goto out; + } + + dump_if->hw_type = req.ifr_hwaddr.sa_family; + + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + case ARPHRD_IEEE80211_PRISM: + break; + default: + printf("Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); + goto out; + } + + memset(&req, 0, sizeof (struct ifreq)); + strncpy(req.ifr_name, dump_if->dev, IFNAMSIZ); + res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); if (res < 0) { @@ -589,7 +680,18 @@ int tcpdump(int argc, char **argv) continue; } - parse_eth_hdr(packet_buff, read_len, read_opt, 0); + switch (dump_if->hw_type) { + case ARPHRD_ETHER: + 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); + break; + default: + /* should not happen */ + break; + } + fflush(stdout); } diff --git a/tcpdump.h b/tcpdump.h index b3ea186..17eaeb0 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -23,6 +23,10 @@ #include <netpacket/packet.h> #include "list-batman.h" +#ifndef ARPHRD_IEEE80211_PRISM +#define ARPHRD_IEEE80211_PRISM 802 +#endif + #define DUMP_TYPE_BATOGM 1 #define DUMP_TYPE_BATICMP 2 #define DUMP_TYPE_BATUCAST 4 @@ -31,11 +35,21 @@ #define DUMP_TYPE_BATFRAG 32 #define DUMP_TYPE_NONBAT 64 +#define IEEE80211_FCTL_FTYPE 0x0c00 +#define IEEE80211_FCTL_TODS 0x0001 +#define IEEE80211_FCTL_FROMDS 0x0002 +#define IEEE80211_FCTL_PROTECTED 0x0040 + +#define IEEE80211_FTYPE_DATA 0x0800 + +#define IEEE80211_STYPE_QOS_DATA 0x8000 + struct dump_if { struct list_head list; char *dev; int32_t raw_sock; struct sockaddr_ll addr; + int32_t hw_type; }; struct vlanhdr { @@ -43,4 +57,39 @@ struct vlanhdr { u_int16_t ether_type; } __attribute__ ((packed)); +struct ieee80211_hdr { + u_int16_t frame_control; + u_int16_t duration_id; + u_int8_t addr1[6]; + u_int8_t addr2[6]; + u_int8_t addr3[6]; + u_int16_t seq_ctrl; + u_int8_t addr4[6]; +} __attribute__ ((packed)); + +struct prism_item { + u_int32_t did; + u_int16_t status; + u_int16_t len; + u_int32_t data; +}; + +struct prism_header { + u_int32_t msgcode; + u_int32_t msglen; + u_int8_t devname[16]; + struct prism_item hosttime; + struct prism_item mactime; + struct prism_item channel; + struct prism_item rssi; + struct prism_item sq; + struct prism_item signal; + struct prism_item noise; + struct prism_item rate; + struct prism_item istx; + struct prism_item frmlen; +}; + +#define PRISM_HEADER_LEN sizeof(struct prism_header) + int tcpdump(int argc, char **argv); -- batctl

1 0

batctl; annotated tag, v2011.1.0, created. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The annotated tag, v2011.1.0 has been created at c4db2d18567e4dd2fb3c7740018385895edff481 (tag) tagging f810f7d0a914fcb1b1adcb057ae83a426dc983f9 (commit) replaces v2011.0.0 tagged by Sven Eckelmann on Sun Apr 17 17:35:53 2011 +0200 - Shortlog ------------------------------------------------------------ batctl 2011.1.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJNqwjZAAoJEF2HCgfBJntGrp8QAKnUOtDp2f2J7wUEe9Czy9E+ fMUqjyV/Y3l8TdC1acIqc0oLS5hIcvAZKHttoVvNZACJeBXV6db775aFcVkIor2O d7sBw1zJU+AM9wZWX4zphqsHn3nF0htYR37r6T7tRC8C53iAOSNSaWRJv9jyV3/i 6UPrYMtpVqWyddX438YEMrSuQmsyrnmtuF9XWm7v8nnE2RSzTYoQVH7K/7ueOQHu OJsrzX7SmFbThI7XKDAF66kWhNc4HVwMyJqlzMyKdXSW3FV0H35hbrQF8Cr3lgyx WkVPMGdVc3/o73gANKmYYnLrroOyxaJWovT75Zu/XOpH57wzSNB+8hB45rbqAjbr 5flI7gM4RjsygVlNt4YkIqLVMg50Gi9kw8xKyri/akjFnp2Kf2EQ5+AkpnSADQLO byFDqChGg8kAzRP4mgClMXP4Gn38wJBP7qd2v9wefc57DjYnZUyeXnGClOfIyoJ0 g1QhPHqbhSOxBL2lLanG0Sehj/cp1vl3EqbyioklGcn+kUCTSaIB/hl2Fo6o+I6L /xNoI/hekiW5KZsSDmxdcEtJJ1WwF/xcWdGE5VeOMWPGWCixj9vaV59kjJgkxjjL YrrznoWP2sbvtFork+BlP25L8Uc2kLd+zKSNDhU5aQhp4B6mJABFr4dUrtAsmmfJ rcfPYdskzd6td7t0D/P+ =Ypz5 -----END PGP SIGNATURE----- Linus Lüssing (3): batctl: Fix bisecting of OGMs with 32bit seqno batctl: Fix skipped substitutions of mac addresses with a following ', ' batctl: Fix substitution of mac addresses with a following ')' Marek Lindner (6): batctl: suppress bat-host parser warning when bat-hosts are to be ignored batctl: adding __packed linux kernel compat macro batctl: tcpdump - support LARGETAIL flag batctl: add raw wifi packet decapsulation support batctl: add raw wifi packet decapsulation support batctl: avoid error message when command was successful Simon Wunderlich (4): batctl: update copyright years batctl: Merge commits from master into next batctl: remove obsolete functions debufs_read/write() batctl: Merge commits from master into next Sven Eckelmann (10): batman-adv: Use "__attribute__" shortcut macros batman-adv: Calculate correct size for merged packets batman-adv: Update copyright years batctl: Merge batctl 2011.0.0 batctl: Start new development cycle batctl: add radiotap wifi packet decapsulation support batctl: add radiotap wifi packet decapsulation support batctl: Remove obsolete creation of source packages batctl: Remove subversion/svk revision information batctl: update version for release ----------------------------------------------------------------------- -- batctl

1 0

batman-adv; annotated tag, v2011.1.0, created. v2011.1.0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The annotated tag, v2011.1.0 has been created at 48dde297583a22cba55873cd57e322d42a690c54 (tag) tagging 3f9aa2885c3dba25e175bef606f412894d96a308 (commit) replaces v2011.0.0 tagged by Sven Eckelmann on Sun Apr 17 17:43:46 2011 +0200 - Shortlog ------------------------------------------------------------ batman-adv 2011.1.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJNqwqyAAoJEF2HCgfBJntGzR4P/RAafwup7lqREzDoAgyZ9x+o rDqWi/DaLEZKr2tTIDfYV4zz+AVTpRIVlLRdrmRjPr4F/oVzHMQhGZiDt5sJmL7i /n3moSLVVA6d8y3cPlt3tFM83fovu+4RwAnlK3CyfPrOGIigrtU/8PLyUevi8u0t 2W78KuT5fCcmrTcXdF3YsIfCJ9IVH2VCTR2mAnRlS72Oo3SrZ2zoLO18d0g4dA42 HGD7xb/exzBffpnmgtKFNb+3bI6Z7/EX/nZmXKa91xf+IElNMaSJMqYaZYBo3ZT/ TphD63cl2PE+dbh9C7bbUrh0eTiGF7Avcq1/BUVNCr0fXIrn212RcQUvICwGvW6s FKZUSmmh1qLw/g43sSMC4S6knwRf+/dcCR5nIHIZiQzVz+n5DazpYMX3NETx7n/V v3DfbvhaZwDue4/h9ZOjxQ0CRpjo3D5mf+U+tgTtrtWUiKoNb8hXaZsObrZP403J 8B56x11WAPW/AxK7+wjq2t4aabyyQH+IHRYc6BkU1ruUgEtDCoTUr8WNclsf9s4/ gHaDa4J1/lDL4beXr3jTOHu2oMMWAGW1VpoY3m4pi209PUYFQuGFlA2KdH2dEGc9 GfQbcxBWucMAcXqtkNVqRL8OXXpZzRTGkNl6JfOo9PgFYJLCv8myLuSR4fWr6xzE HLFlXvS7iscC+fDAZEeM =1uUR -----END PGP SIGNATURE----- Jesper Juhl (1): batman-adv: Remove two duplicate includes. Linus Lüssing (7): batman-adv: Remove duplicate types.h inclusions batman-adv: Switch order of types.h and compat.h inclusion batman-adv: Disallow originator addressing within mesh layer batman-adv: Make bat_priv->curr_gw an rcu protected pointer batman-adv: Increase orig_node refcount before releasing rcu read lock batman-adv: Fix possible buffer overflow in softif neigh list output batman-adv: Remove unused hdr_size variable in route_unicast_packet() Lucas De Marchi (1): batman-adv: Fix common misspellings Marek Lindner (21): batman-adv: protect neighbor nodes with reference counters batman-adv: convert neighbor list to hlist batman-adv: protect neighbor list with rcu locks batman-adv: free neighbors when an interface is deactivated batman-adv: protect neigh_nodes used outside of rcu_locks with refcounting batman-adv: protect each hash row with rcu locks batman-adv: protect originator nodes with reference counters batman-adv: protect ogm counter arrays with spinlock batman-adv: Correct rcu refcounting for neigh_node batman-adv: Correct rcu refcounting for gw_node batman-adv: Correct rcu refcounting for softif_neigh batman-adv: Correct rcu refcounting for batman_if batman-adv: protect bit operations to count OGMs with spinlock batman-adv: make broadcast seqno operations atomic batman-adv: separate ethernet comparing calls from hash functions batman-adv: remove extra layer between hash and hash element - hash bucket batman-adv: Correct rcu refcounting for orig_node batman-adv: increase refcount in create_neighbor to be consistent batman-adv: remove orig_hash spinlock batman-adv: rename global if_list to hardif_list batman-adv: rename batman_if struct to hard_iface Simon Wunderlich (1): batman-adv: protect bonding with rcu locks Sven Eckelmann (10): batman-adv: Start new development cycle batman-adv: Linearize fragment packets before merge batman-adv: Linearize fragment packets before merge batman-adv: Split combined variable declarations batman-adv: Use successive sequence numbers for fragments batman-adv: Disallow regular interface as mesh device Merge branch 'maint' into next batman-adv: Update README for upcoming release batman-adv: Add some initial notes in CHANGELOG for upcoming release batman-adv: update version for release Sylvestre Ledru (1): batman-adv: fix minor typos/spelling ----------------------------------------------------------------------- -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.0.0-42-g3f9aa28
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next branch: commit e54cf6322f7e0d360d327fb1bd625c0cdebb1456 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 7 20:51:17 2011 +0200 batman-adv: Update README for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 2c3de52..6aa36eb 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[state: 27-01-2011] +[state: 17-04-2011] BATMAN-ADV ---------- @@ -18,7 +18,7 @@ Batman advanced was implemented as a Linux kernel driver to re- duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles -against and should work with Linux 2.6.21 - 2.6.38. Supporting +against and should work with Linux 2.6.21 - 2.6.39. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.0.0-42-g3f9aa28
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next branch: commit 2ec44577a6a3d67a872f7459e40082434e4ee54e Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 7 20:53:01 2011 +0200 batman-adv: Add some initial notes in CHANGELOG for upcoming release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/CHANGELOG b/CHANGELOG index 6265828..0ec425e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,13 @@ +batman-adv 2011.1.0: + +* support latest kernels (2.6.21 - 2.6.39) +* cleanup of coding style +* removal of the big orig_hash lock and usage of fine grained locking +* many bug fixes (fragmented packets linearisation, fragments numbering, + verification of added interfaces, ...) + + -- Sat, Sun, 17 Apr 2011 17:41:53 +0200 + batman-adv 2011.0.0: * support latest kernels (2.6.21 - 2.6.38) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.0.0-42-g3f9aa28
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next branch: commit 3f9aa2885c3dba25e175bef606f412894d96a308 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 7 20:53:43 2011 +0200 batman-adv: update version for release Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index 8dcb0c2..d6a7b7d 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 "next" +#define SOURCE_VERSION "2011.1.0" /* B.A.T.M.A.N. parameters */ -- batman-adv

1 0

batctl; branch, next, updated. v2011.0.0-23-gf810f7d
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next 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

batman-adv; branch, master, updated. v2011.0.0-75-gdd7dbf2
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the master branch: commit dd7dbf2af5b6f67d543bfe17dddaa0722037f8b4 Author: Sylvestre Ledru <sylvestre.ledru(a)scilab.org> Date: Mon Apr 4 15:04:46 2011 -0700 batman-adv: fix minor typos/spelling Fix some minor typos: * informations => information Signed-off-by: Sylvestre Ledru <sylvestre.ledru(a)scilab.org> Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 85e4518..2c3de52 100644 --- a/README +++ b/README @@ -88,7 +88,7 @@ folder: # fragmentation gw_sel_class vis_mode -There is a special folder for debugging informations: +There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ # gateways socket transtable_global vis_data -- batman-adv

1 0

batctl; branch, next, updated. v2011.0.0-22-g6fd4ab7
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next 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

← 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