Mercurial > illumos > illumos-gate
changeset 4118:1a78ce2ee4f9
6544307 ipfilter does not handle address changes correctly
6544673 dynamic network interfaces don't work with IP Filter
| author | dr146992 |
|---|---|
| date | Thu, 26 Apr 2007 15:02:13 -0700 |
| parents | b9c54b1d9667 |
| children | 293019c5ea1f |
| files | usr/src/uts/common/inet/ipf/fil.c usr/src/uts/common/inet/ipf/ip_fil_solaris.c |
| diffstat | 2 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/inet/ipf/fil.c Thu Apr 26 14:32:43 2007 -0700 +++ b/usr/src/uts/common/inet/ipf/fil.c Thu Apr 26 15:02:13 2007 -0700 @@ -3706,7 +3706,7 @@ ifp, fdp->fd_ifp, ifs); if (action != IPFSYNC_RESYNC) - return; + continue; if (fr->fr_type == FR_T_IPF) { if (fr->fr_satype != FRI_NORMAL &&
--- a/usr/src/uts/common/inet/ipf/ip_fil_solaris.c Thu Apr 26 14:32:43 2007 -0700 +++ b/usr/src/uts/common/inet/ipf/ip_fil_solaris.c Thu Apr 26 15:02:13 2007 -0700 @@ -1943,7 +1943,8 @@ switch (hn->hne_event) { case NE_PLUMB : - frsync(IPFSYNC_NEWIFP, 4, (void *)hn->hne_nic, hn->hne_data, ifs); + frsync(IPFSYNC_NEWIFP, 4, (void *)hn->hne_nic, hn->hne_data, + ifs); fr_natifpsync(IPFSYNC_NEWIFP, (void *)hn->hne_nic, hn->hne_data, ifs); fr_statesync(IPFSYNC_NEWIFP, 4, (void *)hn->hne_nic, @@ -1957,8 +1958,20 @@ break; case NE_ADDRESS_CHANGE : - sin = hn->hne_data; - fr_nataddrsync((void *)hn->hne_nic, &sin->sin_addr, ifs); + /* + * We only respond to events for logical interface 0 because + * IPFilter only uses the first address given to a network + * interface. We check for hne_lif==1 because the netinfo + * code maps adds 1 to the lif number so that it can return + * 0 to indicate "no more lifs" when walking them. + */ + if (hn->hne_lif == 1) { + frsync(IPFSYNC_RESYNC, 4, (void *)hn->hne_nic, NULL, + ifs); + sin = hn->hne_data; + fr_nataddrsync((void *)hn->hne_nic, &sin->sin_addr, + ifs); + } break; default :