summaryrefslogtreecommitdiff
path: root/src/libsystemd-rtnl
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsystemd-rtnl')
-rw-r--r--src/libsystemd-rtnl/rtnl-message.c257
-rw-r--r--src/libsystemd-rtnl/rtnl-util.c8
-rw-r--r--src/libsystemd-rtnl/test-rtnl.c20
3 files changed, 217 insertions, 68 deletions
diff --git a/src/libsystemd-rtnl/rtnl-message.c b/src/libsystemd-rtnl/rtnl-message.c
index 8940d214ce..264cca004f 100644
--- a/src/libsystemd-rtnl/rtnl-message.c
+++ b/src/libsystemd-rtnl/rtnl-message.c
@@ -356,109 +356,256 @@ static int add_rtattr(sd_rtnl_message *m, unsigned short type, const void *data,
return 0;
}
-int sd_rtnl_message_append(sd_rtnl_message *m, unsigned short type, const void *data) {
+int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const char *data) {
uint16_t rtm_type;
- struct ifaddrmsg *ifa;
- struct rtmsg *rtm;
+ int r;
assert_return(m, -EINVAL);
assert_return(data, -EINVAL);
- sd_rtnl_message_get_type(m, &rtm_type);
+ r = sd_rtnl_message_get_type(m, &rtm_type);
+ if (r < 0)
+ return r;
- if (m->current_container) {
- switch (rtm_type) {
- case RTM_NEWLINK:
- case RTM_SETLINK:
- case RTM_GETLINK:
- case RTM_DELLINK:
- switch (m->current_container->rta_type) {
- case IFLA_LINKINFO:
- switch (type) {
- case IFLA_INFO_KIND:
- return add_rtattr(m, type, data, strlen(data) + 1);
- default:
- return -ENOTSUP;
- }
+ /* check that the type is correct */
+ switch (rtm_type) {
+ case RTM_NEWLINK:
+ case RTM_SETLINK:
+ case RTM_GETLINK:
+ case RTM_DELLINK:
+ if (m->current_container) {
+ if (m->current_container->rta_type != IFLA_LINKINFO ||
+ type != IFLA_INFO_KIND)
+ return -ENOTSUP;
+ } else {
+ switch (type) {
+ case IFLA_IFNAME:
+ case IFLA_IFALIAS:
+ case IFLA_QDISC:
+ break;
default:
return -ENOTSUP;
}
- default:
+ }
+ break;
+ case RTM_NEWADDR:
+ case RTM_GETADDR:
+ case RTM_DELADDR:
+ if (type != IFA_LABEL)
return -ENOTSUP;
- }
+ break;
+ default:
+ return -ENOTSUP;
}
+ r = add_rtattr(m, type, data, strlen(data) + 1);
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int sd_rtnl_message_append_u32(sd_rtnl_message *m, unsigned short type, uint32_t data) {
+ uint16_t rtm_type;
+ int r;
+
+ assert_return(m, -EINVAL);
+
+ r = sd_rtnl_message_get_type(m, &rtm_type);
+ if (r < 0)
+ return r;
+
+ /* check that the type is correct */
switch (rtm_type) {
case RTM_NEWLINK:
case RTM_SETLINK:
- case RTM_DELLINK:
case RTM_GETLINK:
+ case RTM_DELLINK:
switch (type) {
- case IFLA_IFNAME:
- case IFLA_IFALIAS:
- case IFLA_QDISC:
- return add_rtattr(m, type, data, strlen(data) + 1);
case IFLA_MASTER:
case IFLA_MTU:
case IFLA_LINK:
- return add_rtattr(m, type, data, sizeof(uint32_t));
- case IFLA_STATS:
- return add_rtattr(m, type, data, sizeof(struct rtnl_link_stats));
- case IFLA_ADDRESS:
- case IFLA_BROADCAST:
- return add_rtattr(m, type, data, ETH_ALEN);
+ break;
default:
return -ENOTSUP;
}
+ break;
+ case RTM_NEWROUTE:
+ case RTM_GETROUTE:
+ case RTM_DELROUTE:
+ switch (type) {
+ case RTA_TABLE:
+ case RTA_PRIORITY:
+ case RTA_IIF:
+ case RTA_OIF:
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ break;
+ default:
+ return -ENOTSUP;
+ }
+
+ r = add_rtattr(m, type, &data, sizeof(&data));
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int sd_rtnl_message_append_in_addr(sd_rtnl_message *m, unsigned short type, const struct in_addr *data) {
+ struct ifaddrmsg *ifa;
+ struct rtmsg *rtm;
+ uint16_t rtm_type;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(data, -EINVAL);
+
+ r = sd_rtnl_message_get_type(m, &rtm_type);
+ if (r < 0)
+ return r;
+
+ /* check that the type is correct */
+ switch (rtm_type) {
case RTM_NEWADDR:
- case RTM_DELADDR:
case RTM_GETADDR:
+ case RTM_DELADDR:
switch (type) {
- case IFA_LABEL:
- return add_rtattr(m, type, data, strlen(data) + 1);
case IFA_ADDRESS:
case IFA_LOCAL:
case IFA_BROADCAST:
case IFA_ANYCAST:
ifa = NLMSG_DATA(m->hdr);
- switch (ifa->ifa_family) {
- case AF_INET:
- return add_rtattr(m, type, data, sizeof(struct in_addr));
- case AF_INET6:
- return add_rtattr(m, type, data, sizeof(struct in6_addr));
- default:
- return -EINVAL;
- }
+
+ if (ifa->ifa_family != AF_INET)
+ return -EINVAL;
+
+ break;
default:
return -ENOTSUP;
}
+ break;
case RTM_NEWROUTE:
+ case RTM_GETROUTE:
case RTM_DELROUTE:
+ switch (type) {
+ case RTA_DST:
+ case RTA_SRC:
+ case RTA_GATEWAY:
+ rtm = NLMSG_DATA(m->hdr);
+
+ if (rtm->rtm_family != AF_INET)
+ return -EINVAL;
+
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ break;
+ default:
+ return -ENOTSUP;
+ }
+
+ r = add_rtattr(m, type, data, sizeof(data));
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int sd_rtnl_message_append_in6_addr(sd_rtnl_message *m, unsigned short type, const struct in6_addr *data) {
+ struct ifaddrmsg *ifa;
+ struct rtmsg *rtm;
+ uint16_t rtm_type;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(data, -EINVAL);
+
+ r = sd_rtnl_message_get_type(m, &rtm_type);
+ if (r < 0)
+ return r;
+
+ /* check that the type is correct */
+ switch (rtm_type) {
+ case RTM_NEWADDR:
+ case RTM_GETADDR:
+ case RTM_DELADDR:
+ switch (type) {
+ case IFA_ADDRESS:
+ case IFA_LOCAL:
+ case IFA_BROADCAST:
+ case IFA_ANYCAST:
+ ifa = NLMSG_DATA(m->hdr);
+
+ if (ifa->ifa_family != AF_INET6)
+ return -EINVAL;
+
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ break;
+ case RTM_NEWROUTE:
case RTM_GETROUTE:
+ case RTM_DELROUTE:
switch (type) {
case RTA_DST:
case RTA_SRC:
case RTA_GATEWAY:
rtm = NLMSG_DATA(m->hdr);
- switch (rtm->rtm_family) {
- case AF_INET:
- return add_rtattr(m, type, data, sizeof(struct in_addr));
- case AF_INET6:
- return add_rtattr(m, type, data, sizeof(struct in6_addr));
- default:
- return -EINVAL;
- }
- case RTA_TABLE:
- case RTA_PRIORITY:
- case RTA_IIF:
- case RTA_OIF:
- return add_rtattr(m, type, data, sizeof(uint32_t));
+
+ if (rtm->rtm_family != AF_INET6)
+ return -EINVAL;
+
+ break;
default:
return -ENOTSUP;
}
default:
return -ENOTSUP;
}
+
+ r = add_rtattr(m, type, data, sizeof(data));
+ if (r < 0)
+ return r;
+
+ return 0;
+}
+
+int sd_rtnl_message_append_ether_addr(sd_rtnl_message *m, unsigned short type, const struct ether_addr *data) {
+ uint16_t rtm_type;
+ int r;
+
+ assert_return(m, -EINVAL);
+ assert_return(data, -EINVAL);
+
+ sd_rtnl_message_get_type(m, &rtm_type);
+
+ switch (rtm_type) {
+ case RTM_NEWLINK:
+ case RTM_SETLINK:
+ case RTM_DELLINK:
+ case RTM_GETLINK:
+ switch (type) {
+ case IFLA_ADDRESS:
+ case IFLA_BROADCAST:
+ break;
+ default:
+ return -ENOTSUP;
+ }
+ break;
+ default:
+ return -ENOTSUP;
+ }
+
+ r = add_rtattr(m, type, data, sizeof(data));
+ if (r < 0)
+ return r;
+
+ return 0;
}
int sd_rtnl_message_open_container(sd_rtnl_message *m, unsigned short type) {
diff --git a/src/libsystemd-rtnl/rtnl-util.c b/src/libsystemd-rtnl/rtnl-util.c
index 264b72ec37..dfc0050def 100644
--- a/src/libsystemd-rtnl/rtnl-util.c
+++ b/src/libsystemd-rtnl/rtnl-util.c
@@ -38,7 +38,7 @@ int rtnl_set_link_name(sd_rtnl *rtnl, int ifindex, const char *name) {
if (r < 0)
return r;
- r = sd_rtnl_message_append(message, IFLA_IFNAME, name);
+ r = sd_rtnl_message_append_string(message, IFLA_IFNAME, name);
if (r < 0)
return r;
@@ -66,7 +66,7 @@ int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias,
return r;
if (alias) {
- r = sd_rtnl_message_append(message, IFLA_IFALIAS, alias);
+ r = sd_rtnl_message_append_string(message, IFLA_IFALIAS, alias);
if (r < 0)
return r;
@@ -75,7 +75,7 @@ int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias,
}
if (mac) {
- r = sd_rtnl_message_append(message, IFLA_ADDRESS, mac);
+ r = sd_rtnl_message_append_ether_addr(message, IFLA_ADDRESS, mac);
if (r < 0)
return r;
@@ -83,7 +83,7 @@ int rtnl_set_link_properties(sd_rtnl *rtnl, int ifindex, const char *alias,
}
if (mtu > 0) {
- r = sd_rtnl_message_append(message, IFLA_MTU, &mtu);
+ r = sd_rtnl_message_append_u32(message, IFLA_MTU, mtu);
if (r < 0)
return r;
diff --git a/src/libsystemd-rtnl/test-rtnl.c b/src/libsystemd-rtnl/test-rtnl.c
index d7a243a97e..58654e990a 100644
--- a/src/libsystemd-rtnl/test-rtnl.c
+++ b/src/libsystemd-rtnl/test-rtnl.c
@@ -38,9 +38,9 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
/* we'd really like to test NEWLINK, but let's not mess with the running kernel */
assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &message) >= 0);
- assert(sd_rtnl_message_append(message, IFLA_IFNAME, name) >= 0);
- assert(sd_rtnl_message_append(message, IFLA_ADDRESS, ether_aton(mac)) >= 0);
- assert(sd_rtnl_message_append(message, IFLA_MTU, &mtu) >= 0);
+ assert(sd_rtnl_message_append_string(message, IFLA_IFNAME, name) >= 0);
+ assert(sd_rtnl_message_append_ether_addr(message, IFLA_ADDRESS, ether_aton(mac)) >= 0);
+ assert(sd_rtnl_message_append_u32(message, IFLA_MTU, mtu) >= 0);
assert(sd_rtnl_message_read(message, &type, &data) > 0);
assert(type == IFLA_IFNAME);
@@ -59,7 +59,7 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
static void test_route(void) {
_cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req;
- uint32_t addr = htonl(INADDR_LOOPBACK);
+ struct in_addr addr;
uint32_t index = 2;
uint16_t type;
void *data;
@@ -71,13 +71,15 @@ static void test_route(void) {
return;
}
- r = sd_rtnl_message_append(req, RTA_GATEWAY, &addr);
+ addr.s_addr = htonl(INADDR_LOOPBACK);
+
+ r = sd_rtnl_message_append_in_addr(req, RTA_GATEWAY, &addr);
if (r < 0) {
log_error("Could not append RTA_GATEWAY attribute: %s", strerror(-r));
return;
}
- r = sd_rtnl_message_append(req, RTA_OIF, &index);
+ r = sd_rtnl_message_append_u32(req, RTA_OIF, index);
if (r < 0) {
log_error("Could not append RTA_OIF attribute: %s", strerror(-r));
return;
@@ -85,7 +87,7 @@ static void test_route(void) {
assert(sd_rtnl_message_read(req, &type, &data) > 0);
assert(type == RTA_GATEWAY);
- assert(*(uint32_t *) data == addr);
+ assert(((struct in_addr *)data)->s_addr == addr.s_addr);
assert(sd_rtnl_message_read(req, &type, &data) > 0);
assert(type == RTA_OIF);
@@ -213,7 +215,7 @@ static void test_container(void) {
assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO) >= 0);
assert(sd_rtnl_message_open_container(m, IFLA_LINKINFO) == -EINVAL);
- assert(sd_rtnl_message_append(m, IFLA_INFO_KIND, "kind") >= 0);
+ assert(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "kind") >= 0);
assert(sd_rtnl_message_close_container(m) >= 0);
assert(sd_rtnl_message_close_container(m) == -EINVAL);
@@ -295,7 +297,7 @@ int main(void) {
assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, &m) >= 0);
assert(m);
- assert(sd_rtnl_message_append(m, IFLA_MTU, &mtu) >= 0);
+ assert(sd_rtnl_message_append_u32(m, IFLA_MTU, mtu) >= 0);
assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
assert(type == IFLA_MTU);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-01 20:30:32 +0000