]> git.ipfire.org Git - thirdparty/wireguard-tools.git/commitdiff
wg: correct type for CTRL_ATTR_FAMILY_ID
authorJason A. Donenfeld <Jason@zx2c4.com>
Tue, 31 Oct 2017 13:55:17 +0000 (14:55 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Tue, 31 Oct 2017 16:25:23 +0000 (17:25 +0100)
Suggested-by: Jörg Thalheim <joerg@thalheim.io>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
src/mnlg.c

index 9135651dc3020986cb34feb39d5dd9fef7a7c21e..8a2b4cc98e7655554819f87fa57a22433cce18e8 100644 (file)
 struct mnlg_socket {
        struct mnl_socket *nl;
        char *buf;
-       uint32_t id;
+       uint16_t id;
        uint8_t version;
        unsigned int seq;
        unsigned int portid;
 };
 
 static struct nlmsghdr *__mnlg_msg_prepare(struct mnlg_socket *nlg, uint8_t cmd,
-                                          uint16_t flags, uint32_t id,
+                                          uint16_t flags, uint16_t id,
                                           uint8_t version)
 {
        struct nlmsghdr *nlh;
@@ -206,7 +206,7 @@ int mnlg_socket_group_add(struct mnlg_socket *nlg, const char *group_name)
 
        nlh = __mnlg_msg_prepare(nlg, CTRL_CMD_GETFAMILY,
                                 NLM_F_REQUEST | NLM_F_ACK, GENL_ID_CTRL, 1);
-       mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, nlg->id);
+       mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, nlg->id);
 
        err = mnlg_socket_send(nlg, nlh);
        if (err < 0)
@@ -248,7 +248,7 @@ static int get_family_id_attr_cb(const struct nlattr *attr, void *data)
 
 static int get_family_id_cb(const struct nlmsghdr *nlh, void *data)
 {
-       uint32_t *p_id = data;
+       uint16_t *p_id = data;
        struct nlattr *tb[CTRL_ATTR_MAX + 1] = { 0 };
 
        mnl_attr_parse(nlh, sizeof(struct genlmsghdr), get_family_id_attr_cb, tb);