External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-07-06 17:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf, passt.h: Rename pid_file in struct ctx to pidfile

Browse Source 
We have pidfile_fd now, pid_file_fd would be quite ugly.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
This commit is contained in:
Stefano Brivio 2024-05-22 20:39:30 +02:00
parent c9b2413465
commit 0608ec42f2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.c
View File

@ -1123,7 +1123,7 @@ static void conf_open_files(struct ctx *c)
if (c->mode == MODE_PASST && c->fd_tap == -1) if (c->mode == MODE_PASST && c->fd_tap == -1)
c->fd_tap_listen = tap_sock_unix_open(c->sock_path); c->fd_tap_listen = tap_sock_unix_open(c->sock_path);
c->pidfile_fd = pidfile_open(c->pid_file); c->pidfile_fd = pidfile_open(c->pidfile);
} }
/** /**
@ -1456,12 +1456,12 @@ void conf(struct ctx *c, int argc, char **argv)
break; break;
case 'P': case 'P':
if (*c->pid_file) if (*c->pidfile)
die("Multiple --pid options given"); die("Multiple --pid options given");
ret = snprintf(c->pid_file, sizeof(c->pid_file), "%s", ret = snprintf(c->pidfile, sizeof(c->pidfile), "%s",
optarg); optarg);
if (ret <= 0 || ret >= (int)sizeof(c->pid_file)) if (ret <= 0 || ret >= (int)sizeof(c->pidfile))
die("Invalid PID file: %s", optarg); die("Invalid PID file: %s", optarg);
break; break;

4
passt.h
View File

@ -184,7 +184,7 @@ struct ip6_ctx {
* @nofile: Maximum number of open files (ulimit -n) * @nofile: Maximum number of open files (ulimit -n)
* @sock_path: Path for UNIX domain socket * @sock_path: Path for UNIX domain socket
* @pcap: Path for packet capture file * @pcap: Path for packet capture file
* @pid_file: Path to PID file, empty string if not configured * @pidfile: Path to PID file, empty string if not configured
* @pidfile_fd: File descriptor for PID file, -1 if none * @pidfile_fd: File descriptor for PID file, -1 if none
* @pasta_netns_fd: File descriptor for network namespace in pasta mode * @pasta_netns_fd: File descriptor for network namespace in pasta mode
* @no_netns_quit: In pasta mode, don't exit if fs-bound namespace is gone * @no_netns_quit: In pasta mode, don't exit if fs-bound namespace is gone
@ -236,7 +236,7 @@ struct ctx {
char sock_path[UNIX_PATH_MAX]; char sock_path[UNIX_PATH_MAX];
char pcap[PATH_MAX]; char pcap[PATH_MAX];
char pid_file[PATH_MAX]; char pidfile[PATH_MAX];
int pidfile_fd; int pidfile_fd;
int one_off; int one_off;