| ip_reass.c (82884) | ip_reass.c (83130) |
|---|---|
| 1/* 2 * Copyright (c) 1982, 1986, 1988, 1993 3 * The Regents of the University of California. 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 --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 | 1/* 2 * Copyright (c) 1982, 1986, 1988, 1993 3 * The Regents of the University of California. 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 --- 17 unchanged lines hidden (view full) --- 26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * SUCH DAMAGE. 32 * 33 * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 |
| 34 * $FreeBSD: head/sys/netinet/ip_input.c 82884 2001-09-03 20:03:55Z julian $ | 34 * $FreeBSD: head/sys/netinet/ip_input.c 83130 2001-09-06 02:40:43Z jlemon $ |
| 35 */ 36 37#define _IP_VHL 38 39#include "opt_bootp.h" 40#include "opt_ipfw.h" 41#include "opt_ipdn.h" 42#include "opt_ipdivert.h" --- 1794 unchanged lines hidden (view full) --- 1837 struct sockaddr_dl sdl; 1838 u_char pad[32]; 1839 } sdlbuf; 1840 struct sockaddr_dl *sdp; 1841 struct sockaddr_dl *sdl2 = &sdlbuf.sdl; 1842 1843 if (((ifp = m->m_pkthdr.rcvif)) 1844 && ( ifp->if_index && (ifp->if_index <= if_index))) { | 35 */ 36 37#define _IP_VHL 38 39#include "opt_bootp.h" 40#include "opt_ipfw.h" 41#include "opt_ipdn.h" 42#include "opt_ipdivert.h" --- 1794 unchanged lines hidden (view full) --- 1837 struct sockaddr_dl sdl; 1838 u_char pad[32]; 1839 } sdlbuf; 1840 struct sockaddr_dl *sdp; 1841 struct sockaddr_dl *sdl2 = &sdlbuf.sdl; 1842 1843 if (((ifp = m->m_pkthdr.rcvif)) 1844 && ( ifp->if_index && (ifp->if_index <= if_index))) { |
| 1845 sdp = (struct sockaddr_dl *)(ifnet_addrs 1846 [ifp->if_index - 1]->ifa_addr); | 1845 sdp = (struct sockaddr_dl *) 1846 (ifaddr_byindex(ifp->if_index)->ifa_addr); |
| 1847 /* 1848 * Change our mind and don't try copy. 1849 */ 1850 if ((sdp->sdl_family != AF_LINK) 1851 || (sdp->sdl_len > sizeof(sdlbuf))) { 1852 goto makedummy; 1853 } 1854 bcopy(sdp, sdl2, sdp->sdl_len); --- 52 unchanged lines hidden --- | 1847 /* 1848 * Change our mind and don't try copy. 1849 */ 1850 if ((sdp->sdl_family != AF_LINK) 1851 || (sdp->sdl_len > sizeof(sdlbuf))) { 1852 goto makedummy; 1853 } 1854 bcopy(sdp, sdl2, sdp->sdl_len); --- 52 unchanged lines hidden --- |