@@ -1241,10 +1241,10 @@ static void tcp_fin_wait_2_timeout_stop(struct tsocket *t);
12411241static int tcp_ctrl_state_needs_rto (const struct tsocket * t );
12421242static int tcp_has_pending_unsent_payload (struct tsocket * t );
12431243static inline struct wolfIP_ll_dev * wolfIP_ll_at (struct wolfIP * s , unsigned int if_idx );
1244+ static int wolfIP_mask_prefix_len (uint32_t mask , uint8_t * prefix_len );
12441245#if WOLFIP_ENABLE_FORWARDING
12451246static int wolfIP_route_match_prefix (ip4 addr , ip4 prefix , uint8_t prefix_len );
12461247static uint32_t wolfIP_prefix_mask (uint8_t prefix_len );
1247- static int wolfIP_mask_prefix_len (uint32_t mask , uint8_t * prefix_len );
12481248#endif
12491249static int wolfIP_route_lookup_internal (struct wolfIP * s , ip4 dest ,
12501250 unsigned int * if_idx , ip4 * nexthop );
@@ -1638,16 +1638,6 @@ static inline struct ipconf *wolfIP_primary_ipconf(struct wolfIP *s)
16381638 return wolfIP_ipconf_at (s , WOLFIP_PRIMARY_IF_IDX );
16391639}
16401640
1641- #if WOLFIP_ENABLE_FORWARDING
1642- static uint32_t wolfIP_prefix_mask (uint8_t prefix_len )
1643- {
1644- if (prefix_len == 0U )
1645- return 0U ;
1646- if (prefix_len >= 32U )
1647- return 0xFFFFFFFFU ;
1648- return 0xFFFFFFFFU << (32U - prefix_len );
1649- }
1650-
16511641static int wolfIP_mask_prefix_len (uint32_t mask , uint8_t * prefix_len )
16521642{
16531643 uint8_t len = 0U ;
@@ -1673,6 +1663,16 @@ static int wolfIP_mask_prefix_len(uint32_t mask, uint8_t *prefix_len)
16731663 return 0 ;
16741664}
16751665
1666+ #if WOLFIP_ENABLE_FORWARDING
1667+ static uint32_t wolfIP_prefix_mask (uint8_t prefix_len )
1668+ {
1669+ if (prefix_len == 0U )
1670+ return 0U ;
1671+ if (prefix_len >= 32U )
1672+ return 0xFFFFFFFFU ;
1673+ return 0xFFFFFFFFU << (32U - prefix_len );
1674+ }
1675+
16761676static int wolfIP_route_match_prefix (ip4 addr , ip4 prefix , uint8_t prefix_len )
16771677{
16781678 uint32_t mask = wolfIP_prefix_mask (prefix_len );
0 commit comments