Page MenuHomeFreeBSD
Files F163065215

D37583.id113754.diff
No OneTemporary
Actions

D37583.id113754.diff
View Options

diff --git a/sys/net/if_ovpn.h b/sys/net/if_ovpn.h
--- a/sys/net/if_ovpn.h
+++ b/sys/net/if_ovpn.h
@@ -38,6 +38,11 @@
OVPN_NOTIF_DEL_PEER,
};
+enum ovpn_del_reason {
+ OVPN_DEL_REASON_REQUESTED = 0,
+ OVPN_DEL_REASON_TIMEOUT = 1
+};
+
enum ovpn_key_slot {
OVPN_KEY_SLOT_PRIMARY = 0,
OVPN_KEY_SLOT_SECONDARY = 1
diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c
--- a/sys/net/if_ovpn.c
+++ b/sys/net/if_ovpn.c
@@ -116,6 +116,7 @@
struct ovpn_notification {
enum ovpn_notif_type type;
+ enum ovpn_del_reason del_reason;
uint32_t peerid;
};
@@ -144,6 +145,7 @@
struct ovpn_kkey keys[2];
uint32_t tx_seq;
+ enum ovpn_del_reason del_reason;
struct ovpn_keepalive keepalive;
uint32_t *last_active;
struct callout ping_send;
@@ -435,6 +437,7 @@
n->peerid = peer->peerid;
n->type = OVPN_NOTIF_DEL_PEER;
+ n->del_reason = peer->del_reason;
if (buf_ring_enqueue(sc->notifring, n) != 0) {
free(n, M_OVPN);
} else if (sc->so != NULL) {
@@ -674,18 +677,17 @@
}
static int
-_ovpn_del_peer(struct ovpn_softc *sc, uint32_t peerid)
+_ovpn_del_peer(struct ovpn_softc *sc, struct ovpn_kpeer *peer)
{
- struct ovpn_kpeer *peer, *tmp;
+ struct ovpn_kpeer *tmp;
OVPN_WASSERT(sc);
CURVNET_ASSERT_SET();
- peer = ovpn_find_peer(sc, peerid);
- if (peer == NULL)
- return (ENOENT);
- peer = RB_REMOVE(ovpn_kpeers, &sc->peers, peer);
- MPASS(peer != NULL);
+ MPASS(RB_FIND(ovpn_kpeers, &sc->peers, peer) == peer);
+
+ tmp = RB_REMOVE(ovpn_kpeers, &sc->peers, peer);
+ MPASS(tmp != NULL);
tmp = ovpn_find_peer_by_ip(sc, peer->vpn4);
if (tmp)
@@ -705,6 +707,7 @@
ovpn_del_peer(struct ifnet *ifp, nvlist_t *nvl)
{
struct ovpn_softc *sc = ifp->if_softc;
+ struct ovpn_kpeer *peer;
uint32_t peerid;
int ret;
@@ -718,7 +721,12 @@
peerid = nvlist_get_number(nvl, "peerid");
- ret = _ovpn_del_peer(sc, peerid);
+ peer = ovpn_find_peer(sc, peerid);
+ if (peer == NULL)
+ return (ENOENT);
+
+ peer->del_reason = OVPN_DEL_REASON_REQUESTED;
+ ret = _ovpn_del_peer(sc, peer);
return (ret);
}
@@ -1051,7 +1059,8 @@
}
CURVNET_SET(sc->ifp->if_vnet);
- ret = _ovpn_del_peer(sc, peer->peerid);
+ peer->del_reason = OVPN_DEL_REASON_TIMEOUT;
+ ret = _ovpn_del_peer(sc, peer);
MPASS(ret == 0);
CURVNET_RESTORE();
}
@@ -1339,6 +1348,8 @@
}
nvlist_add_number(nvl, "peerid", n->peerid);
nvlist_add_number(nvl, "notification", n->type);
+ if (n->type == OVPN_NOTIF_DEL_PEER)
+ nvlist_add_number(nvl, "del_reason", n->del_reason);
free(n, M_OVPN);
*onvl = nvl;
@@ -2324,7 +2335,7 @@
/* Flush keys & configuration. */
RB_FOREACH_SAFE(peer, ovpn_kpeers, &sc->peers, tmppeer) {
- ret = _ovpn_del_peer(sc, peer->peerid);
+ ret = _ovpn_del_peer(sc, peer);
MPASS(ret == 0);
}
@@ -2451,7 +2462,7 @@
}
RB_FOREACH_SAFE(peer, ovpn_kpeers, &sc->peers, tmppeer) {
- ret = _ovpn_del_peer(sc, peer->peerid);
+ ret = _ovpn_del_peer(sc, peer);
MPASS(ret == 0);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Jul 20, 6:42 PM (3 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35282407
Default Alt Text
D37583.id113754.diff (2 KB)

Event Timeline