commits December 2013

commits@lists.open-mesh.org

1 participants
51 discussions

[batman-adv] next: Merge branch 'maint' into next (7678d5d)
by postmaster＠open-mesh.org 25 Dec '13

25 Dec '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 7678d5d34e9c96b041c3509810cf03bc8740e526 Merge: 6639da5 1356028 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Dec 25 22:12:00 2013 +0800 Merge branch 'maint' into next Conflicts: soft-interface.c >--------------------------------------------------------------- 7678d5d34e9c96b041c3509810cf03bc8740e526 soft-interface.c | 13 +++++-------- soft-interface.h | 16 ---------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --cc soft-interface.c index 74f4630,08086cf..875a702 --- a/soft-interface.c +++ b/soft-interface.c @@@ -346,7 -324,11 +346,12 @@@ void batadv_interface_rx(struct net_dev skb_pull_rcsum(skb, hdr_size); skb_reset_mac_header(skb); + /* clean the netfilter state now that the batman-adv header has been + * removed + */ + nf_reset(skb); + + vid = batadv_get_vid(skb, hdr_size); ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) { @@@ -387,20 -371,11 +392,12 @@@ if (orig_node) batadv_tt_add_temporary_global_entry(bat_priv, orig_node, - ethhdr->h_source); + ethhdr->h_source, vid); - if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) + if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest, + vid)) goto dropped; - /* Clean the netfilter state before delivering the skb. - * This packet may have traversed a bridge when it was encapsulated into - * the batman header. Now that the header has been removed, the - * netfilter state must be cleaned up to avoid to mess up with a - * possible second bridge - */ - batadv_nf_bridge_skb_free(skb); - netif_rx(skb); goto out; diff --cc soft-interface.h index 21b8573,2f2472c..06fc91f --- a/soft-interface.h +++ b/soft-interface.h @@@ -28,25 -28,5 +28,9 @@@ struct net_device *batadv_softif_create void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; +int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid); +void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan); +struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv, + unsigned short vid); - #ifdef CONFIG_BRIDGE_NETFILTER - /** - * batadv_nf_bridge_skb_free - clean the NF bridge data in an skb - * @skb: the skb which nf data has to be free'd - */ - static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) - { - nf_bridge_put(skb->nf_bridge); - skb->nf_bridge = NULL; - } - #else - static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) - { - } - #endif /* CONFIG_BRIDGE_NETFILTER */ - #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */

1 0

[batctl] master: Merge branch 'next' (98fdad4)
by postmaster＠open-mesh.org 23 Dec '13

23 Dec '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 98fdad4ab2e554bce9f5ff6eaa9a0de96c191f28 Merge: 62f254a 35b3775 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Dec 23 20:27:20 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 98fdad4ab2e554bce9f5ff6eaa9a0de96c191f28 tcpdump.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 187 insertions(+), 45 deletions(-)

1 0

[batctl] master's head updated: Merge branch 'next' (98fdad4)
by postmaster＠open-mesh.org 23 Dec '13

23 Dec '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 35b3775 add IPv6 support to tcpdump parser 98fdad4 Merge branch 'next'

1 0

[batctl] next: add IPv6 support to tcpdump parser (35b3775)
by postmaster＠open-mesh.org 23 Dec '13

23 Dec '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 35b37756f4a3a230bf7941034d9da178ee5b4948 Author: Marco Dalla Torre <marco.dallato(a)gmail.com> Date: Mon Sep 23 11:52:44 2013 +0200 add IPv6 support to tcpdump parser Extends 'tcpdump' functionality in 'batctl' to parse and report IPv6 communications. 'batctl' now recognizes TCP, UDP packets and the most common ICMPv6 packet types: -ECHO request and ECHO reply -unreachable destination and subcases -time exceeded -neighbor discovery protocol 'solicit' and 'advert' TCP and UDP parsing code has been moved from the IPv4 specific codepath to separate functions in order to allow reuse regardless the underlying protocol. Signed-off-by: Marco Dalla Torre <marco.dallato(a)gmail.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 35b37756f4a3a230bf7941034d9da178ee5b4948 tcpdump.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 187 insertions(+), 45 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 3c9ece5..612fdaf 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -32,9 +32,11 @@ #include <net/if_arp.h> #include <netinet/in.h> #include <netinet/ip.h> +#include <netinet/ip6.h> #include <netinet/tcp.h> #include <netinet/udp.h> #include <netinet/ip_icmp.h> +#include <netinet/icmp6.h> #include <netinet/if_ether.h> #include <net/ethernet.h> #include <stddef.h> @@ -51,6 +53,8 @@ #define ETH_P_BATMAN 0x4305 #endif /* ETH_P_BATMAN */ +#define IPV6_MIN_MTU 1280 + #define LEN_CHECK(buff_len, check_len, desc) \ if ((size_t)(buff_len) < (check_len)) { \ fprintf(stderr, "Warning - dropping received %s packet as it is smaller than expected (%zu): %zu\n", \ @@ -192,13 +196,181 @@ static void dump_arp(unsigned char *packet_buff, ssize_t buff_len, } } -static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_printed) +static void dump_tcp(const char ip_string[], unsigned char *packet_buff, + ssize_t buff_len, size_t ip6_header_len, char *src_addr, + char *dst_addr) { - struct iphdr *iphdr, *tmp_iphdr; + uint16_t tcp_header_len; struct tcphdr *tcphdr; - struct udphdr *udphdr, *tmp_udphdr; + + LEN_CHECK((size_t)buff_len - ip6_header_len, + sizeof(struct tcphdr), "TCP"); + tcphdr = (struct tcphdr *)(packet_buff + ip6_header_len); + tcp_header_len = tcphdr->doff * 4; + printf("%s %s.%i > ", ip_string, src_addr, ntohs(tcphdr->source)); + printf("%s.%i: TCP, Flags [%c%c%c%c%c%c], length %zu\n", + dst_addr, ntohs(tcphdr->dest), + (tcphdr->fin ? 'F' : '.'), (tcphdr->syn ? 'S' : '.'), + (tcphdr->rst ? 'R' : '.'), (tcphdr->psh ? 'P' : '.'), + (tcphdr->ack ? 'A' : '.'), (tcphdr->urg ? 'U' : '.'), + (size_t)buff_len - ip6_header_len - tcp_header_len); +} + +static void dump_udp(const char ip_string[], unsigned char *packet_buff, + ssize_t buff_len, size_t ip6_header_len, char *src_addr, + char *dst_addr) +{ + struct udphdr *udphdr; + + LEN_CHECK((size_t)buff_len - ip6_header_len, sizeof(struct udphdr), + "UDP"); + udphdr = (struct udphdr *)(packet_buff + ip6_header_len); + printf("%s %s.%i > ", ip_string, src_addr, ntohs(udphdr->source)); + + switch (ntohs(udphdr->dest)) { + case 67: + LEN_CHECK((size_t)buff_len - ip6_header_len - + sizeof(struct udphdr), (size_t) 44, "DHCP"); + printf("%s.67: BOOTP/DHCP, Request from %s, length %zu\n", + dst_addr, + ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + + sizeof(struct udphdr) + 28)), + (size_t)buff_len - ip6_header_len - + sizeof(struct udphdr)); + break; + case 68: + printf("%s.68: BOOTP/DHCP, Reply, length %zu\n", dst_addr, + (size_t)buff_len - ip6_header_len - + sizeof(struct udphdr)); + break; + default: + printf("%s.%i: UDP, length %zu\n", dst_addr, + ntohs(udphdr->dest), + (size_t)buff_len - ip6_header_len - + sizeof(struct udphdr)); + break; + } +} + +static void dump_ipv6(unsigned char *packet_buff, ssize_t buff_len, + int time_printed) +{ + struct ip6_hdr *iphdr; + struct icmp6_hdr *icmphdr; + + char ipv6_addr_src[40], ipv6_addr_dst[40]; + char ip_saddr[40], ip_daddr[40], nd_nas_target[40]; + struct nd_neighbor_solicit *nd_neigh_sol; + struct nd_neighbor_advert *nd_advert; + const char ip_string[] = "IP6"; + + iphdr = (struct ip6_hdr *)packet_buff; + LEN_CHECK((size_t)buff_len, (size_t)(sizeof(struct ip6_hdr)), "IP6"); + + if (!time_printed) + print_time(); + + inet_ntop(AF_INET6, &(iphdr->ip6_src), ipv6_addr_src, 40); + inet_ntop(AF_INET6, &(iphdr->ip6_dst), ipv6_addr_dst, 40); + + switch (iphdr->ip6_nxt) { + case IPPROTO_ICMPV6: + LEN_CHECK((size_t)buff_len - (size_t)(sizeof(struct ip6_hdr)), + sizeof(struct icmp6_hdr), "ICMPv6"); + icmphdr = (struct icmp6_hdr *)(packet_buff + + sizeof(struct ip6_hdr)); + + printf("IP6 %s > %s ", ipv6_addr_src, ipv6_addr_dst); + if (icmphdr->icmp6_type < ICMP6_INFOMSG_MASK && + (size_t)(buff_len) > IPV6_MIN_MTU) { + fprintf(stderr, + "Warning - dropping received 'ICMPv6 destination unreached' packet as it is bigger than maximum allowed size (%u): %zu\n", + IPV6_MIN_MTU, (size_t)(buff_len)); + return; + } + + printf("ICMP6"); + switch (icmphdr->icmp6_type) { + case ICMP6_DST_UNREACH: + switch (icmphdr->icmp6_code) { + case ICMP6_DST_UNREACH_NOROUTE: + printf(", unreachable route\n"); + break; + case ICMP6_DST_UNREACH_ADMIN: + printf(", unreachable prohibited\n"); + break; + case ICMP6_DST_UNREACH_ADDR: + printf(", unreachable address\n"); + break; + case ICMP6_DST_UNREACH_BEYONDSCOPE: + printf(", beyond scope\n"); + break; + case ICMP6_DST_UNREACH_NOPORT: + printf(", unreachable port\n"); + break; + default: + printf(", unknown unreach code (%u)\n", + icmphdr->icmp6_code); + } + break; + case ICMP6_ECHO_REQUEST: + printf(" echo request, id: %d, seq: %d, length: %hu\n", + icmphdr->icmp6_id, icmphdr->icmp6_seq, + iphdr->ip6_plen); + break; + case ICMP6_ECHO_REPLY: + printf(" echo reply, id: %d, seq: %d, length: %hu\n", + icmphdr->icmp6_id, icmphdr->icmp6_seq, + iphdr->ip6_plen); + break; + case ICMP6_TIME_EXCEEDED: + printf(" time exceeded in-transit, length %zu\n", + (size_t)buff_len - sizeof(struct icmp6_hdr)); + break; + case ND_NEIGHBOR_SOLICIT: + nd_neigh_sol = (struct nd_neighbor_solicit *)icmphdr; + inet_ntop(AF_INET6, &(nd_neigh_sol->nd_ns_target), + nd_nas_target, 40); + printf(" neighbor solicitation, who has %s, length %zd\n", + nd_nas_target, buff_len); + break; + case ND_NEIGHBOR_ADVERT: + nd_advert = (struct nd_neighbor_advert *)icmphdr; + inet_ntop(AF_INET6, &(nd_advert->nd_na_target), + nd_nas_target, 40); + printf(" neighbor advertisement, tgt is %s, length %zd\n", + nd_nas_target, buff_len); + break; + default: + printf(", destination unreachable, unknown icmp6 type (%u)\n", + icmphdr->icmp6_type); + break; + } + break; + case IPPROTO_TCP: + inet_ntop(AF_INET6, &(iphdr->ip6_src), ip_saddr, 40); + inet_ntop(AF_INET6, &(iphdr->ip6_dst), ip_daddr, 40); + dump_tcp(ip_string, packet_buff, buff_len, + sizeof(struct ip6_hdr), ip_saddr, ip_daddr); + break; + case IPPROTO_UDP: + inet_ntop(AF_INET6, &(iphdr->ip6_src), ip_saddr, 40); + inet_ntop(AF_INET6, &(iphdr->ip6_dst), ip_daddr, 40); + dump_udp(ip_string, packet_buff, buff_len, + sizeof(struct ip6_hdr), ip_saddr, ip_daddr); + break; + default: + printf(" IPv6 unknown protocol: %i\n", iphdr->ip6_nxt); + } +} + +static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, + int time_printed) +{ + struct iphdr *iphdr, *tmp_iphdr; + struct udphdr *tmp_udphdr; struct icmphdr *icmphdr; - uint16_t tcp_header_len; + const char ip_string[] = "IP"; iphdr = (struct iphdr *)packet_buff; LEN_CHECK((size_t)buff_len, (size_t)(iphdr->ihl * 4), "IP"); @@ -259,51 +431,16 @@ static void dump_ip(unsigned char *packet_buff, ssize_t buff_len, int time_print (size_t)buff_len - (iphdr->ihl * 4)); break; } - break; case IPPROTO_TCP: - tcphdr = (struct tcphdr *)(packet_buff + (iphdr->ihl * 4)); - tcp_header_len = tcphdr->doff * 4; - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4), - (size_t)tcp_header_len, "TCP"); - - printf("IP %s.%i > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr), ntohs(tcphdr->source)); - printf("%s.%i: TCP, flags [%c%c%c%c%c%c], length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(tcphdr->dest), - (tcphdr->fin ? 'F' : '.'), (tcphdr->syn ? 'S' : '.'), - (tcphdr->rst ? 'R' : '.'), (tcphdr->psh ? 'P' : '.'), - (tcphdr->ack ? 'A' : '.'), (tcphdr->urg ? 'U' : '.'), - (size_t)buff_len - (iphdr->ihl * 4) - tcp_header_len); + dump_tcp(ip_string, packet_buff, buff_len, iphdr->ihl * 4, + inet_ntoa(*(struct in_addr *)&iphdr->saddr), + inet_ntoa(*(struct in_addr *)&iphdr->daddr)); break; case IPPROTO_UDP: - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4), sizeof(struct udphdr), "UDP"); - - udphdr = (struct udphdr *)(packet_buff + (iphdr->ihl * 4)); - printf("IP %s.%i > ", inet_ntoa(*(struct in_addr *)&iphdr->saddr), ntohs(udphdr->source)); - - switch (ntohs(udphdr->dest)) { - case 67: - LEN_CHECK((size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr), (size_t) 44, "DHCP"); - printf("%s.67: BOOTP/DHCP, Request from %s, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - ether_ntoa_long((struct ether_addr *)(((char *)udphdr) + sizeof(struct udphdr) + 28)), - (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); - break; - case 68: - printf("%s.68: BOOTP/DHCP, Reply, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), - (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); - break; - default: - printf("%s.%i: UDP, length %zu\n", - inet_ntoa(*(struct in_addr *)&iphdr->daddr), ntohs(udphdr->dest), - (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); - break; - } - - break; - case IPPROTO_IPV6: - printf("IP6: not implemented yet\n"); + dump_udp(ip_string, packet_buff, buff_len, iphdr->ihl * 4, + inet_ntoa(*(struct in_addr *)&iphdr->saddr), + inet_ntoa(*(struct in_addr *)&iphdr->daddr)); break; default: printf("IP unknown protocol: %i\n", iphdr->protocol); @@ -499,6 +636,11 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) dump_ip(packet_buff + ETH_HLEN, buff_len - ETH_HLEN, time_printed); break; + case ETH_P_IPV6: + if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) + dump_ipv6(packet_buff + ETH_HLEN, buff_len - ETH_HLEN, + time_printed); + break; case ETH_P_8021Q: if ((dump_level & DUMP_TYPE_NONBAT) || (time_printed)) dump_vlan(packet_buff, buff_len, read_opt, time_printed);

1 0

[batman-adv] maint: batman-adv: clean nf state when removing protocol header (1356028)
by postmaster＠open-mesh.org 23 Dec '13

23 Dec '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 135602880b28bc7cf12c60fec550a6122851f2e9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Dec 23 01:28:05 2013 +0100 batman-adv: clean nf state when removing protocol header If an interface enslaved into batman-adv is a bridge (or a virtual interface built on top of a bridge) the nf_bridge member of the skbs reaching the soft-interface is filled with the state about "netfilter bridge" operations. Then, if one of such skbs is locally delivered, the nf_bridge member should be cleaned up to avoid that the old state could mess up with other "netfilter bridge" operations when entering a second bridge. This is needed because batman-adv is an encapsulation protocol. However at the moment skb->nf_bridge is not released at all leading to bogus "netfilter bridge" behaviours. Fix this by cleaning the netfilter state of the skb before it gets delivered to the upper layer in interface_rx(). Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 135602880b28bc7cf12c60fec550a6122851f2e9 soft-interface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/soft-interface.c b/soft-interface.c index 33b6144..08086cf 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -324,6 +324,11 @@ void batadv_interface_rx(struct net_device *soft_iface, skb_pull_rcsum(skb, hdr_size); skb_reset_mac_header(skb); + /* clean the netfilter state now that the batman-adv header has been + * removed + */ + nf_reset(skb); + ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) {

1 0

[batman-adv] maint: Revert "batman-adv: free nf_bridge member on locally delivered skb" (96bd723)
by postmaster＠open-mesh.org 23 Dec '13

23 Dec '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 96bd7236a4dac51fa03f49679b47708825c36674 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Dec 23 01:28:04 2013 +0100 Revert "batman-adv: free nf_bridge member on locally delivered skb" This reverts commit 9048eb62124f47f66d12eb1d706ab5fb265553f7. This fix can be implemented using the nf_Reset() helper instead of partly reimplementing it with a batman-adv private function. Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 96bd7236a4dac51fa03f49679b47708825c36674 soft-interface.c | 8 -------- soft-interface.h | 16 ---------------- 2 files changed, 24 deletions(-) diff --git a/soft-interface.c b/soft-interface.c index 5dd1247..33b6144 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -371,14 +371,6 @@ void batadv_interface_rx(struct net_device *soft_iface, if (batadv_is_ap_isolated(bat_priv, ethhdr->h_source, ethhdr->h_dest)) goto dropped; - /* Clean the netfilter state before delivering the skb. - * This packet may have traversed a bridge when it was encapsulated into - * the batman header. Now that the header has been removed, the - * netfilter state must be cleaned up to avoid to mess up with a - * possible second bridge - */ - batadv_nf_bridge_skb_free(skb); - netif_rx(skb); goto out; diff --git a/soft-interface.h b/soft-interface.h index 5c19c42..2f2472c 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -29,20 +29,4 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface); int batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; -#ifdef CONFIG_BRIDGE_NETFILTER -/** - * batadv_nf_bridge_skb_free - clean the NF bridge data in an skb - * @skb: the skb which nf data has to be free'd - */ -static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) -{ - nf_bridge_put(skb->nf_bridge); - skb->nf_bridge = NULL; -} -#else -static inline void batadv_nf_bridge_skb_free(struct sk_buff *skb) -{ -} -#endif /* CONFIG_BRIDGE_NETFILTER */ - #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */

1 0

[linux-merge]linux integration; annotated tag, v3.13-rc5, created. v3.13-rc5
by postmaster＠open-mesh.org 22 Dec '13

22 Dec '13

The annotated tag, v3.13-rc5 has been created at 5be6b0c63d1d45c8ad134b19053aaf79e9161218 (tag) tagging 413541dd66d51f791a0b169d9b9014e4f56be13c (commit) replaces v3.13-rc4 tagged by Linus Torvalds on Sun Dec 22 13:08:40 2013 -0800 - Shortlog ------------------------------------------------------------ Linux 3.13-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQEcBAABAgAGBQJSt1TYAAoJEHm+PkMAQRiGvWgH/iWg8TmEWz4KUKuHthuUi0uh 9+2YDN+4k577Xa0obaG24giQeqkCdxMr3oJrS3FO9jeAmaNRHEGhxUPneisb7RtN 9jIVsz5bPa9/DcK9nqtaUQdvA0O5AWTE6AAPmwleTVy+8CygBo987T2uGELnQCSR FrKCrMePc7Pj0uthMVXrpJ17Ffm/j7jkfRtPhrxHJyngh3jEux+tPbpynH/aKuO2 47unsSQimoFk7n2SPFvNu3E/vZE2xVbu5SH9MCl5yyiCifFjpi3B71LV/FW51lvm cK8Jzn2BmYDygRFjnZfq4zJHqYJCBHzpjCLWmR37Dm/JS91aGq3+Cg0stDP8UTs= =+Hcn -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 18 Dec '13

18 Dec '13

The annotated tag, batman-adv-fix-for-davem has been updated to c8c96e19a066e131816aa1ef806e5ba75b129146 (tag) from 4f1ee5e0e58feeaa9776a01dc743acc95e0c7030 (which is now obsolete) tagging 128cfa6a586154581ce1b891baf929810117a82a (commit) replaces v3.13-rc4 tagged by Antonio Quartulli on Thu Dec 19 00:27:52 2013 +0100 - Shortlog ------------------------------------------------------------ Included changes: - release skb->nf_bridge when removing the batman-adv header from an incoming packet. This prevents netfilter bridge from being fooled when the same packet enters a bridge twice (or more): the first time within the batman-adv header and the second time without. - adjust the packet layout to prevent any architecture from adding padding bytes. All the structs sent over the wire now have size multiple of 4bytes (unless pack(2) is used). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJSsjC5AAoJEEKTMo6mOh1VsssQAIN7/BBvZIUEQPGeDUrJvhur /tQ7ixGlkkeKqAciUd8ix1jhwVlfe5lbQCDP4fFBei2oeo7TzOQH6CMR3PM1ptUI O8Yx6gWRQBjH5i5pmTrwFY29FblaPPHmcnQ6lkXnuALTsrxlpyYKw1CHQWGFNm/A 4f+RAMeDcv5+5ASluyLm6cT+tyUSpnD+hIVJ+3d8aviHdX4SCpklq+amgfRKG5ms EXXitAD8qheHa53AZ5n8KHiUhvuqPW3gWKzUyYOLrmyADlpx1f9bHRNcGkhKWXex mnyGAgihTxuo924sTnAvVwwCJwJsD6gffqg/8C4tb7KhmljlyWZqe5xJpyZfoiw1 3Eu48myc0IxNdzG6I9pNyA94iGsCYmn/twmchDMb4bgohUvkDxKRLa6NMV1Gj4Mf JvQTvRoMvxgORX0aMc20uNALaBKbfGL5zpBFpiMu3MG8CvN+Cjyo78pRa0BpqY7c ZmJS122tb4tFexOW37ElC5loFsO7wkoEXZHUnZF+53dKysJ25mdg6feS80SYofh2 vlvi6Ix+VKS5T9o5XkJ6O7vLEoGhhIZBWF2l4JnHVELiboc1AqXORd+4YziAUOBP K88D0gYuZb6iaP9IyVQNeFbd2T/fd1opcvoQuKhaOeLH3wA43pMWKM095HlpwsXu 5atvTadichNoT7aUZQVb =7nv6 -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: free nf_bridge member on locally delivered skb batman-adv: fix size of batadv_icmp_header batman-adv: fix alignment for batadv_tvlv_tt_change Simon Wunderlich (3): batman-adv: fix alignment for batadv_coded_packet batman-adv: fix header alignment by unrolling batadv_header batman-adv: fix size of batadv_bla_claim_dst ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master: Merge branch 'next' (62f254a)
by postmaster＠open-mesh.org 18 Dec '13

18 Dec '13

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 62f254a03759d59d7d3e58789229c37882f9119d Merge: 21284c8 855f190 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Dec 18 23:35:54 2013 +0800 Merge branch 'next' >--------------------------------------------------------------- 62f254a03759d59d7d3e58789229c37882f9119d packet.h | 124 ++++++++++++++++++++++++++++++++++++++++++++-------------- ping.c | 19 +++++---- tcpdump.c | 37 ++++++++---------- traceroute.c | 29 +++++++------- 4 files changed, 133 insertions(+), 76 deletions(-)

1 0

[batctl] master's head updated: Merge branch 'next' (62f254a)
by postmaster＠open-mesh.org 18 Dec '13

18 Dec '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: fafc181 batctl: fix alignment for batadv_coded_packet 27aa24c batctl: fix header alignment by unrolling batadv_header 499d0a2 batctl: fix size of batadv_icmp_header 2411325 batctl: fix size of batadv_bla_claim_dst 855f190 batctl: fix alignment for batadv_tvlv_tt_change 62f254a Merge branch 'next'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2013