Deleted Added
full compact
send.c (254523) send.c (254889)
1/*-
2 * Copyright (c) 2009-2010 Ana Kukec <anchie@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009-2010 Ana Kukec <anchie@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/netinet6/send.c 254523 2013-08-19 13:27:32Z andre $");
28__FBSDID("$FreeBSD: head/sys/netinet6/send.c 254889 2013-08-25 21:54:41Z markj $");
29
29
30#include "opt_kdtrace.h"
31
30#include <sys/param.h>
31#include <sys/kernel.h>
32#include <sys/mbuf.h>
33#include <sys/module.h>
34#include <sys/priv.h>
35#include <sys/protosw.h>
32#include <sys/param.h>
33#include <sys/kernel.h>
34#include <sys/mbuf.h>
35#include <sys/module.h>
36#include <sys/priv.h>
37#include <sys/protosw.h>
38#include <sys/sdt.h>
36#include <sys/systm.h>
37#include <sys/socket.h>
38#include <sys/sockstate.h>
39#include <sys/sockbuf.h>
40#include <sys/socketvar.h>
41#include <sys/types.h>
42
43#include <net/route.h>
44#include <net/if.h>
45#include <net/if_var.h>
46#include <net/vnet.h>
47
48#include <netinet/in.h>
39#include <sys/systm.h>
40#include <sys/socket.h>
41#include <sys/sockstate.h>
42#include <sys/sockbuf.h>
43#include <sys/socketvar.h>
44#include <sys/types.h>
45
46#include <net/route.h>
47#include <net/if.h>
48#include <net/if_var.h>
49#include <net/vnet.h>
50
51#include <netinet/in.h>
52#include <netinet/in_kdtrace.h>
49#include <netinet/ip_var.h>
50#include <netinet/ip6.h>
51#include <netinet/icmp6.h>
52
53#include <netinet6/in6_var.h>
54#include <netinet6/nd6.h>
55#include <netinet6/scope6_var.h>
56#include <netinet6/send.h>

--- 120 unchanged lines hidden (view full) ---

177
178 bzero(&dst, sizeof(dst));
179 dst.sin6_family = AF_INET6;
180 dst.sin6_len = sizeof(dst);
181 dst.sin6_addr = ip6->ip6_dst;
182
183 m_clrprotoflags(m); /* Avoid confusing lower layers. */
184
53#include <netinet/ip_var.h>
54#include <netinet/ip6.h>
55#include <netinet/icmp6.h>
56
57#include <netinet6/in6_var.h>
58#include <netinet6/nd6.h>
59#include <netinet6/scope6_var.h>
60#include <netinet6/send.h>

--- 120 unchanged lines hidden (view full) ---

181
182 bzero(&dst, sizeof(dst));
183 dst.sin6_family = AF_INET6;
184 dst.sin6_len = sizeof(dst);
185 dst.sin6_addr = ip6->ip6_dst;
186
187 m_clrprotoflags(m); /* Avoid confusing lower layers. */
188
189 IP_PROBE(send, NULL, NULL, ip6, ifp, NULL, ip6);
190
185 /*
186 * Output the packet as nd6.c:nd6_output_lle() would do.
187 * The mbuf is always consumed, so we do not have to care
188 * about that.
189 * XXX-BZ as we added data, what about fragmenting,
190 * if now needed?
191 */
192 int error;

--- 177 unchanged lines hidden ---
191 /*
192 * Output the packet as nd6.c:nd6_output_lle() would do.
193 * The mbuf is always consumed, so we do not have to care
194 * about that.
195 * XXX-BZ as we added data, what about fragmenting,
196 * if now needed?
197 */
198 int error;

--- 177 unchanged lines hidden ---