[systemd-commits] 3 commits - src/libsystemd
Tom Gundersen
tomegun at kemper.freedesktop.org
Mon Feb 10 05:56:28 PST 2014
src/libsystemd/sd-rtnl/rtnl-message.c | 5 +
src/libsystemd/sd-rtnl/test-rtnl.c | 102 ++++++++++++++++++++++++----------
2 files changed, 78 insertions(+), 29 deletions(-)
New commits:
commit 108e131ece5990466fa6d7bcfe3177a063bd1ddd
Author: Susant Sahani <ssahani at redhat.com>
Date: Fri Feb 7 22:36:25 2014 +0530
sd-rtnl: added support for a few more attributes
diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 39ef25e..625d54a 100644
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -507,6 +507,10 @@ int sd_rtnl_message_append_u32(sd_rtnl_message *m, unsigned short type, uint32_t
case IFLA_LINK:
case IFLA_GROUP:
case IFLA_TXQLEN:
+ case IFLA_WEIGHT:
+ case IFLA_NET_NS_FD:
+ case IFLA_NET_NS_PID:
+ case IFLA_PROMISCUITY:
case IFLA_NUM_TX_QUEUES:
case IFLA_NUM_RX_QUEUES:
break;
@@ -522,6 +526,7 @@ int sd_rtnl_message_append_u32(sd_rtnl_message *m, unsigned short type, uint32_t
case RTA_PRIORITY:
case RTA_IIF:
case RTA_OIF:
+ case RTA_MARK:
break;
default:
return -ENOTSUP;
commit 11fc2e833e454e65ff1123a091ab1a877a063e15
Author: Tom Gundersen <teg at jklm.no>
Date: Mon Feb 10 13:28:39 2014 +0100
sd-rtnl: test - improve test of MTU a bit
We are more likely to catch errors if we don't use '0' as test value.
diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index dc2e36c..2401514 100644
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -61,7 +61,7 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
static void test_link_get(sd_rtnl *rtnl, int ifindex) {
sd_rtnl_message *m;
sd_rtnl_message *r;
- unsigned int mtu = 0;
+ unsigned int mtu = 1500;
unsigned int *mtu_reply;
void *data;
uint16_t type;
@@ -96,7 +96,7 @@ static void test_link_get(sd_rtnl *rtnl, int ifindex) {
/* u32 read back */
assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
assert(type == IFLA_MTU);
- assert(*mtu_reply == 0);
+ assert(*mtu_reply == mtu);
assert(sd_rtnl_message_read(m, &type, &data) == 1);
assert(type == IFLA_GROUP);
commit eedee64522f19a4976957fff12ee0d9c1870a7df
Author: Susant Sahani <ssahani at redhat.com>
Date: Fri Feb 7 10:27:41 2014 +0530
sd-rtnl: add test cases for link
diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index 15e42b6..dc2e36c 100644
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -57,6 +57,78 @@ static void test_link_configure(sd_rtnl *rtnl, int ifindex) {
assert(mtu == *(unsigned int *) data);
}
+
+static void test_link_get(sd_rtnl *rtnl, int ifindex) {
+ sd_rtnl_message *m;
+ sd_rtnl_message *r;
+ unsigned int mtu = 0;
+ unsigned int *mtu_reply;
+ void *data;
+ uint16_t type;
+
+ assert(sd_rtnl_message_link_new(RTM_GETLINK, ifindex, &m) >= 0);
+ assert(m);
+
+ /* u8 test cases */
+ assert(sd_rtnl_message_append_u8(m, IFLA_CARRIER, 0) >= 0);
+ assert(sd_rtnl_message_append_u8(m, IFLA_OPERSTATE, 0) >= 0);
+ assert(sd_rtnl_message_append_u8(m, IFLA_LINKMODE, 0) >= 0);
+
+ /* u32 test cases */
+ assert(sd_rtnl_message_append_u32(m, IFLA_MTU, mtu) >= 0);
+ assert(sd_rtnl_message_append_u32(m, IFLA_GROUP, 0) >= 0);
+ assert(sd_rtnl_message_append_u32(m, IFLA_TXQLEN, 0) >= 0);
+ assert(sd_rtnl_message_append_u32(m, IFLA_NUM_TX_QUEUES, 0) >= 0);
+ assert(sd_rtnl_message_append_u32(m, IFLA_NUM_RX_QUEUES, 0) >= 0);
+
+ assert(sd_rtnl_call(rtnl, m, -1, &r) == 1);
+
+ /* u8 read back */
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_CARRIER);
+
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_OPERSTATE);
+
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_LINKMODE);
+
+ /* u32 read back */
+ assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
+ assert(type == IFLA_MTU);
+ assert(*mtu_reply == 0);
+
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_GROUP);
+
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_TXQLEN);
+
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_NUM_TX_QUEUES);
+
+ assert(sd_rtnl_message_read(m, &type, &data) == 1);
+ assert(type == IFLA_NUM_RX_QUEUES);
+
+ while (sd_rtnl_message_read(r, &type, &data) > 0) {
+ switch (type) {
+// case IFLA_MTU:
+// assert(*(unsigned int *) data == 65536);
+// break;
+// case IFLA_QDISC:
+// assert(streq((char *) data, "noqueue"));
+// break;
+ case IFLA_IFNAME:
+ assert(streq((char *) data, "lo"));
+ break;
+ }
+ }
+
+ assert(sd_rtnl_flush(rtnl) >= 0);
+ assert((m = sd_rtnl_message_unref(m)) == NULL);
+
+}
+
static void test_route(void) {
_cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req;
struct in_addr addr;
@@ -270,8 +342,6 @@ int main(void) {
void *data;
int if_loopback;
uint16_t type;
- unsigned int mtu = 0;
- unsigned int *mtu_reply;
test_match();
@@ -314,35 +384,9 @@ int main(void) {
assert((m = sd_rtnl_message_unref(m)) == NULL);
assert((r = sd_rtnl_message_unref(r)) == NULL);
- assert(sd_rtnl_message_link_new(RTM_GETLINK, if_loopback, &m) >= 0);
- assert(m);
-
- assert(sd_rtnl_message_append_u32(m, IFLA_MTU, mtu) >= 0);
- assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == -EPERM);
- assert(sd_rtnl_call(rtnl, m, -1, &r) == 1);
- assert(sd_rtnl_message_read(m, &type, (void **) &mtu_reply) == 1);
-
- assert(type == IFLA_MTU);
- assert(*mtu_reply == 0);
-
- assert(sd_rtnl_message_read(m, &type, &data) == 0);
-
- while (sd_rtnl_message_read(r, &type, &data) > 0) {
- switch (type) {
-// case IFLA_MTU:
-// assert(*(unsigned int *) data == 65536);
-// break;
-// case IFLA_QDISC:
-// assert(streq((char *) data, "noqueue"));
-// break;
- case IFLA_IFNAME:
- assert(streq((char *) data, "lo"));
- break;
- }
- }
+ test_link_get(rtnl, if_loopback);
assert(sd_rtnl_flush(rtnl) >= 0);
-
assert((m = sd_rtnl_message_unref(m)) == NULL);
assert((r = sd_rtnl_message_unref(r)) == NULL);
assert((rtnl = sd_rtnl_unref(rtnl)) == NULL);
More information about the systemd-commits
mailing list