mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new lineread implementation for procfs_scan_listen()

Browse source 
Use the new more solid implementation of line by line reading for
procfs_scan_listen().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2022-06-24 12:17:31 +10:00 committed by Stefano Brivio
parent c589917e71
commit cf83df4574
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
util.c
View file

@ -41,6 +41,7 @@
#include "util.h" #include "util.h"
#include "passt.h" #include "passt.h"
#include "packet.h" #include "packet.h"
#include "lineread.h"
/* For __openlog() and __setlogmask() wrappers, and passt_vsyslog() */ /* For __openlog() and __setlogmask() wrappers, and passt_vsyslog() */
static int log_mask; static int log_mask;
@ -476,7 +477,8 @@ char *line_read(char *buf, size_t len, int fd)
void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns, void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns,
uint8_t *map, uint8_t *exclude) uint8_t *map, uint8_t *exclude)
{ {
char line[BUFSIZ], *path; char *path, *line;
struct lineread lr;
unsigned long port; unsigned long port;
unsigned int state; unsigned int state;
int *fd; int *fd;
@ -500,9 +502,9 @@ void procfs_scan_listen(struct ctx *c, uint8_t proto, int ip_version, int ns,
else if ((*fd = open(path, O_RDONLY | O_CLOEXEC)) < 0) else if ((*fd = open(path, O_RDONLY | O_CLOEXEC)) < 0)
return; return;
*line = 0; lineread_init(&lr, *fd);
line_read(line, sizeof(line), *fd); lineread_get(&lr, &line); /* throw away header */
while (line_read(line, sizeof(line), *fd)) { while (lineread_get(&lr, &line) > 0) {
/* NOLINTNEXTLINE(cert-err34-c): != 2 if conversion fails */ /* NOLINTNEXTLINE(cert-err34-c): != 2 if conversion fails */
if (sscanf(line, "%*u: %*x:%lx %*x:%*x %x", &port, &state) != 2) if (sscanf(line, "%*u: %*x:%lx %*x:%*x %x", &port, &state) != 2)
continue; continue;