diff options
| author |   tb <tb@openbsd.org> | 2018-02-20 15:33:16 +0000 |
|---|---|---|
| committer | tb <tb@openbsd.org> | 2018-02-20 15:33:16 +0000 |
| commit | 8a6ea6f378671a3f7c5d5ebef0e0003afbdb66ed (patch) | |
| tree | b7219eeeda5cc1b877e70c9dbf86391da9723f3e | |
| parent | Convert key length from bits to bytes (diff) | |
| download | wireguard-openbsd-8a6ea6f378671a3f7c5d5ebef0e0003afbdb66ed.tar.xz wireguard-openbsd-8a6ea6f378671a3f7c5d5ebef0e0003afbdb66ed.zip | |
Move getvnetflowid() out of #ifndef SMALL to unbreak 'make release'.
Diff from jsg, ok millert, benno
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index a1a8b787b43..a91173b08a5 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.359 2018/02/20 03:45:06 dlg Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.360 2018/02/20 15:33:16 tb Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -3358,20 +3358,6 @@ delvnetflowid(const char *ignored, int alsoignored) } void -getvnetflowid(struct ifencap *ife) -{ - if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >= - sizeof(ifr.ifr_name)) - errx(1, "vnetflowid: name is too long"); - - if (ioctl(s, SIOCGVNETFLOWID, &ifr) == -1) - return; - - if (ifr.ifr_vnetid) - ife->ife_flags |= IFE_VNETFLOWID; -} - -void mpe_status(void) { struct shim_hdr shim; @@ -3558,6 +3544,20 @@ setmpwcontrolword(const char *value, int d) #endif /* SMALL */ void +getvnetflowid(struct ifencap *ife) +{ + if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >= + sizeof(ifr.ifr_name)) + errx(1, "vnetflowid: name is too long"); + + if (ioctl(s, SIOCGVNETFLOWID, &ifr) == -1) + return; + + if (ifr.ifr_vnetid) + ife->ife_flags |= IFE_VNETFLOWID; +} + +void setvnetid(const char *id, int param) { const char *errmsg = NULL; |