Re: [PATCH v5 11/18] pesto, conf: Have pesto connect to passt and check versions

[Jon Maloy <jmaloy@redhat.com>]

On 2026-04-21 02:25, David Gibson wrote:
> Start implementing pesto in earnest.  Create a control/configuration
> socket in passt.  Have pesto connect to it and retrieve a server greeting
> Perform some basic version checking.

[...]

>   /**
>    * conf() - Process command-line arguments and set configuration
>    * @c:		Execution context
> @@ -1189,9 +1227,10 @@ void conf(struct ctx *c, int argc, char **argv)
>   		{"migrate-exit", no_argument,		NULL,		29 },
>   		{"migrate-no-linger", no_argument,	NULL,		30 },
>   		{"stats", required_argument,		NULL,		31 },
> +		{"conf-path",	required_argument,	NULL,		'c' },
>   		{ 0 },
>   	};
> -	const char *optstring = "+dqfel:hs:F:I:p:P:m:a:n:M:g:i:o:D:S:H:461t:u:T:U:";
> +	const char *optstring = "+dqfel:hs:c:F:I:p:P:m:a:n:M:g:i:o:D:S:H:461t:u:T:U:";
>   	const char *logname = (c->mode == MODE_PASTA) ? "pasta" : "passt";
>   	bool opt_t = false, opt_T = false, opt_u = false, opt_U = false;
>   	char userns[PATH_MAX] = { 0 }, netns[PATH_MAX] = { 0 };
> @@ -1449,6 +1488,13 @@ void conf(struct ctx *c, int argc, char **argv)
>   
>   			c->fd_tap = -1;
>   			break;
> +		case 'c':
> +			ret = snprintf(c->control_path, sizeof(c->control_path),
> +				       "%s", optarg);
> +			if (ret <= 0 || ret >= (int)sizeof(c->sock_path))

s/sizeof(c->sock_path)/sizeof(c->config_path)/


> +				die("Invalid configuration path: %s", optarg);
> +			c->fd_control_listen = c->fd_control = -1;
> +			break;
>   		case 'F':
>   			errno = 0;
>   			fd_tap_opt = strtol(optarg, NULL, 0);

[...]

>   int main(int argc, char **argv)
> @@ -76,9 +79,12 @@ int main(int argc, char **argv)
>   		{"version",	no_argument,		NULL,		1 },
>   		{ 0 },
>   	};
> +	struct sockaddr_un a = { AF_UNIX, "" };
>   	const char *optstring = "dh";
> +	struct pesto_hello hello;
>   	struct sock_fprog prog;
> -	int optname;
> +	int optname, ret, s;
> +	uint32_t s_version;
>   
>   	prctl(PR_SET_DUMPABLE, 0);
>   
> @@ -122,5 +128,42 @@ int main(int argc, char **argv)
>   
>   	debug("debug_flag=%d, path=\"%s\"", debug_flag, argv[optind]);
>   
> -	die("pesto is not implemented yet");
> +	if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
> +		die_perror("Failed to create AF_UNIX socket");
> +
> +	ret = snprintf(a.sun_path, sizeof(a.sun_path), "%s", argv[optind]);
> +	if (ret <= 0 || ret >= (int)sizeof(a.sun_path))
> +		die("Invalid socket path \"%s\"", argv[1]);

s/argv[1]/argv[optind]  for consistency.

///jon