hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-18 05:53:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

sbin/ifconfig: Get carp status with libifconfig

Browse Source 
A trivial change now that ifconfig is already using libifconfig.
Reviewed by:	kp (earlier version)
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D28955
This commit is contained in:
Ryan Moeller 2021-02-26 23:40:58 +00:00
parent 3fe2c68ba2
commit da393346ac
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sbin/ifconfig/carp.c
View File

@ -50,6 +50,8 @@
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
#include <libifconfig.h>
#include "ifconfig.h" #include "ifconfig.h"
static const char *carp_states[] = { CARP_STATES }; static const char *carp_states[] = { CARP_STATES };
@ -71,16 +73,16 @@ static void
carp_status(int s) carp_status(int s)
{ {
struct carpreq carpr[CARP_MAXVHID]; struct carpreq carpr[CARP_MAXVHID];
int i; ifconfig_handle_t *lifh;
bzero(carpr, sizeof(struct carpreq) * CARP_MAXVHID); lifh = ifconfig_open();
carpr[0].carpr_count = CARP_MAXVHID; if (lifh == NULL)
ifr.ifr_data = (caddr_t)&carpr;
if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1)
return; return;
for (i = 0; i < carpr[0].carpr_count; i++) { if (ifconfig_carp_get_info(lifh, name, carpr, CARP_MAXVHID) == -1)
goto close;
for (size_t i = 0; i < carpr[0].carpr_count; i++) {
printf("\tcarp: %s vhid %d advbase %d advskew %d", printf("\tcarp: %s vhid %d advbase %d advskew %d",
carp_states[carpr[i].carpr_state], carpr[i].carpr_vhid, carp_states[carpr[i].carpr_state], carpr[i].carpr_vhid,
carpr[i].carpr_advbase, carpr[i].carpr_advskew); carpr[i].carpr_advbase, carpr[i].carpr_advskew);
@ -89,6 +91,8 @@ carp_status(int s)
else else
printf("\n"); printf("\n");
} }
close:
ifconfig_close(lifh);
} }
static void static void