| sctp_asconf.c (163957) | sctp_asconf.c (164085) |
|---|---|
| 1/*- 2 * Copyright (c) 2001-2006, Cisco Systems, Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are met: 6 * 7 * a) Redistributions of source code must retain the above copyright notice, 8 * this list of conditions and the following disclaimer. --- 17 unchanged lines hidden (view full) --- 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 28 * THE POSSIBILITY OF SUCH DAMAGE. 29 */ 30 31/* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ 32 33#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001-2006, Cisco Systems, Inc. All rights reserved. 3 * 4 * Redistribution and use in source and binary forms, with or without 5 * modification, are permitted provided that the following conditions are met: 6 * 7 * a) Redistributions of source code must retain the above copyright notice, 8 * this list of conditions and the following disclaimer. --- 17 unchanged lines hidden (view full) --- 26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 28 * THE POSSIBILITY OF SUCH DAMAGE. 29 */ 30 31/* $KAME: sctp_asconf.c,v 1.24 2005/03/06 16:04:16 itojun Exp $ */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 163957 2006-11-03 19:48:56Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_asconf.c 164085 2006-11-08 00:21:13Z rrs $"); |
| 35 36 37 38#include "opt_ipsec.h" 39#include "opt_compat.h" 40#include "opt_inet6.h" 41#include "opt_inet.h" 42 --- 1226 unchanged lines hidden (view full) --- 1269 1270 aa->ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS; 1271 aa->ap.addrp.ph.param_length = (sizeof(struct sctp_ipv4addr_param)); 1272 aa->ap.aph.ph.param_length = sizeof(struct sctp_asconf_paramhdr) + sizeof(struct sctp_ipv4addr_param); 1273 memcpy(&aa->ap.addrp.addr, &sin->sin_addr, 1274 sizeof(struct in_addr)); 1275 } else { 1276 /* invalid family! */ | 35 36 37 38#include "opt_ipsec.h" 39#include "opt_compat.h" 40#include "opt_inet6.h" 41#include "opt_inet.h" 42 --- 1226 unchanged lines hidden (view full) --- 1269 1270 aa->ap.addrp.ph.param_type = SCTP_IPV4_ADDRESS; 1271 aa->ap.addrp.ph.param_length = (sizeof(struct sctp_ipv4addr_param)); 1272 aa->ap.aph.ph.param_length = sizeof(struct sctp_asconf_paramhdr) + sizeof(struct sctp_ipv4addr_param); 1273 memcpy(&aa->ap.addrp.addr, &sin->sin_addr, 1274 sizeof(struct in_addr)); 1275 } else { 1276 /* invalid family! */ |
| 1277 SCTP_FREE(aa); |
|
| 1277 return (-1); 1278 } 1279 aa->sent = 0; /* clear sent flag */ 1280 1281 /* 1282 * if we are deleting an address it should go out last otherwise, 1283 * add it to front of the pending queue 1284 */ --- 1573 unchanged lines hidden --- | 1278 return (-1); 1279 } 1280 aa->sent = 0; /* clear sent flag */ 1281 1282 /* 1283 * if we are deleting an address it should go out last otherwise, 1284 * add it to front of the pending queue 1285 */ --- 1573 unchanged lines hidden --- |