Merge branch 'bugfix/ra-infinite' into 'main'

chshu · chshu · commit 248948a3d3ab · 2022-08-04T19:40:33.000+08:00
bugfix: fix crash on router advertisements with infinite timeout

See merge request app-frameworks/esp-matter!166
diff --git a/components/route_hook/src/esp_route_table.c b/components/route_hook/src/esp_route_table.c
@@ -77,7 +77,9 @@ esp_route_entry_t *esp_route_table_add_route_entry(const esp_route_entry_t *rout
     }
     entry->preference = route_entry->preference;
     entry->lifetime_seconds = route_entry->lifetime_seconds;
-    sys_timeout(entry->lifetime_seconds * 1000, route_timeout_handler, entry);
+    if (entry->lifetime_seconds != UINT32_MAX) {
+        sys_timeout(entry->lifetime_seconds * 1000, route_timeout_handler, entry);
+    }
     return entry;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,9 @@ esp_route_entry_t esp_route_table_add_route_entry(const esp_route_entry_t rout`
`77`	`77`	`}`
`78`	`78`	`entry->preference = route_entry->preference;`
`79`	`79`	`entry->lifetime_seconds = route_entry->lifetime_seconds;`
`80`		`- sys_timeout(entry->lifetime_seconds * 1000, route_timeout_handler, entry);`
	`80`	`+ if (entry->lifetime_seconds != UINT32_MAX) {`
	`81`	`+ sys_timeout(entry->lifetime_seconds * 1000, route_timeout_handler, entry);`
	`82`	`+ }`
`81`	`83`	`return entry;`
`82`	`84`	`}`
`83`	`85`