mctp: separate addr add and remove codepath

Currently, mctp addr add and mctp addr del are joined into one codepath
in cmd_addr_addremove, then split off based on the RTM_COMMAND value.

This is an attempt to split those into separate code path, only extract
the inner steps as common functions.

Signed-off-by: Khang D Nguyen <[email protected]>

Author: khangng-ampere

src/mctp.c

@@ -741,20 +741,32 @@ static int cmd_addr_show(struct ctx *ctx, int argc, const char **argv)
 	return 0;
 }
 
-
-// cmdname is for error messages.
-// rtm_command is RTM_NEWADDR or RTM_DELADDR
-static int cmd_addr_addremove(struct ctx *ctx,
-	const char* cmdname, int rtm_command,
-	int argc, const char **argv)
+static int parse_eid(const char* eidstr, uint8_t* eid)
 {
-	const char *eidstr, *linkstr;
 	uint32_t tmp;
+	if (parse_uint32(eidstr, &tmp) < 0 || tmp > 0xff) {
+		return -1;
+	}
+	*eid = tmp & 0xff;
+	return 0;
+}
+
+static int parse_ifindex(struct ctx *ctx, const char* linkstr, int* ifindex)
+{
+	*ifindex = mctp_nl_ifindex_byname(ctx->nl, linkstr);
+	if (!*ifindex) {
+		return -1;
+	}
+	return 0;
+}
+
+static int cmd_addr_add(struct ctx *ctx, int argc, const char **argv)
+{
 	uint8_t eid;
 	int ifindex;
 
 	if (argc != 4) {
-		warnx("%s: invalid command line arguments", cmdname);
+		warnx("add: invalid command line arguments");
 		return -1;
 	}
 
@@ -765,34 +777,47 @@ static int cmd_addr_addremove(struct ctx *ctx,
 
 	mctp_ops_init();
 
-	eidstr = argv[1];
-	linkstr = argv[3];
-
-	ifindex = mctp_nl_ifindex_byname(ctx->nl, linkstr);
-	if (!ifindex) {
-		warnx("invalid device %s", linkstr);
+	if (parse_eid(argv[1], &eid) < 0) {
+		warnx("invalid address %s", argv[1]);
 		return -1;
 	}
 
-	if (parse_uint32(eidstr, &tmp) < 0 || tmp > 0xff) {
-		warnx("invalid address %s", eidstr);
+	if (parse_ifindex(ctx, argv[3], &ifindex) < 0) {
+		warnx("invalid device %s", argv[3]);
 		return -1;
 	}
-	eid = tmp & 0xff;
 
-	return rtm_command == RTM_NEWADDR ?
-		       mctp_nl_addr_add(ctx->nl, eid, ifindex) :
-		       mctp_nl_addr_del(ctx->nl, eid, ifindex);
-}
-
-static int cmd_addr_add(struct ctx *ctx, int argc, const char **argv)
-{
-	return cmd_addr_addremove(ctx, "add", RTM_NEWADDR, argc, argv);
+	return mctp_nl_addr_add(ctx->nl, eid, ifindex);
 }
 
 static int cmd_addr_remove(struct ctx *ctx, int argc, const char **argv)
 {
-	return cmd_addr_addremove(ctx, "del", RTM_DELADDR, argc, argv);
+	uint8_t eid;
+	int ifindex;
+
+	if (argc != 4) {
+		warnx("remove: invalid command line arguments");
+		return -1;
+	}
+
+	if (strcmp(argv[2], "dev")) {
+		warnx("invalid dev spec");
+		return -1;
+	}
+
+	mctp_ops_init();
+
+	if (parse_eid(argv[1], &eid) < 0) {
+		warnx("invalid address %s", argv[1]);
+		return -1;
+	}
+
+	if (parse_ifindex(ctx, argv[3], &ifindex) < 0) {
+		warnx("invalid device %s", argv[3]);
+		return -1;
+	}
+
+	return mctp_nl_addr_del(ctx->nl, eid, ifindex);
 }
 
 static int cmd_addr(struct ctx *ctx, int argc, const char **argv)