PERFORCE change 165743 for review

[Ana Kukec]

http://perforce.freebsd.org/chv.cgi?CH=165743

Change 165743 by anchie at anchie_malimis on 2009/07/07 10:46:06

	Minor bug fixes.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/net/route.h#6 edit
.. //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#6 edit
.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#12 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/net/route.h#6 (text+ko) ====

@@ -257,7 +257,7 @@
 #define	RTM_DELMADDR	0x10	/* mcast group membership being deleted */
 #define	RTM_IFANNOUNCE	0x11	/* iface arrival/departure */
 #define	RTM_IEEE80211	0x12	/* IEEE80211 wireless event */
-#define	RTM_SND		0x13	/* SeND event. */
+#define	RTM_SND		0x13	/* SeND event */
 
 /*
  * Bitmask values for rtm_inits and rmx_locks.
@@ -379,7 +379,7 @@
 struct ifmultiaddr;
 
 void	 rt_ieee80211msg(struct ifnet *, int, void *, size_t);
-void	 rt_securendmsg(struct ifnet *, int, void *, size_t data_len);
+void	 rt_securendmsg(struct ifnet *, int, void *, size_t);
 void	 rt_ifannouncemsg(struct ifnet *, int);
 void	 rt_ifmsg(struct ifnet *);
 void	 rt_missmsg(int, struct rt_addrinfo *, int, int);

==== //depot/projects/soc2009/anchie_send/src/sys/net/rtsock.c#6 (text+ko) ====

@@ -1181,15 +1181,15 @@
 void
 rt_securendmsg(struct ifnet *ifp, int direction, void *data, size_t data_len)
 {
-	struct mbuf *m;
+	struct mbuf *m = NULL;
 	struct rt_addrinfo info;
 
 	switch (direction) {
-	case SEND_IN:
+	case SND_IN:
 		/* Incoming traffic sent to userspace for SeND validation. */
 		m = rt_makeifannouncemsg(ifp, RTM_SND, RTM_SND_IN, &info);
 		break;
-	case SEND_OUT:	
+	case SND_OUT:	
 		/* Outgoing traffic sent to userspace for SeND protection. */
 		m = rt_makeifannouncemsg(ifp, RTM_SND, RTM_SND_OUT, &info);
 		break;

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#12 (text+ko) ====

@@ -24,13 +24,13 @@
 }
 
 static int
-send_output(int in, struct ifnet *ifp, struct mbuf *m, int msglen)
+send_output(struct mbuf *m, struct ifnet *ifp, int in, int msglen)
 {
 
 	/* 
 	 * Send incoming or outgoing traffic to the user space either to be
 	 * protected (outgoing) or validated (incoming) according to rfc3971. */
-	rt_sndmsg(ifp, in, m, msglen);
+	rt_securendmsg(ifp, in, m, msglen);
 
 	return (0);
 }