Mercurial > illumos > illumos-gate

changeset 2964:eb4788437d67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6418698 PSARC/2005/334 - Packet Filtering Hooks API (fix cstyle)
author dr146992
date Sat, 21 Oct 2006 23:16:22 -0700
parents bfdfcfe0052d
children 04989c63dc28
files usr/src/uts/common/inet/arp/arp.c usr/src/uts/common/inet/arp/arpddi.c usr/src/uts/common/inet/arp_impl.h usr/src/uts/common/inet/ip/ip.c usr/src/uts/common/inet/ip/ip6.c
diffstat 5 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/inet/arp/arp.c	Sat Oct 21 09:14:20 2006 -0700
+++ b/usr/src/uts/common/inet/arp/arp.c	Sat Oct 21 23:16:22 2006 -0700
@@ -3213,7 +3213,7 @@
 
 	DTRACE_PROBE3(arp__physical__in__start,
 	    arl_t *, arl, arh_t *, arh, mblk_t *, mp);
-    
+
 	ARP_HOOK_IN(arp_physical_in_event, arp_physical_in,
 		    arl->arl_index, arh, mp, mp1);
 
@@ -3659,9 +3659,9 @@
 	/* The ppa is sent down by ifconfig */
 	arl->arl_ppa = lifr->lifr_ppa;
 
-	/* 
+	/*
 	 * A network device is not considered to be fully plumb'd until
-	 * its name has been set using SIOCSLIFNAME.  Once it has 
+	 * its name has been set using SIOCSLIFNAME.  Once it has
 	 * been set, it cannot be set again (see code above), so there
 	 * is currently no danger in this function causing two NE_PLUMB
 	 * events without an intervening NE_UNPLUMB.
--- a/usr/src/uts/common/inet/arp/arpddi.c	Sat Oct 21 09:14:20 2006 -0700
+++ b/usr/src/uts/common/inet/arp/arpddi.c	Sat Oct 21 23:16:22 2006 -0700
@@ -58,7 +58,7 @@
 	error = mod_install(&modlinkage);
 	if (error != 0)
 		arp_ddi_destroy();
-	return error;
+	return (error);
 }
 
 int
@@ -69,7 +69,7 @@
 	error = mod_remove(&modlinkage);
 	if (error == 0)
 		arp_ddi_destroy();
-	return error;
+	return (error);
 }
 
 int
--- a/usr/src/uts/common/inet/arp_impl.h	Sat Oct 21 09:14:20 2006 -0700
+++ b/usr/src/uts/common/inet/arp_impl.h	Sat Oct 21 23:16:22 2006 -0700
@@ -117,7 +117,7 @@
 	int		ace_xmit_count;
 } ace_t;
 
-/* 
+/*
  * Hooks structures used inside of arp
  */
 extern hook_event_token_t	arp_physical_in;
@@ -128,12 +128,12 @@
 extern hook_event_t	arp_physical_out_event;
 extern hook_event_t	arp_nic_events;
 
-#define ARPHOOK_INTERESTED_PHYSICAL_IN	\
+#define	ARPHOOK_INTERESTED_PHYSICAL_IN	\
 	(arp_physical_in_event.he_interested)
-#define ARPHOOK_INTERESTED_PHYSICAL_OUT	\
+#define	ARPHOOK_INTERESTED_PHYSICAL_OUT	\
 	(arp_physical_out_event.he_interested)
 
-#define ARP_HOOK_IN(_hook, _event, _ilp, _hdr, _fm, _m)	\
+#define	ARP_HOOK_IN(_hook, _event, _ilp, _hdr, _fm, _m)	\
 								\
 	if ((_hook).he_interested) {                       	\
 		hook_pkt_event_t info;                          \
@@ -156,7 +156,7 @@
 		}                                               \
 	}
 
-#define ARP_HOOK_OUT(_hook, _event, _olp, _hdr, _fm, _m)	\
+#define	ARP_HOOK_OUT(_hook, _event, _olp, _hdr, _fm, _m)	\
 								\
 	if ((_hook).he_interested) {                       	\
 		hook_pkt_event_t info;                          \
--- a/usr/src/uts/common/inet/ip/ip.c	Sat Oct 21 09:14:20 2006 -0700
+++ b/usr/src/uts/common/inet/ip/ip.c	Sat Oct 21 23:16:22 2006 -0700
@@ -21951,7 +21951,8 @@
 		    ill_t *, ire->ire_ipif->ipif_ill, ipha_t *, ipha,
 		    mblk_t *, mp);
 		FW_HOOKS(ip4_physical_out_event, ipv4firewall_physical_out,
-		    MSG_FWCOOKED_OUT, NULL, ire->ire_ipif->ipif_ill, ipha, mp, mp);
+		    MSG_FWCOOKED_OUT, NULL, ire->ire_ipif->ipif_ill,
+		    ipha, mp, mp);
 		DTRACE_PROBE1(ip4__physical__out__end, mblk_t *, mp);
 		if (mp == NULL)
 			goto release_ire_and_ill;
--- a/usr/src/uts/common/inet/ip/ip6.c	Sat Oct 21 09:14:20 2006 -0700
+++ b/usr/src/uts/common/inet/ip/ip6.c	Sat Oct 21 23:16:22 2006 -0700
@@ -6921,7 +6921,7 @@
 
 	DTRACE_PROBE1(ip6__physical__in__end, mblk_t *, first_mp);
 
-	if (first_mp == NULL) 
+	if (first_mp == NULL)
 		return;
 
 	if ((ip6h->ip6_vcf & IPV6_VERS_AND_FLOW_MASK) ==