Fixes IPv6 loopback type detection

Emil Popov · Emil Popov · commit e7cfcac6d116 · 2025-01-24T08:21:15.000-05:00
diff --git a/source/FreeRTOS_Routing.c b/source/FreeRTOS_Routing.c
@@ -1429,18 +1429,22 @@ struct xIPv6_Couple
 
                 if( xIPCouples[ xIndex ].eType == eIPv6_Loopback )
                 {
+                    /* Checking for the loopback address requires an explicit full-length test */
                     if( xIsIPv6Loopback( pxAddress ) != pdFALSE )
                     {
                         eResult = eIPv6_Loopback;
                         break;
                     }
                 }
-
-                if( ( usAddress & xIPCouples[ xIndex ].usMask ) == xIPCouples[ xIndex ].usExpected )
+                else if( ( usAddress & xIPCouples[ xIndex ].usMask ) == xIPCouples[ xIndex ].usExpected )
                 {
                     eResult = xIPCouples[ xIndex ].eType;
                     break;
                 }
+                else
+                {
+                    /* Keep on checking... */
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1429,18 +1429,22 @@ struct xIPv6_Couple`
`1429`	`1429`
`1430`	`1430`	`if( xIPCouples[ xIndex ].eType == eIPv6_Loopback )`
`1431`	`1431`	`{`
	`1432`	`+ /* Checking for the loopback address requires an explicit full-length test */`
`1432`	`1433`	`if( xIsIPv6Loopback( pxAddress ) != pdFALSE )`
`1433`	`1434`	`{`
`1434`	`1435`	`eResult = eIPv6_Loopback;`
`1435`	`1436`	`break;`
`1436`	`1437`	`}`
`1437`	`1438`	`}`
`1438`		`-`
`1439`		`- if( ( usAddress & xIPCouples[ xIndex ].usMask ) == xIPCouples[ xIndex ].usExpected )`
	`1439`	`+ else if( ( usAddress & xIPCouples[ xIndex ].usMask ) == xIPCouples[ xIndex ].usExpected )`
`1440`	`1440`	`{`
`1441`	`1441`	`eResult = xIPCouples[ xIndex ].eType;`
`1442`	`1442`	`break;`
`1443`	`1443`	`}`
	`1444`	`+ else`
	`1445`	`+ {`
	`1446`	`+ /* Keep on checking... */`
	`1447`	`+ }`
`1444`	`1448`	`}`
`1445`	`1449`	`}`
`1446`	`1450`