| ipx.c (67893) | ipx.c (69781) |
|---|---|
| 1/* 2 * Copyright (c) 1995, Mike Mitchell 3 * Copyright (c) 1984, 1985, 1986, 1987, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 19 unchanged lines hidden (view full) --- 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)ipx.c 35 * | 1/* 2 * Copyright (c) 1995, Mike Mitchell 3 * Copyright (c) 1984, 1985, 1986, 1987, 1993 4 * The Regents of the University of California. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 19 unchanged lines hidden (view full) --- 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * 34 * @(#)ipx.c 35 * |
| 36 * $FreeBSD: head/sys/netipx/ipx.c 67893 2000-10-29 16:06:56Z phk $ | 36 * $FreeBSD: head/sys/netipx/ipx.c 69781 2000-12-08 21:51:06Z dwmalone $ |
| 37 */ 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/malloc.h> 42#include <sys/sockio.h> 43#include <sys/socket.h> 44 --- 79 unchanged lines hidden (view full) --- 124 if (cmd == SIOCDIFADDR && ia == NULL) 125 return (EADDRNOTAVAIL); 126 /* FALLTHROUGH */ 127 128 case SIOCSIFADDR: 129 case SIOCSIFDSTADDR: 130 if (ia == NULL) { 131 oia = (struct ipx_ifaddr *) | 37 */ 38 39#include <sys/param.h> 40#include <sys/systm.h> 41#include <sys/malloc.h> 42#include <sys/sockio.h> 43#include <sys/socket.h> 44 --- 79 unchanged lines hidden (view full) --- 124 if (cmd == SIOCDIFADDR && ia == NULL) 125 return (EADDRNOTAVAIL); 126 /* FALLTHROUGH */ 127 128 case SIOCSIFADDR: 129 case SIOCSIFDSTADDR: 130 if (ia == NULL) { 131 oia = (struct ipx_ifaddr *) |
| 132 malloc(sizeof(*ia), M_IFADDR, M_WAITOK); | 132 malloc(sizeof(*ia), M_IFADDR, 133 M_WAITOK | M_ZERO); |
| 133 if (oia == NULL) 134 return (ENOBUFS); | 134 if (oia == NULL) 135 return (ENOBUFS); |
| 135 bzero((caddr_t)oia, sizeof(*oia)); | |
| 136 if ((ia = ipx_ifaddr) != NULL) { 137 for ( ; ia->ia_next != NULL; ia = ia->ia_next) 138 ; 139 ia->ia_next = oia; 140 } else 141 ipx_ifaddr = oia; 142 ia = oia; 143 ifa = (struct ifaddr *)ia; --- 248 unchanged lines hidden --- | 136 if ((ia = ipx_ifaddr) != NULL) { 137 for ( ; ia->ia_next != NULL; ia = ia->ia_next) 138 ; 139 ia->ia_next = oia; 140 } else 141 ipx_ifaddr = oia; 142 ia = oia; 143 ifa = (struct ifaddr *)ia; --- 248 unchanged lines hidden --- |