chiark / gitweb /
rtnl: make checks for default routes more strict
authorLennart Poettering <lennart@poettering.net>
Wed, 3 Dec 2014 21:23:06 +0000 (22:23 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 3 Dec 2014 21:23:21 +0000 (22:23 +0100)
Also check that the source netmask is 0, not only the destination
netmask.

src/libsystemd/sd-rtnl/local-addresses.c
src/libsystemd/sd-rtnl/rtnl-message.c
src/systemd/sd-rtnl.h

index 3ab9942..b669f90 100644 (file)
@@ -197,7 +197,7 @@ int local_gateways(sd_rtnl *context, int ifindex, struct local_address **ret) {
         for (m = reply; m; m = sd_rtnl_message_next(m)) {
                 struct local_address *a;
                 uint16_t type;
-                unsigned char dst_len;
+                unsigned char dst_len, src_len;
                 uint32_t ifi;
 
                 r = sd_rtnl_message_get_errno(m);
@@ -211,14 +211,19 @@ int local_gateways(sd_rtnl *context, int ifindex, struct local_address **ret) {
                 if (type != RTM_NEWROUTE)
                         continue;
 
+                /* We only care for default routes */
                 r = sd_rtnl_message_route_get_dst_len(m, &dst_len);
                 if (r < 0)
                         return r;
-
-                /* We only care for default routes */
                 if (dst_len != 0)
                         continue;
 
+                r = sd_rtnl_message_route_get_src_len(m, &src_len);
+                if (r < 0)
+                        return r;
+                if (src_len != 0)
+                        continue;
+
                 r = sd_rtnl_message_read_u32(m, RTA_OIF, &ifi);
                 if (r < 0)
                         return r;
index 076c822..a2f7547 100644 (file)
@@ -158,6 +158,21 @@ int sd_rtnl_message_route_get_dst_len(sd_rtnl_message *m, unsigned char *dst_len
         return 0;
 }
 
+int sd_rtnl_message_route_get_src_len(sd_rtnl_message *m, unsigned char *src_len) {
+        struct rtmsg *rtm;
+
+        assert_return(m, -EINVAL);
+        assert_return(m->hdr, -EINVAL);
+        assert_return(rtnl_message_type_is_route(m->hdr->nlmsg_type), -EINVAL);
+        assert_return(src_len, -EINVAL);
+
+        rtm = NLMSG_DATA(m->hdr);
+
+        *src_len = rtm->rtm_src_len;
+
+        return 0;
+}
+
 int sd_rtnl_message_new_route(sd_rtnl *rtnl, sd_rtnl_message **ret,
                               uint16_t nlmsg_type, int rtm_family,
                               unsigned char rtm_protocol) {
index 554fc8b..bf1dde4 100644 (file)
@@ -105,6 +105,7 @@ int sd_rtnl_message_route_set_dst_prefixlen(sd_rtnl_message *m, unsigned char pr
 int sd_rtnl_message_route_set_scope(sd_rtnl_message *m, unsigned char scope);
 int sd_rtnl_message_route_get_family(sd_rtnl_message *m, int *family);
 int sd_rtnl_message_route_get_dst_len(sd_rtnl_message *m, unsigned char *dst_len);
+int sd_rtnl_message_route_get_src_len(sd_rtnl_message *m, unsigned char *src_len);
 
 int sd_rtnl_message_neigh_get_family(sd_rtnl_message *m, int *family);
 int sd_rtnl_message_neigh_get_ifindex(sd_rtnl_message *m, int *family);