[ipfilter-cvs] ipfilter solaris.c,v5-1-RELEASE
Brought to you by:
darren_r
Menu
▾
▴
[ipfilter-cvs] ipfilter solaris.c,v5-1-RELEASE
|
From: Darren <dar...@us...> - 2011-08-07 16:57:13
|
Update of /cvsroot/ipfilter/ipfilter
In directory vz-cvs-4.sog:/tmp/cvs-serv5360
Modified Files:
Tag: v5-1-RELEASE
solaris.c
Log Message:
3005622 ip_fil5.1.0 does not load on Solaris 10 U8
Index: solaris.c
===================================================================
RCS file: /cvsroot/ipfilter/ipfilter/solaris.c,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -C2 -d -r1.22.2.4 -r1.22.2.5
*** solaris.c 19 Feb 2010 04:43:38 -0000 1.22.2.4
--- solaris.c 7 Aug 2011 16:57:11 -0000 1.22.2.5
***************
*** 1064,1094 ****
HOOK_INIT(softc->ipf_hk_v4_in, ipf_hk_v4_in, "ipf_v4_in", softc);
! if (net_register_hook(softc->ipf_nd_v4, NH_PHYSICAL_IN,
! &softc->ipf_hk_v4_in))
cmn_err(CE_WARN, "register-hook(v4-in) failed");
HOOK_INIT(softc->ipf_hk_v4_out, ipf_hk_v4_out, "ipf_v4_out", softc);
! if (net_register_hook(softc->ipf_nd_v4, NH_PHYSICAL_OUT,
! &softc->ipf_hk_v4_out))
cmn_err(CE_WARN, "register-hook(v4-out) failed");
HOOK_INIT(softc->ipf_hk_v4_nic, ipf_hk_v4_nic, "ipf_v4_event", softc);
! if (net_register_hook(softc->ipf_nd_v4, NH_NIC_EVENTS,
! &softc->ipf_hk_v4_nic))
cmn_err(CE_WARN, "register-hook(v4-nic) failed");
HOOK_INIT(softc->ipf_hk_v6_in, ipf_hk_v6_in, "ipf_v6_in", softc);
! if (net_register_hook(softc->ipf_nd_v6, NH_PHYSICAL_IN,
! &softc->ipf_hk_v6_in))
cmn_err(CE_WARN, "register-hook(v6-in) failed");
HOOK_INIT(softc->ipf_hk_v6_out, ipf_hk_v6_out, "ipf_v6_out", softc);
! if (net_register_hook(softc->ipf_nd_v6, NH_PHYSICAL_OUT,
! &softc->ipf_hk_v6_out))
cmn_err(CE_WARN, "register-hook(v6-out) failed");
HOOK_INIT(softc->ipf_hk_v6_nic, ipf_hk_v6_nic, "ipf_v6_event", softc);
! if (net_register_hook(softc->ipf_nd_v6, NH_NIC_EVENTS,
! &softc->ipf_hk_v6_nic))
cmn_err(CE_WARN, "register-hook(v6-nic) failed");
--- 1064,1094 ----
HOOK_INIT(softc->ipf_hk_v4_in, ipf_hk_v4_in, "ipf_v4_in", softc);
! if (net_hook_register(softc->ipf_nd_v4, NH_PHYSICAL_IN,
! softc->ipf_hk_v4_in))
cmn_err(CE_WARN, "register-hook(v4-in) failed");
HOOK_INIT(softc->ipf_hk_v4_out, ipf_hk_v4_out, "ipf_v4_out", softc);
! if (net_hook_register(softc->ipf_nd_v4, NH_PHYSICAL_OUT,
! softc->ipf_hk_v4_out))
cmn_err(CE_WARN, "register-hook(v4-out) failed");
HOOK_INIT(softc->ipf_hk_v4_nic, ipf_hk_v4_nic, "ipf_v4_event", softc);
! if (net_hook_register(softc->ipf_nd_v4, NH_NIC_EVENTS,
! softc->ipf_hk_v4_nic))
cmn_err(CE_WARN, "register-hook(v4-nic) failed");
HOOK_INIT(softc->ipf_hk_v6_in, ipf_hk_v6_in, "ipf_v6_in", softc);
! if (net_hook_register(softc->ipf_nd_v6, NH_PHYSICAL_IN,
! softc->ipf_hk_v6_in))
cmn_err(CE_WARN, "register-hook(v6-in) failed");
HOOK_INIT(softc->ipf_hk_v6_out, ipf_hk_v6_out, "ipf_v6_out", softc);
! if (net_hook_register(softc->ipf_nd_v6, NH_PHYSICAL_OUT,
! softc->ipf_hk_v6_out))
cmn_err(CE_WARN, "register-hook(v6-out) failed");
HOOK_INIT(softc->ipf_hk_v6_nic, ipf_hk_v6_nic, "ipf_v6_event", softc);
! if (net_hook_register(softc->ipf_nd_v6, NH_NIC_EVENTS,
! softc->ipf_hk_v6_nic))
cmn_err(CE_WARN, "register-hook(v6-nic) failed");
***************
*** 1107,1140 ****
if (softc->ipf_nd_v4 != NULL) {
! if (net_unregister_hook(softc->ipf_nd_v4, NH_PHYSICAL_IN,
! &softc->ipf_hk_v4_in))
cmn_err(CE_WARN, "unregister-hook(v4-in) failed");
! if (net_unregister_hook(softc->ipf_nd_v4, NH_PHYSICAL_OUT,
! &softc->ipf_hk_v4_out))
cmn_err(CE_WARN, "unregister-hook(v4-out) failed");
! if (net_unregister_hook(softc->ipf_nd_v4, NH_NIC_EVENTS,
! &softc->ipf_hk_v4_nic))
cmn_err(CE_WARN, "unregister-hook(v4-nic) failed");
! net_release(softc->ipf_nd_v4);
softc->ipf_nd_v4 = NULL;
}
if (softc->ipf_nd_v6 != NULL) {
! if (net_unregister_hook(softc->ipf_nd_v6, NH_PHYSICAL_IN,
! &softc->ipf_hk_v6_in))
cmn_err(CE_WARN, "unregister-hook(v6-in) failed");
! if (net_unregister_hook(softc->ipf_nd_v6, NH_PHYSICAL_OUT,
! &softc->ipf_hk_v6_out))
cmn_err(CE_WARN, "unregister-hook(v6-out) failed");
! if (net_unregister_hook(softc->ipf_nd_v6, NH_NIC_EVENTS,
! &softc->ipf_hk_v6_nic))
cmn_err(CE_WARN, "unregister-hook(v6-nic) failed");
! net_release(softc->ipf_nd_v6);
softc->ipf_nd_v6 = NULL;
}
--- 1107,1140 ----
if (softc->ipf_nd_v4 != NULL) {
! if (net_hook_unregister(softc->ipf_nd_v4, NH_PHYSICAL_IN,
! softc->ipf_hk_v4_in))
cmn_err(CE_WARN, "unregister-hook(v4-in) failed");
! if (net_hook_unregister(softc->ipf_nd_v4, NH_PHYSICAL_OUT,
! softc->ipf_hk_v4_out))
cmn_err(CE_WARN, "unregister-hook(v4-out) failed");
! if (net_hook_unregister(softc->ipf_nd_v4, NH_NIC_EVENTS,
! softc->ipf_hk_v4_nic))
cmn_err(CE_WARN, "unregister-hook(v4-nic) failed");
! net_protocol_release(softc->ipf_nd_v4);
softc->ipf_nd_v4 = NULL;
}
if (softc->ipf_nd_v6 != NULL) {
! if (net_hook_unregister(softc->ipf_nd_v6, NH_PHYSICAL_IN,
! softc->ipf_hk_v6_in))
cmn_err(CE_WARN, "unregister-hook(v6-in) failed");
! if (net_hook_unregister(softc->ipf_nd_v6, NH_PHYSICAL_OUT,
! softc->ipf_hk_v6_out))
cmn_err(CE_WARN, "unregister-hook(v6-out) failed");
! if (net_hook_unregister(softc->ipf_nd_v6, NH_NIC_EVENTS,
! softc->ipf_hk_v6_nic))
cmn_err(CE_WARN, "unregister-hook(v6-nic) failed");
! net_protocol_release(softc->ipf_nd_v6);
softc->ipf_nd_v6 = NULL;
}
***************
*** 1172,1195 ****
HOOK_INIT(softc->ipf_hk_loop_v4_in, ipf_hk_v4_in,
"ipf_v4_loop_in", softc);
! if (net_register_hook(softc->ipf_nd_v4, NH_LOOPBACK_IN,
! &softc->ipf_hk_loop_v4_in))
cmn_err(CE_WARN, "register-hook(v4-loop_in) failed");
HOOK_INIT(softc->ipf_hk_loop_v4_out, ipf_hk_v4_out,
"ipf_v4_loop_out", softc);
! if (net_register_hook(softc->ipf_nd_v4, NH_LOOPBACK_OUT,
! &softc->ipf_hk_loop_v4_out))
cmn_err(CE_WARN, "register-hook(v4-loop_out) failed");
HOOK_INIT(softc->ipf_hk_loop_v6_in, ipf_hk_v6_in,
"ipf_v6_loop_in", softc);
! if (net_register_hook(softc->ipf_nd_v6, NH_LOOPBACK_IN,
! &softc->ipf_hk_loop_v6_in))
cmn_err(CE_WARN, "register-hook(v6-loop_in) failed");
HOOK_INIT(softc->ipf_hk_loop_v6_out, ipf_hk_v6_out,
"ipf_v6_loop_out", softc);
! if (net_register_hook(softc->ipf_nd_v6, NH_LOOPBACK_OUT,
! &softc->ipf_hk_loop_v6_out))
cmn_err(CE_WARN, "register-hook(v6-loop_out) failed");
}
--- 1172,1195 ----
HOOK_INIT(softc->ipf_hk_loop_v4_in, ipf_hk_v4_in,
"ipf_v4_loop_in", softc);
! if (net_hook_register(softc->ipf_nd_v4, NH_LOOPBACK_IN,
! softc->ipf_hk_loop_v4_in))
cmn_err(CE_WARN, "register-hook(v4-loop_in) failed");
HOOK_INIT(softc->ipf_hk_loop_v4_out, ipf_hk_v4_out,
"ipf_v4_loop_out", softc);
! if (net_hook_register(softc->ipf_nd_v4, NH_LOOPBACK_OUT,
! softc->ipf_hk_loop_v4_out))
cmn_err(CE_WARN, "register-hook(v4-loop_out) failed");
HOOK_INIT(softc->ipf_hk_loop_v6_in, ipf_hk_v6_in,
"ipf_v6_loop_in", softc);
! if (net_hook_register(softc->ipf_nd_v6, NH_LOOPBACK_IN,
! softc->ipf_hk_loop_v6_in))
cmn_err(CE_WARN, "register-hook(v6-loop_in) failed");
HOOK_INIT(softc->ipf_hk_loop_v6_out, ipf_hk_v6_out,
"ipf_v6_loop_out", softc);
! if (net_hook_register(softc->ipf_nd_v6, NH_LOOPBACK_OUT,
! softc->ipf_hk_loop_v6_out))
cmn_err(CE_WARN, "register-hook(v6-loop_out) failed");
}
***************
*** 1201,1218 ****
{
! if (net_unregister_hook(softc->ipf_nd_v4, NH_LOOPBACK_IN,
! &softc->ipf_hk_loop_v4_in))
cmn_err(CE_WARN, "unregister-hook(v4-loop_in) failed");
! if (net_unregister_hook(softc->ipf_nd_v4, NH_LOOPBACK_OUT,
! &softc->ipf_hk_loop_v4_out))
cmn_err(CE_WARN, "unregister-hook(v4-loop_out) failed");
! if (net_unregister_hook(softc->ipf_nd_v6, NH_LOOPBACK_IN,
! &softc->ipf_hk_loop_v6_in))
cmn_err(CE_WARN, "unregister-hook(v6-loop_in) failed");
! if (net_unregister_hook(softc->ipf_nd_v6, NH_LOOPBACK_OUT,
! &softc->ipf_hk_loop_v6_out))
cmn_err(CE_WARN, "unregister-hook(v6-loop_out) failed");
}
--- 1201,1218 ----
{
! if (net_hook_unregister(softc->ipf_nd_v4, NH_LOOPBACK_IN,
! softc->ipf_hk_loop_v4_in))
cmn_err(CE_WARN, "unregister-hook(v4-loop_in) failed");
! if (net_hook_unregister(softc->ipf_nd_v4, NH_LOOPBACK_OUT,
! softc->ipf_hk_loop_v4_out))
cmn_err(CE_WARN, "unregister-hook(v4-loop_out) failed");
! if (net_hook_unregister(softc->ipf_nd_v6, NH_LOOPBACK_IN,
! softc->ipf_hk_loop_v6_in))
cmn_err(CE_WARN, "unregister-hook(v6-loop_in) failed");
! if (net_hook_unregister(softc->ipf_nd_v6, NH_LOOPBACK_OUT,
! softc->ipf_hk_loop_v6_out))
cmn_err(CE_WARN, "unregister-hook(v6-loop_out) failed");
}
|