AF_XDP-interaction: Add cmdline options for specifying IPs

Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>

Author: netoptimizer

AF_XDP-interaction/af_xdp_user.c

@@ -291,6 +291,12 @@ static const struct option_wrapper long_options[] = {
 	{{"progsec",	 required_argument,	NULL,  2  },
 	 "Load program in <section> of the ELF file", "<section>"},
 
+	{{"src-ip",	 required_argument,	NULL,  4  },
+	 "Change IPv4 source      address in generated packets", "<ip>"},
+
+	{{"dst-ip",	 required_argument,	NULL,  5 },
+	 "Change IPv4 destination address in generated packets", "<ip>"},
+
 	{{"busy-poll",	 no_argument,		NULL, 'B' },
 	 "Enable socket prefer NAPI busy-poll mode (remember adjust sysctl too)"},
 
@@ -637,32 +643,17 @@ static void gen_eth_hdr(struct config *cfg, struct ethhdr *eth_hdr)
 	eth_hdr->h_proto = htons(ETH_P_IP);
 }
 
-static bool get_ipv4_u32(char *ip_str, uint32_t *ip_addr)
-{
-	int res;
-
-	res = inet_pton(AF_INET, ip_str, ip_addr);
-	if (res <= 0) {
-		if (res == 0)
-			fprintf(stderr,	"ERROR: IP%s \"%s\" not in presentation format\n",
-				"v4", ip_str);
-		else
-			perror("inet_pton");
-		return false;
-	}
-	return true;
-}
 
 static char *opt_ip_str_src = "192.168.44.1";
 static char *opt_ip_str_dst = "192.168.44.3";
 
-static void gen_ip_hdr(struct iphdr *ip_hdr)
+static void gen_ip_hdr(struct config *cfg, struct iphdr *ip_hdr)
 {
-	uint32_t saddr;
-	uint32_t daddr;
+	if (cfg->opt_ip_src == 0)
+		get_ipv4_u32(opt_ip_str_src, &cfg->opt_ip_src);
 
-	get_ipv4_u32(opt_ip_str_src, &saddr);
-	get_ipv4_u32(opt_ip_str_dst, &daddr);
+	if (cfg->opt_ip_dst == 0)
+		get_ipv4_u32(opt_ip_str_dst, &cfg->opt_ip_dst);
 
 	/* IP header */
 	ip_hdr->version = IPVERSION;
@@ -673,8 +664,8 @@ static void gen_ip_hdr(struct iphdr *ip_hdr)
 	ip_hdr->frag_off = 0;
 	ip_hdr->ttl = IPDEFTTL;
 	ip_hdr->protocol = IPPROTO_UDP;
-	ip_hdr->saddr = saddr;
-	ip_hdr->daddr = daddr;
+	ip_hdr->saddr = cfg->opt_ip_src;
+	ip_hdr->daddr = cfg->opt_ip_dst;
 
 	/* IP header checksum */
 	ip_hdr->check = 0;
@@ -711,7 +702,7 @@ static void gen_base_pkt(struct config *cfg, uint8_t *pkt_ptr)
 						   sizeof(struct iphdr));
 
 	gen_eth_hdr(cfg, eth_hdr);
-	gen_ip_hdr(ip_hdr);
+	gen_ip_hdr(cfg, ip_hdr);
 	gen_udp_hdr(udp_hdr, ip_hdr);
 }
 

AF_XDP-interaction/common_defines.h

@@ -32,6 +32,8 @@ struct config {
 	struct ether_addr opt_tx_dmac;
 	__u64 interval;
 	__u32 batch_pkts;
+	__u32 opt_ip_src;
+	__u32 opt_ip_dst;
 };
 
 #define BATCH_PKTS_MAX		64

AF_XDP-interaction/common_params.c

@@ -11,6 +11,8 @@
 #include <linux/if_xdp.h>
 #include <sched.h>
 
+#include <arpa/inet.h> /* inet_pton */
+
 #include "common_params.h"
 
 int verbose = 1;
@@ -62,6 +64,23 @@ void usage(const char *prog_name, const char *doc,
 	printf("\n");
 }
 
+/* Helper for convert IPv4 address from text to binary form */
+bool get_ipv4_u32(char *ip_str, uint32_t *ip_addr)
+{
+	int res;
+
+	res = inet_pton(AF_INET, ip_str, ip_addr);
+	if (res <= 0) {
+		if (res == 0)
+			fprintf(stderr,	"ERROR: IP%s \"%s\" not in presentation format\n",
+				"v4", ip_str);
+		else
+			perror("inet_pton");
+		return false;
+	}
+	return true;
+}
+
 int option_wrappers_to_options(const struct option_wrapper *wrapper,
 				struct option **options)
 {
@@ -87,6 +106,7 @@ void parse_cmdline_args(int argc, char **argv,
 {
 	struct option *long_options;
 	bool full_help = false;
+	uint32_t ipv4_tmp = 0;
 	int longindex = 0;
 	char *dest;
 	int opt;
@@ -221,6 +241,16 @@ void parse_cmdline_args(int argc, char **argv,
 			dest  = (char *)&cfg->progsec;
 			strncpy(dest, optarg, sizeof(cfg->progsec));
 			break;
+		case 4: /* --src-ip */
+			if (!get_ipv4_u32(optarg, &ipv4_tmp))
+				goto error;
+			cfg->opt_ip_src = ipv4_tmp;
+			break;
+		case 5: /* --dst-ip */
+			if (!get_ipv4_u32(optarg, &ipv4_tmp))
+				goto error;
+			cfg->opt_ip_dst = ipv4_tmp;
+			break;
 		case 'L': /* --src-mac */
 			dest  = (char *)&cfg->src_mac;
 			strncpy(dest, optarg, sizeof(cfg->src_mac));

AF_XDP-interaction/common_params.h

@@ -19,4 +19,6 @@ void parse_cmdline_args(int argc, char **argv,
 			const struct option_wrapper *long_options,
                         struct config *cfg, const char *doc);
 
+bool get_ipv4_u32(char *ip_str, uint32_t *ip_addr);
+
 #endif /* __COMMON_PARAMS_H */