mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-15 10:17:20 +00:00
Code Issues Releases Activity

Improved interface handling. This should fix the use of renamed interfaces

Browse Source 
(ifconfig xl0 name foo) as well as some special interfaces such as the 6to4
tunnel.

Reported by:	Ed Schouten <ed (at) il ! fontys , nl>
Tested by:	freebsd-pf
PR:		kern/72444
MFC after:	3 weeks
This commit is contained in:
Max Laier 2004-11-03 17:21:12 +00:00
parent 5628bfa721
commit a9052a1691
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=137159
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/contrib/pf/net/pf_if.c
View File

@ -157,12 +157,11 @@ pfi_initialize(void)
#ifdef __FreeBSD__
PF_LOCK();
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link)
if (ifp->if_dunit != IF_DUNIT_NONE) {
IFNET_RUNLOCK();
pfi_attach_ifnet(ifp);
IFNET_RLOCK();
}
TAILQ_FOREACH(ifp, &ifnet, if_link) {
IFNET_RUNLOCK();
pfi_attach_ifnet(ifp);
IFNET_RLOCK();
}
IFNET_RUNLOCK();
PF_UNLOCK();
pfi_dummy = pfi_if_create("notyet", pfi_self,
@ -248,8 +247,7 @@ void
pfi_attach_ifnet_event(void *arg __unused, struct ifnet *ifp)
{
PF_LOCK();
if (ifp->if_dunit != IF_DUNIT_NONE)
pfi_attach_ifnet(ifp);
pfi_attach_ifnet(ifp);
PF_UNLOCK();
}
@ -341,8 +339,8 @@ pfi_attach_ifnet(struct ifnet *ifp)
/* add/modify interface */
if (p == NULL)
p = pfi_if_create(ifp->if_xname, q,
realname?PFI_IFLAG_INSTANCE:PFI_IFLAG_PLACEHOLDER);
p = pfi_if_create(ifp->if_xname, q, PFI_IFLAG_INSTANCE |
(realname?0:PFI_IFLAG_PLACEHOLDER));
else {
/* remove from the dummy group */
/* XXX: copy stats? We should not have any!!! */
@ -354,10 +352,9 @@ pfi_attach_ifnet(struct ifnet *ifp)
q->pfik_addcnt++;
TAILQ_INSERT_TAIL(&q->pfik_grouphead, p,
pfik_instances);
if (realname) {
if (realname)
p->pfik_flags &= ~PFI_IFLAG_PLACEHOLDER;
p->pfik_flags |= PFI_IFLAG_INSTANCE;
}
p->pfik_flags |= PFI_IFLAG_INSTANCE;
}
if (p == NULL)
panic("pfi_attach_ifnet: "
@ -874,6 +871,7 @@ pfi_maybe_destroy(struct pfi_kif *p)
if (p->pfik_rules > 0 || p->pfik_states > 0) {
/* move back to the dummy group */
p->pfik_parent = pfi_dummy;
p->pfik_flags &= ~PFI_IFLAG_INSTANCE;
pfi_dummy->pfik_addcnt++;
TAILQ_INSERT_TAIL(&pfi_dummy->pfik_grouphead, p,
pfik_instances);
@ -912,11 +910,8 @@ pfi_dynamic_drivers(void)
*/
IFNET_RLOCK();
TAILQ_FOREACH(ifp, &ifnet, if_link) {
if (ifp->if_dunit == IF_DUNIT_NONE)
continue;
TAILQ_FOREACH(ifp, &ifnet, if_link)
pfi_newgroup(ifp->if_dname, PFI_IFLAG_DYNAMIC);
}
IFNET_RUNLOCK();
#else
char *buses[] = PFI_DYNAMIC_BUSES;