[sys net sixlowpan rpl] Beim erhalt von DIO Nachrichten wird Dodags beigetreten, parents werden hinzugefügt, globale Reperatur wird getriggert

sys/net/sixlowpan/rpl/rpl.c

@@ -18,15 +18,14 @@ uint8_t path_sequence = 240;
 
 rpl_of_t *objective_functions[NUMBER_IMPLEMENTED_OFS];
 unsigned int rpl_process_pid;
-uint16_t packet_length;
 
 msg_t msg_queue[RPL_PKT_RECV_BUF_SIZE];
 
-//Unbenutzte buffer auskommentiert, damit keine warnings erscheinen
+//Unbenutzter dao_ack buffer auskommentiert, damit keine warnings erscheinen
 static struct ipv6_hdr_t* ipv6_buf;
 static struct icmpv6_hdr_t* icmp_buf;
 static struct rpl_dio_t *rpl_dio_buf;
-//static struct rpl_dis_t *rpl_dis_buf;
+static struct rpl_dis_t *rpl_dis_buf;
 static struct rpl_dao_t *rpl_dao_buf;
 //static struct rpl_dao_ack_t * rpl_dao_ack_buf;
 static struct rpl_opt_t *rpl_opt_buf;
@@ -42,10 +41,10 @@ static struct rpl_dao_t* get_rpl_dao_buf(){
 }
 /*static struct rpl_dao_ack_t* get_rpl_dao_ack_buf(){
 	return ((struct rpl_dao_ack_t*)&(buffer[LLHDR_ICMPV6HDR_LEN]));
-}
+}*/
 static struct rpl_dis_t* get_rpl_dis_buf(){
 	return ((struct rpl_dis_t*)&(buffer[LLHDR_ICMPV6HDR_LEN]));
-}*/
+}
 static struct rpl_opt_t* get_rpl_opt_buf(uint8_t rpl_msg_len){
 	return ((struct rpl_opt_t*)&(buffer[LLHDR_ICMPV6HDR_LEN + rpl_msg_len]));
 }
@@ -116,16 +115,16 @@ void rpl_init_root(){
 		return;
 	}
 
-	send_DIO();
+	//TODO: instead start trickle timer that sends DIOs...
+	send_DIO(&mcast);
 
 }
 
 
-void send_DIO(){
+void send_DIO(ipv6_addr_t* destination){
 	rpl_dodag_t * mydodag;
 	ipv6_buf = get_ipv6_buf();
 	icmp_buf = get_icmpv6_buf(ipv6_ext_hdr_len);
-	packet_length = 0;
 
 	mydodag = rpl_get_my_dodag();
 	if(mydodag == NULL){
@@ -140,8 +139,7 @@ void send_DIO(){
 	ipv6_buf->flowlabel = 0;
 	ipv6_buf->nextheader = PROTO_NUM_ICMPV6;
 	ipv6_buf->hoplimit = 1;
-
-	ipv6_set_all_nds_mcast_addr(&ipv6_buf->destaddr);
+	ipv6_buf->destaddr = *destination;
 	ipv6_get_saddr(&(ipv6_buf->srcaddr), &(ipv6_buf->destaddr));
 
 	rpl_dio_buf = get_rpl_dio_buf();
@@ -181,6 +179,26 @@ void send_DIO(){
 	lowpan_init((ieee_802154_long_t*)&(ipv6_buf->destaddr.uint16[4]),(uint8_t*)ipv6_buf);
 }
 
+void send_DIS(ipv6_addr_t *destination){
+
+	ipv6_buf = get_ipv6_buf();
+	icmp_buf = get_icmpv6_buf(ipv6_ext_hdr_len);
+
+	icmp_buf->type = ICMP_RPL_CONTROL;
+	icmp_buf->code = ICMP_CODE_DIO; 
+	ipv6_buf->version_trafficclass = IPV6_VER;
+	ipv6_buf->trafficclass_flowlabel = 0;
+	ipv6_buf->flowlabel = 0;
+	ipv6_buf->nextheader = PROTO_NUM_ICMPV6;
+	ipv6_buf->hoplimit = 1;
+	ipv6_buf->destaddr = *destination;
+	ipv6_get_saddr(&(ipv6_buf->srcaddr), &(ipv6_buf->destaddr));
+	rpl_dis_buf = get_rpl_dis_buf();
+
+	ipv6_buf->length = ICMPV6_HDR_LEN + DIS_BASE_LEN;
+	lowpan_init((ieee_802154_long_t*)&(ipv6_buf->destaddr.uint16[4]),(uint8_t*)ipv6_buf);
+}
+
 void rpl_process(void){
 
 	msg_t m_recv;
@@ -219,38 +237,34 @@ void recv_rpl_dio(void){
 	rpl_dio_buf = get_rpl_dio_buf();
 	int len = DIO_BASE_LEN;
 
-	//printf("Rank: %d \n", rpl_dio_buf->rank);
 	printf("Try to find instance with id: %d \n", rpl_dio_buf->rpl_instanceid);
 	rpl_instance_t * dio_inst = rpl_get_instance(rpl_dio_buf->rpl_instanceid);
+	rpl_instance_t * my_inst = rpl_get_my_instance();
 	if(dio_inst == NULL){
+		if(my_inst != NULL){
+			//Knoten ist schon Teil eines DODAGS -> kein beitritt zu anderer Instanz moeglich
+			return;
+		}
 		dio_inst = rpl_new_instance(rpl_dio_buf->rpl_instanceid);
 		if(dio_inst == NULL){
 			return;
 		}
-		printf("Created new instance\n");
+	}else if(my_inst->id != dio_inst->id){
+		//DIO von fremder Instanz ignorieren
+		return;
 	}
 	printf("Try to find dodag with id:\n");
 	ipv6_print_addr(&rpl_dio_buf->dodagid);
-	rpl_dodag_t * dio_dodag = rpl_get_dodag(&rpl_dio_buf->dodagid);
-	if(dio_dodag == NULL){
-		dio_dodag = rpl_new_dodag(dio_inst->id, &rpl_dio_buf->dodagid);
-		if(dio_dodag == NULL){
-			return;
-		}
-		printf("Created new dodag\n");
-		dio_dodag->dtsn = rpl_dio_buf->dtsn;
-		dio_dodag->mop = ((rpl_dio_buf->g_mop_prf >> RPL_MOP_SHIFT ) & RPL_SHIFTED_MOP_MASK);
-		dio_dodag->grounded = rpl_dio_buf->g_mop_prf >> RPL_GROUNDED_SHIFT;
-		dio_dodag->prf = (rpl_dio_buf->g_mop_prf & RPL_PRF_MASK);
-		dio_dodag->version = rpl_dio_buf->version_number;
-	}
-	else{
-		if(rpl_dio_buf->version_number > dio_dodag->version){
-			printf("New Version of dodag\n");
-		}
-	}
-	
+	rpl_dodag_t dio_dodag; 
+	memset(&dio_dodag, 0,sizeof(dio_dodag));
 
+	dio_dodag.dtsn = rpl_dio_buf->dtsn;
+	dio_dodag.mop = ((rpl_dio_buf->g_mop_prf >> RPL_MOP_SHIFT ) & RPL_SHIFTED_MOP_MASK);
+	dio_dodag.grounded = rpl_dio_buf->g_mop_prf >> RPL_GROUNDED_SHIFT;
+	dio_dodag.prf = (rpl_dio_buf->g_mop_prf & RPL_PRF_MASK);
+	dio_dodag.version = rpl_dio_buf->version_number;
+
+	uint8_t has_dodag_conf_opt = 0;
 	while(len < (ipv6_buf->length - LLHDR_ICMPV6HDR_LEN) ){
 		rpl_opt_buf = get_rpl_opt_buf(len);
 		switch(rpl_opt_buf->type){
@@ -272,12 +286,20 @@ void recv_rpl_dio(void){
 				break;
 			}
 			case(RPL_OPT_DODAG_CONF):{
+				has_dodag_conf_opt = 1;
 				if(rpl_opt_buf->length != RPL_OPT_DODAG_CONF_LEN){
 					//error malformed
 				}
 				len += RPL_OPT_DODAG_CONF_LEN +2;
-				rpl_opt_dodag_conf_buf = get_rpl_opt_dodag_conf_buf(len);	
-				
+				rpl_opt_dodag_conf_buf = get_rpl_opt_dodag_conf_buf(len);
+				dio_dodag.dio_interval_doubling = rpl_opt_dodag_conf_buf->DIOIntDoubl; 
+				dio_dodag.dio_min = rpl_opt_dodag_conf_buf->DIOIntMin;
+				dio_dodag.dio_redundancy = rpl_opt_dodag_conf_buf->DIORedun;
+				dio_dodag.maxrankincrease =	rpl_opt_dodag_conf_buf->MaxRankIncrease;
+				dio_dodag.minhoprankincrease = rpl_opt_dodag_conf_buf->MinHopRankIncrease;
+				dio_dodag.default_lifetime = rpl_opt_dodag_conf_buf->default_lifetime;
+				dio_dodag.lifetime_unit = rpl_opt_dodag_conf_buf->lifetime_unit;
+				dio_dodag.of = rpl_get_of_for_ocp(rpl_opt_dodag_conf_buf->ocp);
 				break;
 			}
 			case(RPL_OPT_PREFIX_INFO):{
@@ -293,13 +315,77 @@ void recv_rpl_dio(void){
 		}
 	}
 
+	//handle packet content...
+	rpl_dodag_t *my_dodag = rpl_get_my_dodag();
+	if(my_dodag == NULL){
+		if(!has_dodag_conf_opt){
+			send_DIS(&ipv6_buf->srcaddr);
+			return;
+		}
 	
-
-	if(dio_dodag->mop != RPL_DEFAULT_MOP){
-		printf("Error - required MOP not supported yet\n");
-		return;
+		if(rpl_dio_buf->rank < ROOT_RANK){
+			printf("DIO with Rank < ROOT_RANK\n");
+			return;
+		}
+		if(dio_dodag.mop != RPL_DEFAULT_MOP){
+			printf("Required MOP not supported\n");
+			return;
+		}
+		if(dio_dodag.of == NULL){
+			printf("Required objective function not supported\n");
+			return;
+		}
+		if(rpl_dio_buf->rank != INFINITE_RANK){
+			rpl_join_dodag(&dio_dodag, &ipv6_buf->srcaddr, rpl_dio_buf->rank);
+		}
+		else{
+			printf("Cannot access DODAG because of DIO with infinite rank\n");
+			return;
+		}
 	}
-	//handle Packet...
+
+	if(rpl_equal_id(&my_dodag->dodag_id, &dio_dodag.dodag_id)){
+		//Mein DODAG
+		if( dio_dodag.version > my_dodag->version){
+			printf("New Version of dodag\n");
+			if(my_dodag->my_rank == ROOT_RANK){
+				my_dodag->version = dio_dodag.version +1;
+				//TODO: reset trickle timer
+			}
+			else{
+				rpl_global_repair(&dio_dodag);
+			}
+			return;
+		}
+		else if( dio_dodag.version < my_dodag->version){
+			//TODO: reset trickle timer
+			return;
+		}		
+	}
+
+	//Version stimmt, DODAG stimmt
+	if(rpl_dio_buf->rank == INFINITE_RANK) {
+		//TODO: reset trickle timer
+		if(my_dodag->my_rank == ROOT_RANK){
+			//TODO: DIO Counter ++
+			return;
+		}
+	}
+	//Ist Knoten bereits Parent?
+	rpl_parent_t *parent;
+	parent = rpl_find_parent(&ipv6_buf->srcaddr);
+	if(parent == NULL){
+		//neuen Elternknoten hinzufuegen
+		parent = rpl_new_parent(&dio_dodag, &ipv6_buf->srcaddr, rpl_dio_buf->rank);
+		if(parent == NULL){
+			return;
+		}
+	}
+	else{
+		//DIO ok
+		//TODO: DIO Counter++
+	}
+	
 }
 
 void recv_rpl_dao(void){

sys/net/sixlowpan/rpl/rpl.h

@@ -15,4 +15,5 @@ rpl_of_t *rpl_get_of_for_ocp(uint16_t ocp);
 void rpl_process(void);
 void recv_rpl_dio(void);
 void recv_rpl_dao(void);
-void send_DIO(void);
+void send_DIO(ipv6_addr_t *destination);
+void send_DIS(ipv6_addr_t *destination);

sys/net/sixlowpan/rpl/rpl_dodag.c

@@ -36,6 +36,7 @@ rpl_instance_t *rpl_get_my_instance(){
 	}
 	return NULL;
 }
+
 rpl_dodag_t * rpl_new_dodag(uint8_t instanceid, ipv6_addr_t *dodagid){
 	rpl_instance_t * inst;
 	inst = rpl_get_instance(instanceid);
@@ -63,7 +64,7 @@ rpl_dodag_t * rpl_new_dodag(uint8_t instanceid, ipv6_addr_t *dodagid){
 
 rpl_dodag_t *rpl_get_dodag(ipv6_addr_t *id){
 	for(int i=0;i<RPL_MAX_DODAGS;i++){
-		if( dodags[i].used && (rpl_equal_dodag_id(&dodags[i].dodag_id, id))){
+		if( dodags[i].used && (rpl_equal_id(&dodags[i].dodag_id, id))){
 			return &dodags[i];
 		}
 	}
@@ -78,16 +79,16 @@ rpl_dodag_t *rpl_get_my_dodag(){
 	return NULL;
 }
 void rpl_del_dodag(rpl_dodag_t *dodag){
-
+	memset(dodag, 0, sizeof(*dodag));
 }
 
 void rpl_leave_dodag(rpl_dodag_t * dodag){
+	dodag->joined = 0;
+	dodag->my_preferred_parent = NULL;
+	//TODO: parents aus Liste löschen?
 }
 
-void rpl_join_dodag(){
-}
-
-bool rpl_equal_dodag_id(ipv6_addr_t *id1, ipv6_addr_t *id2){
+bool rpl_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;
@@ -112,3 +113,54 @@ rpl_parent_t *rpl_new_parent(rpl_dodag_t *dodag, ipv6_addr_t *address, uint16_t
 	}
 	return NULL;
 }
+
+rpl_parent_t *rpl_find_parent(ipv6_addr_t *address){
+	rpl_parent_t *parent;
+	rpl_parent_t *end;
+
+	for(parent= &parents[0], end=parents+RPL_MAX_PARENTS; parent < end; parent++){
+		if( (parent->used) && (rpl_equal_id(address, &parent->addr)) ){
+			return parent;
+		}
+	}
+	return NULL;
+}
+
+void rpl_join_dodag(rpl_dodag_t *dodag, ipv6_addr_t *parent, uint16_t parent_rank){
+	rpl_dodag_t *my_dodag;
+	rpl_parent_t *preferred_parent;
+	my_dodag = rpl_new_dodag(dodag->instance->id, &dodag->dodag_id);
+	if(my_dodag == NULL){
+		return;
+	}
+	preferred_parent = rpl_new_parent(my_dodag, parent, parent_rank);
+	if(preferred_parent == NULL){
+		rpl_del_dodag(my_dodag);
+		return;	
+	}
+	my_dodag->of = dodag->of;
+	my_dodag->mop = dodag->mop;
+	my_dodag->dtsn = dodag->dtsn;
+	my_dodag->prf = dodag->prf;
+	my_dodag->dio_interval_doubling = dodag->dio_interval_doubling;
+	my_dodag->dio_min = dodag->dio_min;
+	my_dodag->dio_redundancy = dodag->dio_redundancy;
+	my_dodag->maxrankincrease = dodag->maxrankincrease;
+	my_dodag->minhoprankincrease = dodag->minhoprankincrease;
+	my_dodag->default_lifetime = dodag->default_lifetime;
+	my_dodag->lifetime_unit = dodag->lifetime_unit;
+	my_dodag->version = dodag->version;
+	my_dodag->grounded = dodag->grounded;
+	my_dodag->joined = 1;
+	my_dodag->my_preferred_parent = preferred_parent;
+	my_dodag->my_rank = dodag->of->calc_rank(preferred_parent, dodag->my_rank);
+	my_dodag->min_rank = my_dodag->my_rank;
+	
+	//TODO: reset trickle timer
+	//TODO: start sending DAOs
+
+}
+
+void rpl_global_repair(rpl_dodag_t *dodag){
+
+}

sys/net/sixlowpan/rpl/rpl_dodag.h

@@ -7,9 +7,10 @@ rpl_instance_t *rpl_get_my_instance();
 rpl_dodag_t *rpl_new_dodag(uint8_t instanceid, ipv6_addr_t *id);
 rpl_dodag_t *rpl_get_dodag(ipv6_addr_t *id);
 rpl_dodag_t *rpl_get_my_dodag();
-rpl_parent_t *rpl_new_parent(rpl_dodag_t *dodag, ipv6_addr_t *address, uint16_t rank);
+void rpl_join_dodag(rpl_dodag_t *dodag, ipv6_addr_t *parent, uint16_t parent_rank);
 void rpl_del_dodag(rpl_dodag_t *dodag);
+rpl_parent_t *rpl_new_parent(rpl_dodag_t *dodag, ipv6_addr_t *address, uint16_t rank);
+rpl_parent_t *rpl_find_parent(ipv6_addr_t *address);
 void rpl_leave_dodag(rpl_dodag_t * dodag);
-void rpl_join_dodag();
-bool rpl_equal_dodag_id(ipv6_addr_t *id1, ipv6_addr_t *id2);
-
+bool rpl_equal_id(ipv6_addr_t *id1, ipv6_addr_t *id2);
+void rpl_global_repair(rpl_dodag_t *dodag);

sys/net/sixlowpan/rpl/rpl_structs.h

@@ -172,6 +172,7 @@ typedef struct rpl_dodag_t {
     uint8_t version;
     uint8_t grounded;
     uint16_t my_rank;
+	uint16_t min_rank;
     uint8_t joined;
     rpl_parent_t *my_preferred_parent;
 	struct rpl_of_t *of;