Stop advertisment RPL prefix if we not have a address and it is not 'A-flag'

Juha Heiskanen · Juha Heiskanen · commit 6a44829ce088 · 2019-06-20T16:03:21.000+03:00
Change-Id: I690de0a0e5ba54fcb24094ca051c901cdff2d0b1
diff --git a/source/RPL/rpl_control.c b/source/RPL/rpl_control.c
@@ -1125,7 +1125,7 @@ void rpl_control_transmit_dio(rpl_domain_t *domain, protocol_interface_info_entr
         } else {
             prefix->options &= ~ PIO_R;
 
-            if (rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && prefix->lifetime != 0) {
+            if (rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && (prefix->lifetime != 0 || !(prefix->options & PIO_A))) {
                 continue;
             }
         }
@@ -1163,7 +1163,7 @@ void rpl_control_transmit_dio(rpl_domain_t *domain, protocol_interface_info_entr
     ns_list_foreach_safe(prefix_entry_t, prefix, prefixes) {
         /* See equivalent checks in length calculation above */
         if ((prefix->options & (PIO_L | RPL_PIO_PUBLISHED)) == PIO_L ||
-                (!(prefix->options & PIO_R) && rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && prefix->lifetime != 0)) {
+                (!(prefix->options & PIO_R) && rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && (prefix->lifetime != 0 || !(prefix->options & PIO_A)))) {
             continue;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,7 @@ void rpl_control_transmit_dio(rpl_domain_t *domain, protocol_interface_info_entr`
`1125`	`1125`	`} else {`
`1126`	`1126`	`prefix->options &= ~ PIO_R;`
`1127`	`1127`
`1128`		`- if (rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && prefix->lifetime != 0) {`
	`1128`	`+ if (rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && (prefix->lifetime != 0 \|\| !(prefix->options & PIO_A))) {`
`1129`	`1129`	`continue;`
`1130`	`1130`	`}`
`1131`	`1131`	`}`
`@@ -1163,7 +1163,7 @@ void rpl_control_transmit_dio(rpl_domain_t *domain, protocol_interface_info_entr`
`1163`	`1163`	`ns_list_foreach_safe(prefix_entry_t, prefix, prefixes) {`
`1164`	`1164`	`/* See equivalent checks in length calculation above */`
`1165`	`1165`	`if ((prefix->options & (PIO_L \| RPL_PIO_PUBLISHED)) == PIO_L \|\|`
`1166`		`- (!(prefix->options & PIO_R) && rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && prefix->lifetime != 0)) {`
	`1166`	`+ (!(prefix->options & PIO_R) && rpl_dodag_mop(dodag) == RPL_MODE_NON_STORING && (prefix->lifetime != 0 \|\| !(prefix->options & PIO_A)))) {`
`1167`	`1167`	`continue;`
`1168`	`1168`	`}`
`1169`	`1169`