riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added callback for sixlowpan

Browse Source
This commit is contained in:
Oleg Hahm 2013-07-27 16:13:53 +02:00 committed by authmillenon
parent c47f5a459e
commit b68ee50671
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/net/sixlowpan/lowpan.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#include <errno.h>
#include "vtimer.h" #include "vtimer.h"
#include "timex.h" #include "timex.h"
@ -76,6 +77,9 @@ ieee_802154_long_t laddr;
mutex_t buf_mutex; mutex_t buf_mutex;
mutex_t lowpan_context_mutex; mutex_t lowpan_context_mutex;
/* registered upper layer threads */
int sixlowpan_reg[SIXLOWPAN_MAX_REGISTERED];
char ip_process_buf[IP_PROCESS_STACKSIZE]; char ip_process_buf[IP_PROCESS_STACKSIZE];
char nc_buf[NC_STACKSIZE]; char nc_buf[NC_STACKSIZE];
char con_buf[CON_STACKSIZE]; char con_buf[CON_STACKSIZE];
@ -625,6 +629,23 @@ void add_fifo_packet(lowpan_reas_buf_t *current_packet)
current_packet->next = NULL; current_packet->next = NULL;
} }
/* Register an upper layer thread */
uint8_t sixlowpan_register(int pid)
{
uint8_t i;
for (i = 0; ((sixlowpan_reg[i] != pid) && (i < SIXLOWPAN_MAX_REGISTERED) &&
(sixlowpan_reg[i] != 0)); i++);
if (i >= SIXLOWPAN_MAX_REGISTERED) {
return ENOMEM;
}
else {
sixlowpan_reg[i] = pid;
return 1;
}
}
void lowpan_read(uint8_t *data, uint8_t length, ieee_802154_long_t *s_laddr, void lowpan_read(uint8_t *data, uint8_t length, ieee_802154_long_t *s_laddr,
ieee_802154_long_t *d_laddr) ieee_802154_long_t *d_laddr)
{ {
@ -633,9 +654,20 @@ void lowpan_read(uint8_t *data, uint8_t length, ieee_802154_long_t *s_laddr,
uint8_t datagram_offset = 0; uint8_t datagram_offset = 0;
uint16_t datagram_size = 0; uint16_t datagram_size = 0;
uint16_t datagram_tag = 0; uint16_t datagram_tag = 0;
short i;
lowpan_datagram_t current_datagram;
check_timeout(); check_timeout();
for (i = 0; i < SIXLOWPAN_MAX_REGISTERED; i++) {
if (sixlowpan_reg[i]) {
msg_t m_send;
current_datagram.length = length;
current_datagram.data = data;
m_send.content.ptr = (char *) &current_datagram;
msg_send(&m_send, sixlowpan_reg[i], 1);
}
}
/* Fragmented Packet */ /* Fragmented Packet */
if (((data[0] & 0xf8) == (0xc0)) || ((data[0] & 0xf8) == (0xe0))) { if (((data[0] & 0xf8) == (0xc0)) || ((data[0] & 0xf8) == (0xe0))) {
/* get 11-bit from first 2 byte*/ /* get 11-bit from first 2 byte*/

7
sys/net/sixlowpan/lowpan.h
View File

@ -30,6 +30,8 @@
#define FRAG_PART_ONE_HDR_LEN (4) #define FRAG_PART_ONE_HDR_LEN (4)
#define FRAG_PART_N_HDR_LEN (5) #define FRAG_PART_N_HDR_LEN (5)
#define SIXLOWPAN_MAX_REGISTERED (4)
#define LOWPAN_IPHC_DISPATCH (0x60) #define LOWPAN_IPHC_DISPATCH (0x60)
#define LOWPAN_IPHC_FL_C (0x10) #define LOWPAN_IPHC_FL_C (0x10)
#define LOWPAN_IPHC_TC_C (0x08) #define LOWPAN_IPHC_TC_C (0x08)
@ -100,6 +102,11 @@ typedef struct lowpan_reas_buf_t {
struct lowpan_reas_buf_t *next; struct lowpan_reas_buf_t *next;
} lowpan_reas_buf_t; } lowpan_reas_buf_t;
typedef struct {
uint8_t length;
uint8_t *data;
} lowpan_datagram_t;
extern lowpan_reas_buf_t *head; extern lowpan_reas_buf_t *head;
typedef enum { typedef enum {