The branch stable/13 has been updated by cy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=685159977f5684dad17f85b1eff2d75eb2fcc160
commit 685159977f5684dad17f85b1eff2d75eb2fcc160
Author: Cy Schubert <c...@freebsd.org>
AuthorDate: 2022-09-22 13:00:09 +0000
Commit: Cy Schubert <c...@freebsd.org>
CommitDate: 2022-10-06 13:55:57 +0000
ipfilter/ippool: Return error code when listing a pool fails
When an internal or other error occurs during the listing of a pool,
return an error code when extiting ippool(8). Printing an error to
stderr without returning an error code is useless in shell scripts.
(cherry picked from commit 5568c8b2c58a65a07b42af0e09c3fc619f13316c)
---
sbin/ipf/ippool/ippool.c | 63 ++++++++++++++++++++++++++++--------------------
1 file changed, 37 insertions(+), 26 deletions(-)
diff --git a/sbin/ipf/ippool/ippool.c b/sbin/ipf/ippool/ippool.c
index 384146d729c9..53e1f19c6f90 100644
--- a/sbin/ipf/ippool/ippool.c
+++ b/sbin/ipf/ippool/ippool.c
@@ -47,15 +47,15 @@ int poolnodecommand(int, int, char *[]);
int loadpoolfile(int, char *[], char *);
int poollist(int, char *[]);
void poollist_dead(int, char *, int, char *, char *);
-void poollist_live(int, char *, int, int);
+int poollist_live(int, char *, int, int);
int poolflush(int, char *[]);
int poolstats(int, char *[]);
int gettype(char *, u_int *);
int getrole(char *);
int setnodeaddr(int, int, void *ptr, char *arg);
-void showpools_live(int, int, ipf_pool_stat_t *, char *);
-void showhashs_live(int, int, iphtstat_t *, char *);
-void showdstls_live(int, int, ipf_dstl_stat_t *, char *);
+int showpools_live(int, int, ipf_pool_stat_t *, char *);
+int showhashs_live(int, int, iphtstat_t *, char *);
+int showdstls_live(int, int, ipf_dstl_stat_t *, char *);
int opts = 0;
int fd = -1;
@@ -743,9 +743,10 @@ poollist(int argc, char *argv[])
}
op.iplo_unit = role;
- if (live_kernel)
- poollist_live(role, poolname, type, fd);
- else
+ if (live_kernel) {
+ if (poollist_live(role, poolname, type, fd) != 0)
+ return (1);
+ } else
poollist_dead(role, poolname, type, kernel, core);
return (0);
}
@@ -820,7 +821,7 @@ poollist_dead(int role, char *poolname, int type, char
*kernel, char *core)
}
-void
+int
poollist_live(int role, char *poolname, int type, int fd)
{
ipf_pool_stat_t plstat;
@@ -840,10 +841,11 @@ poollist_live(int role, char *poolname, int type, int fd)
c = ioctl(fd, SIOCLOOKUPSTAT, &op);
if (c == -1) {
ipferror(fd, "ioctl(SIOCLOOKUPSTAT)");
- return;
+ return (1);
}
- showpools_live(fd, role, &plstat, poolname);
+ if (showpools_live(fd, role, &plstat, poolname))
+ return (1);
} else {
for (role = -1; role <= IPL_LOGMAX; role++) {
op.iplo_unit = role;
@@ -851,10 +853,11 @@ poollist_live(int role, char *poolname, int type, int fd)
c = ioctl(fd, SIOCLOOKUPSTAT, &op);
if (c == -1) {
ipferror(fd, "ioctl(SIOCLOOKUPSTAT)");
- return;
+ return (1);
}
- showpools_live(fd, role, &plstat, poolname);
+ if (showpools_live(fd, role, &plstat, poolname))
+ return (1);
}
role = IPL_LOGALL;
@@ -876,9 +879,10 @@ poollist_live(int role, char *poolname, int type, int fd)
c = ioctl(fd, SIOCLOOKUPSTAT, &op);
if (c == -1) {
ipferror(fd, "ioctl(SIOCLOOKUPSTAT)");
- return;
+ return (1);
}
- showhashs_live(fd, role, &htstat, poolname);
+ if (showhashs_live(fd, role, &htstat, poolname))
+ return (1);
} else {
for (role = 0; role <= IPL_LOGMAX; role++) {
@@ -886,10 +890,11 @@ poollist_live(int role, char *poolname, int type, int fd)
c = ioctl(fd, SIOCLOOKUPSTAT, &op);
if (c == -1) {
ipferror(fd, "ioctl(SIOCLOOKUPSTAT)");
- return;
+ return (1);
}
- showhashs_live(fd, role, &htstat, poolname);
+ if (showhashs_live(fd, role, &htstat, poolname))
+ return(1);
}
role = IPL_LOGALL;
}
@@ -910,9 +915,10 @@ poollist_live(int role, char *poolname, int type, int fd)
c = ioctl(fd, SIOCLOOKUPSTAT, &op);
if (c == -1) {
ipferror(fd, "ioctl(SIOCLOOKUPSTAT)");
- return;
+ return (1);
}
- showdstls_live(fd, role, &dlstat, poolname);
+ if (showdstls_live(fd, role, &dlstat, poolname))
+ return (1);
} else {
for (role = 0; role <= IPL_LOGMAX; role++) {
@@ -920,18 +926,20 @@ poollist_live(int role, char *poolname, int type, int fd)
c = ioctl(fd, SIOCLOOKUPSTAT, &op);
if (c == -1) {
ipferror(fd, "ioctl(SIOCLOOKUPSTAT)");
- return;
+ return (1);
}
- showdstls_live(fd, role, &dlstat, poolname);
+ if (showdstls_live(fd, role, &dlstat, poolname))
+ return (1);
}
role = IPL_LOGALL;
}
}
+ return (0);
}
-void
+int
showpools_live(int fd, int role, ipf_pool_stat_t *plstp, char *poolname)
{
ipflookupiter_t iter;
@@ -956,7 +964,7 @@ showpools_live(int fd, int role, ipf_pool_stat_t *plstp,
char *poolname)
while (plstp->ipls_list[role + 1] != NULL) {
if (ioctl(fd, SIOCLOOKUPITER, &obj)) {
ipferror(fd, "ioctl(SIOCLOOKUPITER)");
- break;
+ return (1);
}
if (((pool.ipo_flags & IPOOL_DELETE) == 0) ||
((opts & OPT_DEBUG) != 0))
@@ -964,10 +972,11 @@ showpools_live(int fd, int role, ipf_pool_stat_t *plstp,
char *poolname)
plstp->ipls_list[role + 1] = pool.ipo_next;
}
+ return (0);
}
-void
+int
showhashs_live(int fd, int role, iphtstat_t *htstp, char *poolname)
{
ipflookupiter_t iter;
@@ -990,17 +999,18 @@ showhashs_live(int fd, int role, iphtstat_t *htstp, char
*poolname)
while (htstp->iphs_tables != NULL) {
if (ioctl(fd, SIOCLOOKUPITER, &obj)) {
ipferror(fd, "ioctl(SIOCLOOKUPITER)");
- break;
+ return (1);
}
printhash_live(&table, fd, poolname, opts, pool_fields);
htstp->iphs_tables = table.iph_next;
}
+ return (0);
}
-void
+int
showdstls_live(int fd, int role, ipf_dstl_stat_t *dlstp, char *poolname)
{
ipflookupiter_t iter;
@@ -1023,13 +1033,14 @@ showdstls_live(int fd, int role, ipf_dstl_stat_t
*dlstp, char *poolname)
while (dlstp->ipls_list[role] != NULL) {
if (ioctl(fd, SIOCLOOKUPITER, &obj)) {
ipferror(fd, "ioctl(SIOCLOOKUPITER)");
- break;
+ return (1);
}
printdstl_live(&table, fd, poolname, opts, pool_fields);
dlstp->ipls_list[role] = table.ipld_next;
}
+ return (0);
}
