On Thu, 12 May 2022 at 18:14, Denis Kenzior <denkenz(a)gmail.com> wrote:
> On 5/5/22 18:15, Andrew Zaborowski wrote:
> > +static bool netconfig_match_ptr(const void *a, const void *b)
> > +{
> > +     return a == b;
> > +}
> > +
>
> Ugh, can we use l_queue_get_entries loop directly or a helper function instead?

Ok.  We could also add a l_queue_match_ptr in queue.h since IIRC we
also have a copy in IWD.

>
> >   static void netconfig_update_cleanup(struct l_netconfig *nc)
> >   {
> >       l_queue_clear(nc->addresses.added, NULL);
> > @@ -356,6 +367,224 @@ static void netconfig_dhcp_event_handler(struct l_dhcp_client *client,
> >       }
> >   }
> >
> > +static struct l_rtnl_route *netconfig_find_icmp6_route(
> > +                                             struct l_netconfig *nc,
> > +                                             const uint8_t *gateway,
> > +                                             const struct route_info *dst)
> > +{
> > +     const struct l_queue_entry *entry;
> > +
> > +     for (entry = l_queue_get_entries(nc->routes.current); entry;
> > +                     entry = entry->next) {
> > +             struct l_rtnl_route *route = entry->data;
> > +             const uint8_t *route_gateway;
> > +             const uint8_t *route_dst;
> > +             uint8_t route_prefix_len = 0;
> > +
> > +             if (l_rtnl_route_get_family(route) != AF_INET6 ||
> > +                             l_rtnl_route_get_protocol(route) != RTPROT_RA)
> > +                     continue;
> > +
> > +             route_gateway = l_rtnl_route_get_gateway_in_addr(route);
> > +             if ((gateway || route_gateway) &&
> > +                             (!gateway || !route_gateway ||
> > +                              memcmp(gateway, route_gateway, 16)))
> > +                     continue;
> > +
> > +             route_dst = l_rtnl_route_get_dst_in_addr(route,
> > +                                                     &route_prefix_len);
> > +             if ((dst || route_prefix_len) &&
> > +                             (!dst || !route_prefix_len ||
> > +                              dst->prefix_len != route_prefix_len ||
> > +                              memcmp(dst->address, route_dst,
> > +                                      (dst->prefix_len + 7) / 8)))
>
> This might need a utility function, something like l_net_prefix_matches?

Well this could just be switched to l_net_prefix_matches() but since
we know the host bits of the address (interface ID) are zero, let me
just memcmp() the 16 bytes.

>
> > +                     continue;
> > +
> > +             return route;
> > +     }
> > +
> > +     return NULL;
> > +}
> > +
> > +static struct l_rtnl_route *netconfig_add_icmp6_route(struct l_netconfig *nc,
> > +                                             const uint8_t *gateway,
> > +                                             const struct route_info *dst,
> > +                                             uint8_t preference)
> > +{
> > +     struct l_rtnl_route *rt;
> > +     char buf1[INET6_ADDRSTRLEN];
> > +     char buf2[INET6_ADDRSTRLEN];
> > +
> > +     if (gateway && !dst)
> > +             rt = l_rtnl_route_new_gateway(inet_ntop(AF_INET6, gateway,
> > +                                                     buf1, sizeof(buf1)));
> > +     else if (dst && !gateway)
> > +             rt = l_rtnl_route_new_prefix(inet_ntop(AF_INET6, dst->address,
> > +                                                     buf2, sizeof(buf2)),
> > +                                             dst->prefix_len);
> > +     else
> > +             rt = l_rtnl_route_new_static(inet_ntop(AF_INET6, gateway,
> > +                                                     buf1, sizeof(buf1)),
> > +                                             inet_ntop(AF_INET6,
> > +                                                     dst->address,
> > +                                                     buf2, sizeof(buf2)),
> > +                                             dst->prefix_len);
>
> We can move l_rtnl_route structure definition into rtnl-private.h if you prefer
> to fill these in directly?

Ok.

>
> > +
> > +     if (L_WARN_ON(!rt))
> > +             return NULL;
> > +
> > +     l_rtnl_route_set_preference(rt, preference);
> > +     l_rtnl_route_set_protocol(rt, RTPROT_RA);
> > +     l_rtnl_route_set_priority(rt, nc->route_priority);
> > +     l_queue_push_tail(nc->routes.current, rt);
> > +     l_queue_push_tail(nc->routes.added, rt);
> > +     return rt;
> > +}
> > +
>
> <snip>
>
> > @@ -398,6 +634,7 @@ LIB_EXPORT void l_netconfig_destroy(struct l_netconfig *netconfig)
> >       l_netconfig_set_domain_names_override(netconfig, AF_INET6, NULL);
> >
> >       l_dhcp_client_destroy(netconfig->dhcp_client);
> > +     l_dhcp6_client_destroy(netconfig->dhcp6_client);
> >       l_netconfig_set_event_handler(netconfig, NULL, NULL, NULL);
> >       l_queue_destroy(netconfig->addresses.current, NULL);
> >       l_queue_destroy(netconfig->addresses.added, NULL);
> > @@ -731,16 +968,22 @@ configure_ipv6:
> >       if (!netconfig->v6_enabled)
> >               goto done;
> >
> > -     if (netconfig->v6_static_addr && !netconfig->do_static_work) {
> > +     if (netconfig->v6_static_addr) {
> >               /*
> >                * We're basically ready to configure the interface
> >                * but do this in an idle callback.
> >                */
> > -             netconfig->do_static_work = l_idle_create(
> > +             if (!netconfig->do_static_work)
> > +                     netconfig->do_static_work = l_idle_create(
> >                                               netconfig_do_static_config,
> >                                               netconfig, NULL);
> > +
> > +             goto done;
> >       }
> >
> > +     if (!l_dhcp6_client_start(netconfig->dhcp6_client))
> > +             return false;
>
> What about the dhcp4 client started earlier?

Good point, I'll add proper cleanup for this.

Best regards