rdma: Make get_port_from_argv() returns valid port in strict port mode

[mirror_iproute2.git] / rdma / res-cmid.c

diff --git a/rdma/res-cmid.c b/rdma/res-cmid.c
index 22d99a8bb1daf6e5e4147f89a27f630aabad89d8..0b8300880a207d6d4a7a5a6dc2eb714fd7805f52 100644 (file)
--- a/rdma/res-cmid.c
+++ b/rdma/res-cmid.c
@@ -107,11 +107,9 @@ static int ss_ntop(struct nlattr *nla_line, char *addr_str, uint16_t *port)
        }
        return 0;
 }
-
 static int res_cm_id_line(struct rd *rd, const char *name, int idx,
-                         struct nlattr *nla_entry)
+                      struct nlattr **nla_line)
 {
-       struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
        char src_addr_str[INET6_ADDRSTRLEN];
        char dst_addr_str[INET6_ADDRSTRLEN];
        uint16_t src_port, dst_port;
@@ -120,11 +118,6 @@ static int res_cm_id_line(struct rd *rd, const char *name, int idx,
        uint32_t lqpn = 0, ps;
        uint32_t cm_idn = 0;
        char *comm = NULL;
-       int err;
-
-       err = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
-       if (err != MNL_CB_OK)
-               return MNL_CB_ERROR;
 
        if (!nla_line[RDMA_NLDEV_ATTR_RES_STATE] ||
            !nla_line[RDMA_NLDEV_ATTR_RES_PS] ||
@@ -139,57 +132,64 @@ static int res_cm_id_line(struct rd *rd, const char *name, int idx,
        if (port && port != rd->port_idx)
                goto out;
 
-       if (nla_line[RDMA_NLDEV_ATTR_RES_LQPN]) {
+       if (nla_line[RDMA_NLDEV_ATTR_RES_LQPN])
                lqpn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_LQPN]);
-               if (rd_check_is_filtered(rd, "lqpn", lqpn))
-                       goto out;
-       }
-       if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE]) {
+
+       if (rd_is_filtered_attr(rd, "lqpn", lqpn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_LQPN]))
+               goto out;
+
+       if (nla_line[RDMA_NLDEV_ATTR_RES_TYPE])
                type = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_TYPE]);
-               if (rd_check_is_string_filtered(rd, "qp-type",
-                                               qp_types_to_str(type)))
-                       goto out;
-       }
+       if (rd_is_string_filtered_attr(rd, "qp-type", qp_types_to_str(type),
+                                      nla_line[RDMA_NLDEV_ATTR_RES_TYPE]))
+               goto out;
 
        ps = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PS]);
-       if (rd_check_is_string_filtered(rd, "ps", cm_id_ps_to_str(ps)))
+       if (rd_is_string_filtered_attr(rd, "ps", cm_id_ps_to_str(ps),
+                                      nla_line[RDMA_NLDEV_ATTR_RES_PS]))
                goto out;
 
        state = mnl_attr_get_u8(nla_line[RDMA_NLDEV_ATTR_RES_STATE]);
-       if (rd_check_is_string_filtered(rd, "state", cm_id_state_to_str(state)))
+       if (rd_is_string_filtered_attr(rd, "state", cm_id_state_to_str(state),
+                                      nla_line[RDMA_NLDEV_ATTR_RES_STATE]))
                goto out;
 
-       if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR]) {
+       if (nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR])
                if (ss_ntop(nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR],
                            src_addr_str, &src_port))
                        goto out;
-               if (rd_check_is_string_filtered(rd, "src-addr", src_addr_str))
-                       goto out;
-               if (rd_check_is_filtered(rd, "src-port", src_port))
-                       goto out;
-       }
+       if (rd_is_string_filtered_attr(rd, "src-addr", src_addr_str,
+                                      nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR]))
+               goto out;
+       if (rd_is_filtered_attr(rd, "src-port", src_port,
+                               nla_line[RDMA_NLDEV_ATTR_RES_SRC_ADDR]))
+               goto out;
 
-       if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]) {
+       if (nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR])
                if (ss_ntop(nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR],
                            dst_addr_str, &dst_port))
                        goto out;
-               if (rd_check_is_string_filtered(rd, "dst-addr", dst_addr_str))
-                       goto out;
-               if (rd_check_is_filtered(rd, "dst-port", dst_port))
-                       goto out;
-       }
+       if (rd_is_string_filtered_attr(rd, "dst-addr", dst_addr_str,
+                                      nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]))
+               goto out;
+       if (rd_is_filtered_attr(rd, "dst-port", dst_port,
+                               nla_line[RDMA_NLDEV_ATTR_RES_DST_ADDR]))
+               goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_PID]) {
                pid = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_PID]);
                comm = get_task_name(pid);
        }
 
-       if (rd_check_is_filtered(rd, "pid", pid))
+       if (rd_is_filtered_attr(rd, "pid", pid,
+                               nla_line[RDMA_NLDEV_ATTR_RES_PID]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN])
                cm_idn = mnl_attr_get_u32(nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN]);
-       if (rd_check_is_filtered(rd, "cm-idn", cm_idn))
+       if (rd_is_filtered_attr(rd, "cm-idn", cm_idn,
+                               nla_line[RDMA_NLDEV_ATTR_RES_CM_IDN]))
                goto out;
 
        if (nla_line[RDMA_NLDEV_ATTR_RES_KERN_NAME]) {
@@ -225,6 +225,23 @@ out:       if (nla_line[RDMA_NLDEV_ATTR_RES_PID])
        return MNL_CB_OK;
 }
 
+int res_cm_id_idx_parse_cb(const struct nlmsghdr *nlh, void *data)
+{
+       struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
+       struct rd *rd = data;
+       const char *name;
+       int idx;
+
+       mnl_attr_parse(nlh, 0, rd_attr_cb, tb);
+       if (!tb[RDMA_NLDEV_ATTR_DEV_INDEX] || !tb[RDMA_NLDEV_ATTR_DEV_NAME])
+               return MNL_CB_ERROR;
+
+       name = mnl_attr_get_str(tb[RDMA_NLDEV_ATTR_DEV_NAME]);
+       idx = mnl_attr_get_u32(tb[RDMA_NLDEV_ATTR_DEV_INDEX]);
+
+       return res_cm_id_line(rd, name, idx, tb);
+}
+
 int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
 {
        struct nlattr *tb[RDMA_NLDEV_ATTR_MAX] = {};
@@ -244,8 +261,13 @@ int res_cm_id_parse_cb(const struct nlmsghdr *nlh, void *data)
        nla_table = tb[RDMA_NLDEV_ATTR_RES_CM_ID];
 
        mnl_attr_for_each_nested(nla_entry, nla_table) {
-               ret = res_cm_id_line(rd, name, idx, nla_entry);
+               struct nlattr *nla_line[RDMA_NLDEV_ATTR_MAX] = {};
+
+               ret = mnl_attr_parse_nested(nla_entry, rd_attr_cb, nla_line);
+               if (ret != MNL_CB_OK)
+                       break;
 
+               ret = res_cm_id_line(rd, name, idx, nla_line);
                if (ret != MNL_CB_OK)
                        break;
        }