7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix data channel fragmentation

Browse Source
This commit is contained in:
vemax78 2014-12-28 20:49:21 +01:00
parent 0c27172ca6
commit 21ffd7cd23
6 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/ac.conf
View File

@ -68,7 +68,7 @@ application: {
#binding = "eth1"; #binding = "eth1";
#listen = ""; #listen = "";
transport = "udp"; transport = "udp";
mtu = 1500; mtu = 1400;
}; };
}; };

2
conf/wtp.conf
View File

@ -121,7 +121,7 @@ application: {
#listen = ""; #listen = "";
#port = 0; #port = 0;
transport = "udp"; transport = "udp";
mtu = 1500; mtu = 1400;
}; };
acdiscovery: { acdiscovery: {

58
src/ac/kmod/capwap.c
View File

@ -8,9 +8,6 @@
#include "nlsmartcapwap.h" #include "nlsmartcapwap.h"
#include "netlinkapp.h" #include "netlinkapp.h"
/* */
#define TIMEOUT_PACKET 10
/* */ /* */
union capwap_addr sc_localaddr; union capwap_addr sc_localaddr;
@ -41,26 +38,20 @@ static void sc_capwap_fragment_free(struct sc_capwap_fragment* fragment) {
static void sc_capwap_defrag_evictor(struct sc_capwap_session* session, ktime_t now) { static void sc_capwap_defrag_evictor(struct sc_capwap_session* session, ktime_t now) {
ktime_t delta; ktime_t delta;
struct sc_capwap_fragment* fragment; struct sc_capwap_fragment* fragment;
struct list_head* list = &session->fragments.lru_list;
TRACEKMOD("### sc_capwap_defrag_evictor\n"); TRACEKMOD("### sc_capwap_defrag_evictor\n");
/* */ /* Light check without lock */
if (now.tv64 == 0) { if (!list_empty(list)) {
TRACEKMOD("*** Get time\n");
now = ktime_get();
}
/* Remove last old fragment */
if (!list_empty(&session->fragments.lru_list)) {
spin_lock(&session->fragments.lock); spin_lock(&session->fragments.lock);
fragment = list_first_entry(&session->fragments.lru_list, struct sc_capwap_fragment, lru_list); /* Remove last old fragment */
if (fragment) { if (!list_empty(list)) {
fragment = list_first_entry(list, struct sc_capwap_fragment, lru_list);
delta = ktime_sub(now, fragment->tstamp); delta = ktime_sub(now, fragment->tstamp);
if ((delta.tv64 < 0) || (delta.tv64 > NSEC_PER_SEC)) { if ((delta.tv64 < 0) || (delta.tv64 > NSEC_PER_SEC)) {
TRACEKMOD("*** Expired fragment %hu\n", fragment->fragmentid); TRACEKMOD("*** Expired fragment %hu\n", fragment->fragmentid);
/* Reset fragment */
sc_capwap_fragment_free(fragment); sc_capwap_fragment_free(fragment);
} }
} }
@ -77,6 +68,8 @@ static struct sk_buff* sc_capwap_reasm(struct sc_capwap_fragment* fragment) {
struct sk_buff* skbfrag; struct sk_buff* skbfrag;
struct sc_capwap_header* header; struct sc_capwap_header* header;
TRACEKMOD("### sc_capwap_reasm\n");
/* */ /* */
skbfrag = fragment->fragments; skbfrag = fragment->fragments;
len = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4; len = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4;
@ -89,7 +82,7 @@ static struct sk_buff* sc_capwap_reasm(struct sc_capwap_fragment* fragment) {
/* The first capwap header is header of reassembled packet without fragment field */ /* The first capwap header is header of reassembled packet without fragment field */
header = (struct sc_capwap_header*)skb_put(skb, len); header = (struct sc_capwap_header*)skb_put(skb, len);
memcpy(header, skb->data, len); memcpy(header, skbfrag->data, len);
SET_FLAG_F_HEADER(header, 0); SET_FLAG_F_HEADER(header, 0);
SET_FLAG_L_HEADER(header, 0); SET_FLAG_L_HEADER(header, 0);
@ -99,13 +92,17 @@ static struct sk_buff* sc_capwap_reasm(struct sc_capwap_fragment* fragment) {
/* Copy body */ /* Copy body */
while (skbfrag) { while (skbfrag) {
offset = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4; offset = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4;
len = skb->len - offset; len = skbfrag->len - offset;
TRACEKMOD("*** Append fragment size %d\n", len);
/* */ /* */
memcpy(skb_put(skb, len), skb->data + offset, len); memcpy(skb_put(skb, len), skbfrag->data + offset, len);
skbfrag = skbfrag->next; skbfrag = skbfrag->next;
} }
TRACEKMOD("*** Assemblate capwap data packet with total size %d\n", skb->len);
return skb; return skb;
} }
@ -139,10 +136,12 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
/* */ /* */
spin_lock(&session->fragments.lock); spin_lock(&session->fragments.lock);
TRACEKMOD("*** Fragment info: id %hu offset %hu length %hu\n", frag_id, cb->frag_offset, cb->frag_length);
/* Get fragment */ /* Get fragment */
fragment = &session->fragments.queues[frag_id % CAPWAP_FRAGMENT_QUEUE]; fragment = &session->fragments.queues[frag_id % CAPWAP_FRAGMENT_QUEUE];
if ((fragment->flags & CAPWAP_FRAGMENT_ENABLE) && (fragment->fragmentid != frag_id)) { if ((fragment->flags & CAPWAP_FRAGMENT_ENABLE) && (fragment->fragmentid != frag_id)) {
TRACEKMOD("*** Unable defrag, queue fragment busy\n");
goto error2; /* Queue fragment busy*/ goto error2; /* Queue fragment busy*/
} }
@ -162,10 +161,11 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
if (!prev) { if (!prev) {
next = NULL; next = NULL;
} else if (CAPWAP_SKB_CB(prev)->frag_offset < cb->frag_offset) { } else if (CAPWAP_SKB_CB(prev)->frag_offset < cb->frag_offset) {
if ((CAPWAP_SKB_CB(prev)->frag_offset + CAPWAP_SKB_CB(prev)->frag_length) < cb->frag_offset) { if ((CAPWAP_SKB_CB(prev)->frag_offset + CAPWAP_SKB_CB(prev)->frag_length) <= cb->frag_offset) {
next = NULL; next = NULL;
} else { } else {
sc_capwap_fragment_free(fragment); sc_capwap_fragment_free(fragment);
TRACEKMOD("*** Unable defrag, overlap error\n");
goto error2; /* Overlap error */ goto error2; /* Overlap error */
} }
} else { } else {
@ -174,10 +174,11 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
struct sc_skb_capwap_cb* next_cb = CAPWAP_SKB_CB(next); struct sc_skb_capwap_cb* next_cb = CAPWAP_SKB_CB(next);
if (next_cb->frag_offset < cb->frag_offset) { if (next_cb->frag_offset < cb->frag_offset) {
if ((next_cb->frag_offset + next_cb->frag_length) < cb->frag_offset) { if ((next_cb->frag_offset + next_cb->frag_length) <= cb->frag_offset) {
break; break;
} else { } else {
sc_capwap_fragment_free(fragment); sc_capwap_fragment_free(fragment);
TRACEKMOD("*** Unable defrag, overlap error\n");
goto error2; /* Overlap error */ goto error2; /* Overlap error */
} }
} }
@ -215,9 +216,6 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
} else { } else {
/* Update timeout */ /* Update timeout */
fragment->tstamp = skb->tstamp; fragment->tstamp = skb->tstamp;
if (fragment->tstamp.tv64 == 0) {
fragment->tstamp = ktime_get();
}
/* Set LRU timeout */ /* Set LRU timeout */
if (!list_is_last(&fragment->lru_list, &session->fragments.lru_list)) { if (!list_is_last(&fragment->lru_list, &session->fragments.lru_list)) {
@ -225,6 +223,7 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
} }
} }
TRACEKMOD("*** Fragment id %hu added\n", frag_id);
spin_unlock(&session->fragments.lock); spin_unlock(&session->fragments.lock);
return skb_defrag; return skb_defrag;
@ -507,11 +506,6 @@ int sc_capwap_parsingpacket(struct sc_capwap_session* session, const union capwa
return -EINVAL; /* Accept only plain packet */ return -EINVAL; /* Accept only plain packet */
} }
/* Cleaning old fragments */
if (session) {
sc_capwap_defrag_evictor(session, skb->tstamp);
}
/* */ /* */
if (IS_FLAG_K_HEADER(header)) { if (IS_FLAG_K_HEADER(header)) {
/* Keep alive can not fragment */ /* Keep alive can not fragment */
@ -576,6 +570,14 @@ int sc_capwap_parsingpacket(struct sc_capwap_session* session, const union capwa
headersize -= msglength; headersize -= msglength;
} }
} else if (session) { } else if (session) {
if (!skb->tstamp.tv64) {
skb->tstamp = ktime_get();
}
/* Cleaning old fragments */
sc_capwap_defrag_evictor(session, skb->tstamp);
/* */
if (IS_FLAG_F_HEADER(header)) { if (IS_FLAG_F_HEADER(header)) {
skb = sc_capwap_defrag(session, skb); skb = sc_capwap_defrag(session, skb);
if (!skb) { if (!skb) {

3
src/ac/kmod/capwap_private.c
View File

@ -339,6 +339,7 @@ static void sc_capwap_sendpacket_iface(struct sc_capwap_station* station, struct
/* Send packet */ /* Send packet */
netif_rx_ni(skb); netif_rx_ni(skb);
TRACEKMOD("*** Send packet with size %d to interface %s\n", skb->len, devpriv->dev->name);
/* Update stats */ /* Update stats */
spin_lock(&devpriv->lock); spin_lock(&devpriv->lock);
@ -761,7 +762,7 @@ void sc_capwap_recvpacket(struct sk_buff* skb) {
pos = sc_session_threads_pos; pos = sc_session_threads_pos;
spin_unlock(&sc_session_threads_lock); spin_unlock(&sc_session_threads_lock);
TRACEKMOD("*** Add packet to thread: %u\n", pos); TRACEKMOD("*** Add packet (flags 0x%04x size %d) to thread: %u\n", (int)CAPWAP_SKB_CB(skb)->flags, (int)skb->len, pos);
/* Queue packet */ /* Queue packet */
skb_queue_tail(&sc_session_threads[pos].queue, skb); skb_queue_tail(&sc_session_threads[pos].queue, skb);

2
src/ac/kmod/config.h
View File

@ -4,7 +4,7 @@
#define DEBUGKMOD 1 #define DEBUGKMOD 1
#ifdef DEBUGKMOD #ifdef DEBUGKMOD
#define TRACEKMOD(s, args...) printk(s, ##args) #define TRACEKMOD(s, args...) printk("(%d) " s, smp_processor_id(), ##args)
#else #else
#define TRACEKMOD(s, args...) #define TRACEKMOD(s, args...)
#endif #endif

58
src/wtp/kmod/capwap.c
View File

@ -8,9 +8,6 @@
#include "nlsmartcapwap.h" #include "nlsmartcapwap.h"
#include "netlinkapp.h" #include "netlinkapp.h"
/* */
#define TIMEOUT_PACKET 10
/* */ /* */
union capwap_addr sc_localaddr; union capwap_addr sc_localaddr;
@ -41,26 +38,20 @@ static void sc_capwap_fragment_free(struct sc_capwap_fragment* fragment) {
static void sc_capwap_defrag_evictor(struct sc_capwap_session* session, ktime_t now) { static void sc_capwap_defrag_evictor(struct sc_capwap_session* session, ktime_t now) {
ktime_t delta; ktime_t delta;
struct sc_capwap_fragment* fragment; struct sc_capwap_fragment* fragment;
struct list_head* list = &session->fragments.lru_list;
TRACEKMOD("### sc_capwap_defrag_evictor\n"); TRACEKMOD("### sc_capwap_defrag_evictor\n");
/* */ /* Light check without lock */
if (now.tv64 == 0) { if (!list_empty(list)) {
TRACEKMOD("*** Get time\n");
now = ktime_get();
}
/* Remove last old fragment */
if (!list_empty(&session->fragments.lru_list)) {
spin_lock(&session->fragments.lock); spin_lock(&session->fragments.lock);
fragment = list_first_entry(&session->fragments.lru_list, struct sc_capwap_fragment, lru_list); /* Remove last old fragment */
if (fragment) { if (!list_empty(list)) {
fragment = list_first_entry(list, struct sc_capwap_fragment, lru_list);
delta = ktime_sub(now, fragment->tstamp); delta = ktime_sub(now, fragment->tstamp);
if ((delta.tv64 < 0) || (delta.tv64 > NSEC_PER_SEC)) { if ((delta.tv64 < 0) || (delta.tv64 > NSEC_PER_SEC)) {
TRACEKMOD("*** Expired fragment %hu\n", fragment->fragmentid); TRACEKMOD("*** Expired fragment %hu\n", fragment->fragmentid);
/* Reset fragment */
sc_capwap_fragment_free(fragment); sc_capwap_fragment_free(fragment);
} }
} }
@ -77,6 +68,8 @@ static struct sk_buff* sc_capwap_reasm(struct sc_capwap_fragment* fragment) {
struct sk_buff* skbfrag; struct sk_buff* skbfrag;
struct sc_capwap_header* header; struct sc_capwap_header* header;
TRACEKMOD("### sc_capwap_reasm\n");
/* */ /* */
skbfrag = fragment->fragments; skbfrag = fragment->fragments;
len = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4; len = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4;
@ -89,7 +82,7 @@ static struct sk_buff* sc_capwap_reasm(struct sc_capwap_fragment* fragment) {
/* The first capwap header is header of reassembled packet without fragment field */ /* The first capwap header is header of reassembled packet without fragment field */
header = (struct sc_capwap_header*)skb_put(skb, len); header = (struct sc_capwap_header*)skb_put(skb, len);
memcpy(header, skb->data, len); memcpy(header, skbfrag->data, len);
SET_FLAG_F_HEADER(header, 0); SET_FLAG_F_HEADER(header, 0);
SET_FLAG_L_HEADER(header, 0); SET_FLAG_L_HEADER(header, 0);
@ -99,13 +92,17 @@ static struct sk_buff* sc_capwap_reasm(struct sc_capwap_fragment* fragment) {
/* Copy body */ /* Copy body */
while (skbfrag) { while (skbfrag) {
offset = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4; offset = GET_HLEN_HEADER((struct sc_capwap_header*)skbfrag->data) * 4;
len = skb->len - offset; len = skbfrag->len - offset;
TRACEKMOD("*** Append fragment size %d\n", len);
/* */ /* */
memcpy(skb_put(skb, len), skb->data + offset, len); memcpy(skb_put(skb, len), skbfrag->data + offset, len);
skbfrag = skbfrag->next; skbfrag = skbfrag->next;
} }
TRACEKMOD("*** Assemblate capwap data packet with total size %d\n", skb->len);
return skb; return skb;
} }
@ -139,10 +136,12 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
/* */ /* */
spin_lock(&session->fragments.lock); spin_lock(&session->fragments.lock);
TRACEKMOD("*** Fragment info: id %hu offset %hu length %hu\n", frag_id, cb->frag_offset, cb->frag_length);
/* Get fragment */ /* Get fragment */
fragment = &session->fragments.queues[frag_id % CAPWAP_FRAGMENT_QUEUE]; fragment = &session->fragments.queues[frag_id % CAPWAP_FRAGMENT_QUEUE];
if ((fragment->flags & CAPWAP_FRAGMENT_ENABLE) && (fragment->fragmentid != frag_id)) { if ((fragment->flags & CAPWAP_FRAGMENT_ENABLE) && (fragment->fragmentid != frag_id)) {
TRACEKMOD("*** Unable defrag, queue fragment busy\n");
goto error2; /* Queue fragment busy*/ goto error2; /* Queue fragment busy*/
} }
@ -162,10 +161,11 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
if (!prev) { if (!prev) {
next = NULL; next = NULL;
} else if (CAPWAP_SKB_CB(prev)->frag_offset < cb->frag_offset) { } else if (CAPWAP_SKB_CB(prev)->frag_offset < cb->frag_offset) {
if ((CAPWAP_SKB_CB(prev)->frag_offset + CAPWAP_SKB_CB(prev)->frag_length) < cb->frag_offset) { if ((CAPWAP_SKB_CB(prev)->frag_offset + CAPWAP_SKB_CB(prev)->frag_length) <= cb->frag_offset) {
next = NULL; next = NULL;
} else { } else {
sc_capwap_fragment_free(fragment); sc_capwap_fragment_free(fragment);
TRACEKMOD("*** Unable defrag, overlap error\n");
goto error2; /* Overlap error */ goto error2; /* Overlap error */
} }
} else { } else {
@ -174,10 +174,11 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
struct sc_skb_capwap_cb* next_cb = CAPWAP_SKB_CB(next); struct sc_skb_capwap_cb* next_cb = CAPWAP_SKB_CB(next);
if (next_cb->frag_offset < cb->frag_offset) { if (next_cb->frag_offset < cb->frag_offset) {
if ((next_cb->frag_offset + next_cb->frag_length) < cb->frag_offset) { if ((next_cb->frag_offset + next_cb->frag_length) <= cb->frag_offset) {
break; break;
} else { } else {
sc_capwap_fragment_free(fragment); sc_capwap_fragment_free(fragment);
TRACEKMOD("*** Unable defrag, overlap error\n");
goto error2; /* Overlap error */ goto error2; /* Overlap error */
} }
} }
@ -215,9 +216,6 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
} else { } else {
/* Update timeout */ /* Update timeout */
fragment->tstamp = skb->tstamp; fragment->tstamp = skb->tstamp;
if (fragment->tstamp.tv64 == 0) {
fragment->tstamp = ktime_get();
}
/* Set LRU timeout */ /* Set LRU timeout */
if (!list_is_last(&fragment->lru_list, &session->fragments.lru_list)) { if (!list_is_last(&fragment->lru_list, &session->fragments.lru_list)) {
@ -225,6 +223,7 @@ static struct sk_buff* sc_capwap_defrag(struct sc_capwap_session* session, struc
} }
} }
TRACEKMOD("*** Fragment id %hu added\n", frag_id);
spin_unlock(&session->fragments.lock); spin_unlock(&session->fragments.lock);
return skb_defrag; return skb_defrag;
@ -507,11 +506,6 @@ int sc_capwap_parsingpacket(struct sc_capwap_session* session, const union capwa
return -EINVAL; /* Accept only plain packet */ return -EINVAL; /* Accept only plain packet */
} }
/* Cleaning old fragments */
if (session) {
sc_capwap_defrag_evictor(session, skb->tstamp);
}
/* */ /* */
if (IS_FLAG_K_HEADER(header)) { if (IS_FLAG_K_HEADER(header)) {
/* Keep alive can not fragment */ /* Keep alive can not fragment */
@ -576,6 +570,14 @@ int sc_capwap_parsingpacket(struct sc_capwap_session* session, const union capwa
headersize -= msglength; headersize -= msglength;
} }
} else if (session) { } else if (session) {
if (!skb->tstamp.tv64) {
skb->tstamp = ktime_get();
}
/* Cleaning old fragments */
sc_capwap_defrag_evictor(session, skb->tstamp);
/* */
if (IS_FLAG_F_HEADER(header)) { if (IS_FLAG_F_HEADER(header)) {
skb = sc_capwap_defrag(session, skb); skb = sc_capwap_defrag(session, skb);
if (!skb) { if (!skb) {