diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-10-27 08:20:00 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-10-27 08:20:00 +0000 |
| commit | dd9d08590ceb16e8bbf38b75eb12d6a2742869a3 (patch) | |
| tree | 3edc41d36f177cad26f89fb7f1a2610b672f69b1 /sbin/isakmpd/virtual.c | |
| parent | 24ffc2e92b8832591d653c07a217d2e1c3c8d062 (diff) | |
Do not touch LIST_* macro internals.
with otto@, ok ho@
Diffstat (limited to 'sbin/isakmpd/virtual.c')
| -rw-r--r-- | sbin/isakmpd/virtual.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sbin/isakmpd/virtual.c b/sbin/isakmpd/virtual.c index 4a7aa83beaf..55ce208b985 100644 --- a/sbin/isakmpd/virtual.c +++ b/sbin/isakmpd/virtual.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtual.c,v 1.23 2005/10/25 13:35:47 hshoexer Exp $ */ +/* $OpenBSD: virtual.c,v 1.24 2005/10/27 08:19:59 hshoexer Exp $ */ /* * Copyright (c) 2004 Håkan Olsson. All rights reserved. @@ -496,8 +496,7 @@ virtual_clone(struct transport *vt, struct sockaddr *raddr) memcpy(v2, v, sizeof *v); /* Remove the copy's links into virtual_listen_list. */ - v2->link.le_next = 0; - v2->link.le_prev = 0; + memset(&v2->link, 0, sizeof v2->link); if (v->encap_is_active) v2->main = 0; /* No need to clone this. */ @@ -571,13 +570,17 @@ virtual_create(char *name) static void virtual_remove(struct transport *t) { - struct virtual_transport *v = (struct virtual_transport *)t; + struct virtual_transport *p, *next, *v = (struct virtual_transport *)t; if (v->encap) v->encap->vtbl->remove(v->encap); if (v->main) v->main->vtbl->remove(v->main); - if (v->link.le_prev) + + for (p = LIST_FIRST(&virtual_listen_list); p && p != v; p = + LIST_NEXT(p, link)) + ; + if (p == v) LIST_REMOVE(v, link); LOG_DBG((LOG_TRANSPORT, 90, "virtual_remove: removed %p", v)); |