X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-rtnl%2Ftest-rtnl.c;h=02f7a8e38aaa61f747a8b7c32df14b8e999a6e47;hp=4b6e5339d9ec05807d87f21df460e997df2ad01a;hb=4af7b60d428765c2d2c66c46f416f6dae55e9ddb;hpb=28cc555d8504c9429776aedbbe1fee7101258578

diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index 4b6e5339d..02f7a8e38 100644
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -31,9 +31,28 @@
 #include "missing.h"
 #include "rtnl-internal.h"
 
+static void test_message_link_bridge(sd_rtnl *rtnl) {
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL;
+        uint32_t cost;
+
+        assert_se(sd_rtnl_message_new_link(rtnl, &message, RTM_NEWLINK, 1) >= 0);
+        assert_se(sd_rtnl_message_link_set_family(message, PF_BRIDGE) >= 0);
+        assert_se(sd_rtnl_message_open_container(message, IFLA_PROTINFO) >= 0);
+        assert_se(sd_rtnl_message_append_u32(message, IFLA_BRPORT_COST, 10) >= 0);
+        assert_se(sd_rtnl_message_close_container(message) >= 0);
+
+        assert_se(sd_rtnl_message_rewind(message) >= 0);
+
+        assert_se(sd_rtnl_message_enter_container(message, IFLA_PROTINFO) >= 0);
+        assert_se(sd_rtnl_message_read_u32(message, IFLA_BRPORT_COST, &cost) >= 0);
+        assert_se(cost == 10);
+        assert_se(sd_rtnl_message_exit_container(message) >= 0);
+}
+
 static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
-        _cleanup_rtnl_message_unref_ sd_rtnl_message *message;
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL;
         const char *mac = "98:fe:94:3f:c6:18", *name = "test";
+        char buffer[ETHER_ADDR_TO_STRING_MAX];
         unsigned int mtu = 1450, mtu_out;
         const char *name_out;
         struct ether_addr mac_out;
@@ -51,7 +70,7 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
         assert_se(streq(name, name_out));
 
         assert_se(sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &mac_out) >= 0);
-        assert_se(streq(mac, ether_ntoa(&mac_out)));
+        assert_se(streq(mac, ether_addr_to_string(&mac_out, buffer)));
 
         assert_se(sd_rtnl_message_read_u32(message, IFLA_MTU, &mtu_out) >= 0);
         assert_se(mtu == mtu_out);
@@ -134,7 +153,7 @@ static void test_route(void) {
 
         r = sd_rtnl_message_new_route(NULL, &req, RTM_NEWROUTE, AF_INET, RTPROT_STATIC);
         if (r < 0) {
-                log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r));
+                log_error_errno(r, "Could not create RTM_NEWROUTE message: %m");
                 return;
         }
 
@@ -142,13 +161,13 @@ static void test_route(void) {
 
         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));
+                log_error_errno(r, "Could not append RTA_GATEWAY attribute: %m");
                 return;
         }
 
         r = sd_rtnl_message_append_u32(req, RTA_OIF, index);
         if (r < 0) {
-                log_error("Could not append RTA_OIF attribute: %s", strerror(-r));
+                log_error_errno(r, "Could not append RTA_OIF attribute: %m");
                 return;
         }
 
@@ -222,7 +241,7 @@ static int pipe_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
 
-        log_info("%d left in pipe. got reply: %s", *counter, strerror(-r));
+        log_info_errno(r, "%d left in pipe. got reply: %m", *counter);
 
         assert_se(r >= 0);
 
@@ -352,6 +371,13 @@ static void test_get_addresses(sd_rtnl *rtnl) {
         }
 }
 
+static void test_message(void) {
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
+
+        assert_se(rtnl_message_new_synthetic_error(-ETIMEDOUT, 1, &m) >= 0);
+        assert_se(sd_rtnl_message_get_errno(m) == -ETIMEDOUT);
+}
+
 int main(void) {
         sd_rtnl *rtnl;
         sd_rtnl_message *m;
@@ -360,6 +386,8 @@ int main(void) {
         int if_loopback;
         uint16_t type;
 
+        test_message();
+
         test_match();
 
         test_multiple();
@@ -384,6 +412,8 @@ int main(void) {
 
         test_get_addresses(rtnl);
 
+        test_message_link_bridge(rtnl);
+
         assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_GETLINK, if_loopback) >= 0);
         assert_se(m);