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

Deleted ETX structs in rpl_structs and added them in etx_beaconing.h

Browse Source 
changed packet size sent to be fix and not variable
changed some array sizes if debug is enabled
This commit is contained in:
Stephan Arndt 2013-03-28 17:11:12 +01:00
parent b22e80b806
commit 60c594b852
3 changed files with 64 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
sys/net/sixlowpan/rpl/etx_beaconing.c
View File

@ -17,15 +17,11 @@
#include "sys/net/sixlowpan/sixlowmac.h" #include "sys/net/sixlowpan/sixlowmac.h"
#include "sys/net/sixlowpan/ieee802154_frame.h" #include "sys/net/sixlowpan/ieee802154_frame.h"
#include "rpl_dodag.h"
//For debugging purposes
#define ENABLE_DEBUG
#include <debug.h>
//prototytpes //prototytpes
static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate); static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate);
static void etx_set_packets_received(void); static void etx_set_packets_received(void);
static bool etx_equal_id(ipv6_addr_t *id1, ipv6_addr_t *id2);
//Buffer //Buffer
char etx_beacon_buf[ETX_BEACON_STACKSIZE] = { 0 }; char etx_beacon_buf[ETX_BEACON_STACKSIZE] = { 0 };
@ -67,7 +63,7 @@ static char reached_window = 0;
* possible neighbor we hear from is a parent. * possible neighbor we hear from is a parent.
* Right now, we need to keep track of the ETX values of other nodes without * Right now, we need to keep track of the ETX values of other nodes without
* needing them to be in our parent array, so we have another array here in * needing them to be in our parent array, so we have another array here in
* which we put all necessary info for up to RPL_MAX_CANDIDATE_NEIGHBORS * which we put all necessary info for up to ETX_MAX_CANDIDATE_NEIHGBORS
* candidates. * candidates.
* *
* xxx If you get a -Wmissing-braces warning here: * xxx If you get a -Wmissing-braces warning here:
@ -76,7 +72,7 @@ static char reached_window = 0;
* See: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119 * See: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53119
*/ */
//Candidate array //Candidate array
static etx_neighbor_t candidates[RPL_MAX_CANDIDATE_NEIGHBORS] = { 0 }; static etx_neighbor_t candidates[ETX_MAX_CANDIDATE_NEIGHBORS] = { 0 };
/* /*
* Each time we send a beacon packet we need to reset some values for the * Each time we send a beacon packet we need to reset some values for the
@ -95,10 +91,10 @@ msg_t mesg;
//RPL-address //RPL-address
static ipv6_addr_t * own_address; static ipv6_addr_t * own_address;
static etx_probe_t * get_etx_send_buf(void) { static etx_probe_t * etx_get_send_buf(void) {
return ((etx_probe_t *) &(etx_send_buf[0])); return ((etx_probe_t *) &(etx_send_buf[0]));
} }
static etx_probe_t * get_etx_rec_buf(void) { static etx_probe_t * etx_get_rec_buf(void) {
return ((etx_probe_t *) &(etx_rec_buf[0])); return ((etx_probe_t *) &(etx_rec_buf[0]));
} }
@ -107,7 +103,7 @@ void show_candidates(void) {
etx_neighbor_t *end; etx_neighbor_t *end;
for (candidate = &candidates[0], end = candidates for (candidate = &candidates[0], end = candidates
+ RPL_MAX_CANDIDATE_NEIGHBORS; candidate < end; + ETX_MAX_CANDIDATE_NEIGHBORS; candidate < end;
candidate++) { candidate++) {
if (candidate->used == 0) { if (candidate->used == 0) {
break; break;
@ -153,7 +149,7 @@ void etx_beacon(void) {
* ETX_INTERVAL between the wakeups. It takes the old jittervalue in account * ETX_INTERVAL between the wakeups. It takes the old jittervalue in account
* and modifies the time to wait accordingly. * and modifies the time to wait accordingly.
*/ */
uint8_t * etx_data = &etx_send_buf[ETX_PKT_DATA]; etx_probe_t * packet = etx_get_send_buf();
uint8_t p_length = 0; uint8_t p_length = 0;
/* /*
@ -165,22 +161,22 @@ void etx_beacon(void) {
ieee_802154_long_t empty_addr = { 0 }; ieee_802154_long_t empty_addr = { 0 };
//Build first etx packet //Build first etx packet
for (uint8_t i = 0; i < RPL_MAX_CANDIDATE_NEIGHBORS; i++) { for (uint8_t i = 0; i < ETX_MAX_CANDIDATE_NEIGHBORS; i++) {
if (candidates[i].used != 0) { if (candidates[i].used != 0) {
etx_data[i * ETX_TUPLE_SIZE] = packet->data[i * ETX_TUPLE_SIZE] =
candidates[i].addr.uint8[ETX_IPV6_LAST_BYTE]; candidates[i].addr.uint8[ETX_IPV6_LAST_BYTE];
etx_data[i * ETX_TUPLE_SIZE + ETX_PKT_REC_OFFSET] = packet->data[i * ETX_TUPLE_SIZE + ETX_PKT_REC_OFFSET] =
etx_count_packet_tx(&candidates[i]); etx_count_packet_tx(&candidates[i]);
p_length = p_length + ETX_TUPLE_SIZE; p_length = p_length + ETX_TUPLE_SIZE;
} }
} }
etx_send_buf[ETX_PKT_LEN] = p_length; packet->length = p_length;
while (true) { while (true) {
thread_sleep(); thread_sleep();
//mutex_lock(&etx_mutex); //mutex_lock(&etx_mutex);
send_ieee802154_frame(&empty_addr, &etx_send_buf[0], send_ieee802154_frame(&empty_addr, &etx_send_buf[0],
etx_send_buf[ETX_PKT_LEN] + ETX_PKT_HDR_LEN, 1); ETX_DATA_MAXLEN+ETX_PKT_HDR_LEN, 1);
DEBUG("sent beacon!\n"); DEBUG("sent beacon!\n");
etx_set_packets_received(); etx_set_packets_received();
cur_round++; cur_round++;
@ -194,16 +190,16 @@ void etx_beacon(void) {
//mutex_unlock(&etx_mutex,0); //mutex_unlock(&etx_mutex,0);
//Build etx packet //Build etx packet
p_length = 0; p_length = 0;
for (uint8_t i = 0; i < RPL_MAX_CANDIDATE_NEIGHBORS; i++) { for (uint8_t i = 0; i < ETX_MAX_CANDIDATE_NEIGHBORS; i++) {
if (candidates[i].used != 0) { if (candidates[i].used != 0) {
etx_data[i * ETX_TUPLE_SIZE] = packet->data[i * ETX_TUPLE_SIZE] =
candidates[i].addr.uint8[ETX_IPV6_LAST_BYTE]; candidates[i].addr.uint8[ETX_IPV6_LAST_BYTE];
etx_data[i * ETX_TUPLE_SIZE + ETX_PKT_REC_OFFSET] = packet->data[i * ETX_TUPLE_SIZE + ETX_PKT_REC_OFFSET] =
etx_count_packet_tx(&candidates[i]); etx_count_packet_tx(&candidates[i]);
p_length = p_length + ETX_PKT_HDR_LEN; p_length = p_length + ETX_PKT_HDR_LEN;
} }
} }
etx_send_buf[ETX_PKT_LEN] = p_length; packet->length = p_length;
} }
} }
@ -212,9 +208,9 @@ etx_neighbor_t * etx_find_candidate(ipv6_addr_t * address) {
* find the candidate with address address and returns it, or returns NULL * find the candidate with address address and returns it, or returns NULL
* if no candidate having this address was found. * if no candidate having this address was found.
*/ */
for (uint8_t i = 0; i < RPL_MAX_CANDIDATE_NEIGHBORS; i++) { for (uint8_t i = 0; i < ETX_MAX_CANDIDATE_NEIGHBORS; i++) {
if (candidates[i].used if (candidates[i].used
&& (rpl_equal_id(&candidates[i].addr, address))) { && (etx_equal_id(&candidates[i].addr, address))) {
return &candidates[i]; return &candidates[i];
} }
} }
@ -295,7 +291,7 @@ etx_neighbor_t * etx_add_candidate(ipv6_addr_t * address) {
etx_neighbor_t * end; etx_neighbor_t * end;
for (candidate = &candidates[0], end = candidates for (candidate = &candidates[0], end = candidates
+ RPL_MAX_CANDIDATE_NEIGHBORS; candidate < end; + ETX_MAX_CANDIDATE_NEIGHBORS; candidate < end;
candidate++) { candidate++) {
if (candidate->used) { if (candidate->used) {
//skip //skip
@ -332,7 +328,7 @@ void etx_handle_beacon(ipv6_addr_t * candidate_address) {
candidate = etx_add_candidate(candidate_address); candidate = etx_add_candidate(candidate_address);
if (candidate == NULL ) { if (candidate == NULL ) {
puts("[ERROR] Candidate could not get added"); puts("[ERROR] Candidate could not get added");
puts("Increase the constant RPL_MAX_CANDIDATE_NEIGHBORS"); puts("Increase the constant ETX_MAX_CANDIDATE_NEIHGBORS");
return; return;
} }
} }
@ -343,18 +339,17 @@ void etx_handle_beacon(ipv6_addr_t * candidate_address) {
// If i find my address in this probe, update the packet_rx value for // If i find my address in this probe, update the packet_rx value for
// this candidate. // this candidate.
uint8_t datalength = etx_rec_buf[ETX_PKT_LEN]; etx_probe_t * rec_pkt = etx_get_rec_buf();
uint8_t * rec_data = &etx_rec_buf[ETX_PKT_DATA];
for (uint8_t i = 0; i < datalength / ETX_TUPLE_SIZE; i++) { for (uint8_t i = 0; i < rec_pkt->length / ETX_TUPLE_SIZE; i++) {
DEBUG("\tIPv6 short Addr:%u\n" DEBUG("\tIPv6 short Addr:%u\n"
"\tPackets f. Addr:%u\n\n", rec_data[i * ETX_TUPLE_SIZE], "\tPackets f. Addr:%u\n\n", rec_pkt->data[i * ETX_TUPLE_SIZE],
rec_data[i * ETX_TUPLE_SIZE + ETX_PKT_REC_OFFSET]); rec_pkt->data[i * ETX_TUPLE_SIZE + ETX_PKT_REC_OFFSET]);
if (rec_data[i * ETX_TUPLE_SIZE] if (rec_pkt->data[i * ETX_TUPLE_SIZE]
== own_address->uint8[ETX_IPV6_LAST_BYTE]) { == own_address->uint8[ETX_IPV6_LAST_BYTE]) {
candidate->packets_rx = rec_data[i * ETX_TUPLE_SIZE candidate->packets_rx = rec_pkt->data[i * ETX_TUPLE_SIZE
+ ETX_PKT_REC_OFFSET]; + ETX_PKT_REC_OFFSET];
} }
} }
@ -482,7 +477,6 @@ static uint8_t etx_count_packet_tx(etx_neighbor_t * candidate) {
} }
#endif #endif
} else { } else {
DEBUG("Received packet in ROUND%d!\n", i);
//Add 1 and set field //Add 1 and set field
pkt_count = pkt_count + 1; pkt_count = pkt_count + 1;
candidate->packets_tx[i] = 1; candidate->packets_tx[i] = 1;
@ -503,7 +497,7 @@ static void etx_set_packets_received(void) {
/* /*
* Set for all candidates if they received a packet this round or not * Set for all candidates if they received a packet this round or not
*/ */
for (uint8_t i = 0; i < RPL_MAX_CANDIDATE_NEIGHBORS; i++) { for (uint8_t i = 0; i < ETX_MAX_CANDIDATE_NEIGHBORS; i++) {
if (candidates[i].used) { if (candidates[i].used) {
if (candidates[i].tx_cur_round != 0) { if (candidates[i].tx_cur_round != 0) {
candidates[i].packets_tx[cur_round] = 1; candidates[i].packets_tx[cur_round] = 1;
@ -512,3 +506,13 @@ static void etx_set_packets_received(void) {
} }
} }
} }
bool etx_equal_id(ipv6_addr_t *id1, ipv6_addr_t *id2){
for(uint8_t i=0;i<4;i++){
if(id1->uint32[i] != id2->uint32[i]){
return false;
}
}
return true;
}

35
sys/net/sixlowpan/rpl/etx_beaconing.h
View File

@ -11,11 +11,19 @@
#include "sys/net/sixlowpan/sixlowip.h" #include "sys/net/sixlowpan/sixlowip.h"
//4908 is available stack size //For debugging purposes
#define ETX_BEACON_STACKSIZE 4500 //TODO debug stacksize, set for production #define ENABLE_DEBUG
#define ETX_RADIO_STACKSIZE 4500 //TODO debug stacksize, set for production #include <debug.h>
#define ETX_CLOCK_STACKSIZE 4500 //TODO debug stacksize, set for production
#ifdef ENABLE_DEBUG
#define ETX_BEACON_STACKSIZE 4500
#define ETX_RADIO_STACKSIZE 4500
#define ETX_CLOCK_STACKSIZE 500
#else
#define ETX_BEACON_STACKSIZE 2500 //TODO optimize, maybe 2000 is enough
#define ETX_RADIO_STACKSIZE 2500 //TODO optimize, maybe 2000 is enough
#define ETX_CLOCK_STACKSIZE 500 //TODO optimize, maybe 250 is enough
#endif
//[option|length|ipaddr.|packetcount] with up to 15 ipaddr|packetcount pairs //[option|length|ipaddr.|packetcount] with up to 15 ipaddr|packetcount pairs
// 1 Byte 1 Byte 1 Byte 1 Byte // 1 Byte 1 Byte 1 Byte 1 Byte
@ -23,9 +31,15 @@
#define ETX_RCV_QUEUE_SIZE (128) #define ETX_RCV_QUEUE_SIZE (128)
//Constants for packets /*
* Default 40, should be enough to get all messages for neighbors.
* In my tests, the maximum count of neighbors was around 30-something
*/
#ifdef ENABLE_DEBUG
#define ETX_MAX_CANDIDATE_NEIGHBORS 15 //Stacksizes are huge in debug mode, so memory is rare
#else
#define ETX_MAX_CANDIDATE_NEIGHBORS 40
#endif
//ETX Interval parameters //ETX Interval parameters
#define MS 1000 #define MS 1000
@ -66,11 +80,15 @@
* *
* If the length of this packet says 0, it has received no other beaconing * If the length of this packet says 0, it has received no other beaconing
* packets itself so far. * packets itself so far.
*
* The packet is always 32bytes long, but may contain varying amounts of
* information.
* The information processed shall not exceed the value set in Option Length.
*/ */
typedef struct __attribute__((packed)) etx_probe_t{ typedef struct __attribute__((packed)) etx_probe_t{
uint8_t code; uint8_t code;
uint8_t length; uint8_t length;
uint8_t* data; uint8_t data[30];
} etx_probe_t; } etx_probe_t;
typedef struct etx_neighbor_t { typedef struct etx_neighbor_t {
@ -93,6 +111,7 @@ void etx_radio(void);
#define ETX_PKT_OPT (0) //Position of Option-Type-Byte #define ETX_PKT_OPT (0) //Position of Option-Type-Byte
#define ETX_PKT_OPTVAL (0x20) //Non-standard way of saying this is an ETX-Packet. #define ETX_PKT_OPTVAL (0x20) //Non-standard way of saying this is an ETX-Packet.
#define ETX_PKT_LEN (1) //Position of Length-Byte #define ETX_PKT_LEN (1) //Position of Length-Byte
#define ETX_DATA_MAXLEN (30) //max length of the data
#define ETX_PKT_HDR_LEN (2) //Option type + Length (1 Byte each) #define ETX_PKT_HDR_LEN (2) //Option type + Length (1 Byte each)
#define ETX_PKT_DATA (2) //Begin of Data Bytes #define ETX_PKT_DATA (2) //Begin of Data Bytes

5
sys/net/sixlowpan/rpl/rpl_structs.h
View File

@ -91,11 +91,6 @@
#define NUMBER_IMPLEMENTED_OFS 2 #define NUMBER_IMPLEMENTED_OFS 2
#define RPL_MAX_DODAGS 3 #define RPL_MAX_DODAGS 3
#define RPL_MAX_INSTANCES 1 #define RPL_MAX_INSTANCES 1
/*
* Default 40, should be enough to get all messages for neighbors.
* In my tests, the maximum count of neighbors was around 30-something
*/
#define RPL_MAX_CANDIDATE_NEIGHBORS 15//TODO change
#define RPL_MAX_PARENTS 5 #define RPL_MAX_PARENTS 5
#define RPL_MAX_ROUTING_ENTRIES 128 #define RPL_MAX_ROUTING_ENTRIES 128
#define RPL_ROOT_RANK 1 #define RPL_ROOT_RANK 1