diff options
| author | Thomas Graf <tgraf@redhat.com> | 2012-06-13 13:23:04 +0200 |
|---|---|---|
| committer | Thomas Graf <tgraf@redhat.com> | 2012-06-13 13:23:04 +0200 |
| commit | 49fe936b8e03ad3398820180310f5161b04c863a (patch) | |
| tree | 3ccebdd1c049b1353bca56e374c4eec41aae22a1 | |
| parent | 69da6af3e4c423a4bdf26854a58188fc47126b13 (diff) | |
| download | libnl-49fe936b8e03ad3398820180310f5161b04c863a.tar.gz | |
genl: cleanup genl_ctrl_resolve()
Signed-off-by: Thomas Graf <tgraf@suug.ch>
| -rw-r--r-- | lib/genl/ctrl.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/genl/ctrl.c b/lib/genl/ctrl.c index e11c5c6..5950394 100644 --- a/lib/genl/ctrl.c +++ b/lib/genl/ctrl.c @@ -234,10 +234,11 @@ static int probe_response(struct nl_msg *msg, void *arg) * * @return Generic netlink family object or NULL if no match was found. */ -static struct genl_family *genl_ctrl_probe_by_name(struct nl_sock *sk, const char *name) +static struct genl_family *genl_ctrl_probe_by_name(struct nl_sock *sk, + const char *name) { struct nl_msg *msg; - struct genl_family *ret = NULL; + struct genl_family *ret; struct nl_cb *cb; int rc; @@ -254,19 +255,24 @@ static struct genl_family *genl_ctrl_probe_by_name(struct nl_sock *sk, const cha if (!(cb = nl_cb_clone(nl_socket_get_cb(sk)))) goto out_msg_free; + if (genlmsg_put(msg, NL_AUTO_PORT, NL_AUTO_SEQ, GENL_ID_CTRL, + 0, 0, CTRL_CMD_GETFAMILY, 1) < 0) { + BUG(); + goto out_cb_free; + } - genlmsg_put(msg, NL_AUTO_PID, NL_AUTO_SEQ, GENL_ID_CTRL, - 0, 0, CTRL_CMD_GETFAMILY, 1); + if (nla_put_string(msg, CTRL_ATTR_FAMILY_NAME, name) < 0) + goto out_cb_free; - if (nla_put_string(msg, CTRL_ATTR_FAMILY_NAME, name)) + rc = nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, probe_response, + (void *) ret); + if (rc < 0) goto out_cb_free; rc = nl_send_auto_complete(sk, msg); if (rc < 0) goto out_cb_free; - nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, probe_response, (void *)ret); - rc = nl_recvmsgs(sk, cb); if (rc < 0) goto out_cb_free; |