PERFORCE change 181483 for review
Bjoern A. Zeeb
bz at FreeBSD.org
Wed Jul 28 08:21:48 UTC 2010
http://p4web.freebsd.org/@@181483?ac=10
Change 181483 by bz at bz_whit on 2010/07/27 21:16:02
Add FreeBSD tag to the module Makefile.
Remove trailing sapces or tabs from lines.
Affected files ...
.. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#16 edit
.. //depot/projects/soc2009/anchie_send/src/sys/modules/send/Makefile#2 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet/in.h#8 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#45 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_proto.c#8 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#35 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#21 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#14 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#47 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#23 edit
.. //depot/projects/soc2009/anchie_send/src/sys/sys/mbuf.h#9 edit
Differences ...
==== //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#16 (text+ko) ====
==== //depot/projects/soc2009/anchie_send/src/sys/modules/send/Makefile#2 (text+ko) ====
@@ -1,6 +1,7 @@
-.PATH: ${.CURDIR}/../../netinet6
+# $FreeBSD$
+.PATH: ${.CURDIR}/../../netinet6
KMOD= send
-SRCS= send.c
+SRCS= send.c
.include <bsd.kmod.mk>
==== //depot/projects/soc2009/anchie_send/src/sys/netinet/in.h#8 (text+ko) ====
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#45 (text+ko) ====
@@ -772,7 +772,7 @@
/* Send incoming SeND packet to user space. */
if (send_sendso_input_hook != NULL) {
- IP6_EXTHDR_CHECK(m, off,
+ IP6_EXTHDR_CHECK(m, off,
icmp6len, IPPROTO_DONE);
error = send_sendso_input_hook(m,
SND_IN, ip6len);
@@ -786,7 +786,7 @@
goto freeit;
}
if (send_sendso_input_hook != NULL) {
- IP6_EXTHDR_CHECK(m, off,
+ IP6_EXTHDR_CHECK(m, off,
icmp6len, IPPROTO_DONE);
error = send_sendso_input_hook(n,
SND_IN, ip6len);
@@ -812,7 +812,7 @@
/* Send incoming SeND-protected/ND packet to user space. */
if (send_sendso_input_hook != NULL) {
error = send_sendso_input_hook(m,
- SND_IN, ip6len);
+ SND_IN, ip6len);
if (error == 0)
return (IPPROTO_DONE);
nd6_ra_input(m, off, icmp6len);
@@ -824,7 +824,7 @@
}
if (send_sendso_input_hook != NULL) {
error = send_sendso_input_hook(n,
- SND_IN, ip6len);
+ SND_IN, ip6len);
if (error == 0)
return (IPPROTO_DONE);
nd6_ra_input(n, off, icmp6len);
@@ -842,11 +842,10 @@
if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
if (send_sendso_input_hook != NULL) {
error = send_sendso_input_hook(m,
- SND_IN, ip6len);
+ SND_IN, ip6len);
if (error == 0)
return (IPPROTO_DONE);
nd6_ns_input(m, off, icmp6len);
-
} else
nd6_ns_input(m, off, icmp6len);
m_freem(n);
@@ -905,7 +904,7 @@
if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) {
if (send_sendso_input_hook != NULL) {
error = send_sendso_input_hook(m,
- SND_IN, ip6len);
+ SND_IN, ip6len);
if (error == 0)
return (IPPROTO_DONE);
icmp6_redirect_input(m, off);
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/in6_proto.c#8 (text+ko) ====
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#35 (text+ko) ====
@@ -1775,7 +1775,7 @@
unsigned short *nd_type;
ip6 = mtod(m, struct ip6_hdr *);
- ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen);
+ ip6len = sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen);
#ifdef INVARIANTS
if (lle != NULL) {
@@ -1958,7 +1958,7 @@
nd_type = (unsigned short *)(mtag + 1);
/* Use the SEND socket */
error = send_sendso_input_hook(m, SND_OUT,
- ip6len);
+ ip6len);
/* -1 == no app on SEND socket */
if (error == 0 || error != -1)
return (error);
@@ -1973,8 +1973,9 @@
* after the lock is dropped
*/
- /* XXX-AK: In case of SeND loaded, this should be added to
- * the input hook.
+ /*
+ * XXX-AK: In case of SeND loaded, this should be added to
+ * the input hook.
*/
if (lle != NULL) {
if (*chain == NULL)
@@ -1992,14 +1993,14 @@
return (error);
}
- /*
- * In case of NS, NA and Redirect, we end-up here after calling
- * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output().
- * RS and RA do not have such output
- * routines. They are handled instead by rtadvd and rtsol daemons.
+ /*
+ * In case of NS, NA and Redirect, we end-up here after calling
+ * nd6_ns_output()/nd6_na_output()/icmp6_redirect_output().
+ * RS and RA do not have such output routines. They are handled
+ * instead by rtadvd and rtsol daemons.
*
- * if_output() routines together with previous chaining will be called
- * from input hook.
+ * if_output() routines together with previous chaining will be called
+ * from input hook.
*/
if ((ifp->if_flags & IFF_LOOPBACK) != 0) {
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_nbr.c#21 (text+ko) ====
@@ -623,7 +623,7 @@
struct llentry *ln = NULL;
union nd_opts ndopts;
struct mbuf *chain = NULL;
- struct m_tag *mtag;
+ struct m_tag *mtag;
struct sockaddr_in6 sin6;
char ip6bufs[INET6_ADDRSTRLEN], ip6bufd[INET6_ADDRSTRLEN];
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/raw_ip6.c#14 (text+ko) ====
@@ -531,8 +531,8 @@
*p = in6_cksum(m, ip6->ip6_nxt, sizeof(*ip6), plen);
}
- /*
- * Send RA/RS messages to user land for protection, before sending
+ /*
+ * Send RA/RS messages to user land for protection, before sending
* them to rtadvd/rtsol.
*/
if ((send_sendso_input_hook != NULL) &&
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#47 (text+ko) ====
==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#23 (text+ko) ====
@@ -27,7 +27,7 @@
#ifndef _NETINET6_SEND_H_
#define _NETINET6_SEND_H_
-#define SND_OUT 0 /* Outgoing traffic */
+#define SND_OUT 0 /* Outgoing traffic */
#define SND_IN 1 /* Incoming traffic. */
struct sockaddr_send {
==== //depot/projects/soc2009/anchie_send/src/sys/sys/mbuf.h#9 (text+ko) ====
More information about the p4-projects
mailing list