diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-01-29 21:20:30 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-01-30 14:30:39 +0100 |
| commit | 3815f36f05f8bc06904777b1eb7f1d22b78bcced (patch) | |
| tree | 15f3d8e9d3ea908d8edd04016c47c5ca638cf3c1 /src/libsystemd/sd-rtnl/sd-rtnl.c | |
| parent | 377a218f876507fb8be9c21ef4121fa2576ec317 (diff) | |
sd-rtnl: beef up rtnl-util a bit
Diffstat (limited to 'src/libsystemd/sd-rtnl/sd-rtnl.c')
| -rw-r--r-- | src/libsystemd/sd-rtnl/sd-rtnl.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c index 08b82ab2a9..04fcb3d002 100644 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c @@ -150,7 +150,7 @@ int sd_rtnl_send(sd_rtnl *nl, assert_return(!rtnl_pid_changed(nl), -ECHILD); assert_return(message, -EINVAL); - r = message_seal(nl, message); + r = rtnl_message_seal(nl, message); if (r < 0) return r; @@ -181,7 +181,7 @@ int sd_rtnl_send(sd_rtnl *nl, } if (serial) - *serial = message_get_serial(message); + *serial = rtnl_message_get_serial(message); return 1; } @@ -256,7 +256,7 @@ static int process_timeout(sd_rtnl *rtnl) { if (c->timeout > n) return 0; - r = message_new_synthetic_error(-ETIMEDOUT, c->serial, &m); + r = rtnl_message_new_synthetic_error(-ETIMEDOUT, c->serial, &m); if (r < 0) return r; @@ -277,7 +277,7 @@ static int process_reply(sd_rtnl *rtnl, sd_rtnl_message *m) { assert(rtnl); assert(m); - serial = message_get_serial(m); + serial = rtnl_message_get_serial(m); c = hashmap_remove(rtnl->reply_callbacks, &serial); if (!c) return 0; @@ -580,7 +580,7 @@ int sd_rtnl_call(sd_rtnl *nl, if (r < 0) return r; if (incoming) { - uint32_t received_serial = message_get_serial(incoming); + uint32_t received_serial = rtnl_message_get_serial(incoming); if (received_serial == serial) { r = sd_rtnl_message_get_errno(incoming); @@ -833,7 +833,9 @@ int sd_rtnl_add_match(sd_rtnl *rtnl, assert_return(rtnl, -EINVAL); assert_return(callback, -EINVAL); assert_return(!rtnl_pid_changed(rtnl), -ECHILD); - assert_return(message_type_is_link(type) || message_type_is_addr(type) || message_type_is_route(type), -ENOTSUP); + assert_return(rtnl_message_type_is_link(type) || + rtnl_message_type_is_addr(type) || + rtnl_message_type_is_route(type), -ENOTSUP); c = new0(struct match_callback, 1); if (!c) |