evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

6lowpan: udp use lowpan_push_hc_data function

Browse source 
This patch uses the lowpan_push_hc_data to generate iphc header.

The current implementation has some wrong pointer arithmetic issues and
works in a random case only.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Alexander Aring 2013-12-17 14:21:22 +01:00 • committed by Marcel Holtmann
parent 3109f2e28b
commit 5cede84c98
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
net/ieee802154/6lowpan_iphc.c
View file

@ -541,42 +541,45 @@ static u8 lowpan_compress_addr_64(u8 **hc06_ptr, u8 shift,
static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb) static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
{ {
struct udphdr *uh = udp_hdr(skb); struct udphdr *uh = udp_hdr(skb);
u8 tmp;
if (((uh->source & LOWPAN_NHC_UDP_4BIT_MASK) == if (((uh->source & LOWPAN_NHC_UDP_4BIT_MASK) ==
LOWPAN_NHC_UDP_4BIT_PORT) && LOWPAN_NHC_UDP_4BIT_PORT) &&
((uh->dest & LOWPAN_NHC_UDP_4BIT_MASK) == ((uh->dest & LOWPAN_NHC_UDP_4BIT_MASK) ==
LOWPAN_NHC_UDP_4BIT_PORT)) { LOWPAN_NHC_UDP_4BIT_PORT)) {
pr_debug("UDP header: both ports compression to 4 bits\n"); pr_debug("UDP header: both ports compression to 4 bits\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_11; tmp = LOWPAN_NHC_UDP_CS_P_11;
**(hc06_ptr + 1) = /* subtraction is faster */ lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
tmp = /* subtraction is faster */
(u8)((uh->dest - LOWPAN_NHC_UDP_4BIT_PORT) + (u8)((uh->dest - LOWPAN_NHC_UDP_4BIT_PORT) +
((uh->source & LOWPAN_NHC_UDP_4BIT_PORT) << 4)); ((uh->source & LOWPAN_NHC_UDP_4BIT_PORT) << 4));
*hc06_ptr += 2; lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
} else if ((uh->dest & LOWPAN_NHC_UDP_8BIT_MASK) == } else if ((uh->dest & LOWPAN_NHC_UDP_8BIT_MASK) ==
LOWPAN_NHC_UDP_8BIT_PORT) { LOWPAN_NHC_UDP_8BIT_PORT) {
pr_debug("UDP header: remove 8 bits of dest\n"); pr_debug("UDP header: remove 8 bits of dest\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_01; tmp = LOWPAN_NHC_UDP_CS_P_01;
memcpy(*hc06_ptr + 1, &uh->source, 2); lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
**(hc06_ptr + 3) = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT); lowpan_push_hc_data(hc06_ptr, &uh->source, sizeof(uh->source));
*hc06_ptr += 4; tmp = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT);
lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
} else if ((uh->source & LOWPAN_NHC_UDP_8BIT_MASK) == } else if ((uh->source & LOWPAN_NHC_UDP_8BIT_MASK) ==
LOWPAN_NHC_UDP_8BIT_PORT) { LOWPAN_NHC_UDP_8BIT_PORT) {
pr_debug("UDP header: remove 8 bits of source\n"); pr_debug("UDP header: remove 8 bits of source\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_10; tmp = LOWPAN_NHC_UDP_CS_P_10;
memcpy(*hc06_ptr + 1, &uh->dest, 2); lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
**(hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT); lowpan_push_hc_data(hc06_ptr, &uh->dest, sizeof(uh->dest));
*hc06_ptr += 4; tmp = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
} else { } else {
pr_debug("UDP header: can't compress\n"); pr_debug("UDP header: can't compress\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_00; tmp = LOWPAN_NHC_UDP_CS_P_00;
memcpy(*hc06_ptr + 1, &uh->source, 2); lowpan_push_hc_data(hc06_ptr, &tmp, sizeof(tmp));
memcpy(*hc06_ptr + 3, &uh->dest, 2); lowpan_push_hc_data(hc06_ptr, &uh->source, sizeof(uh->source));
*hc06_ptr += 5; lowpan_push_hc_data(hc06_ptr, &uh->dest, sizeof(uh->dest));
} }
/* checksum is always inline */ /* checksum is always inline */
memcpy(*hc06_ptr, &uh->check, 2); lowpan_push_hc_data(hc06_ptr, &uh->check, sizeof(uh->check));
*hc06_ptr += 2;
/* skip the UDP header */ /* skip the UDP header */
skb_pull(skb, sizeof(struct udphdr)); skb_pull(skb, sizeof(struct udphdr));