| pfkey.c (302408) | pfkey.c (315514) |
|---|---|
| 1/* $KAME: pfkey.c,v 1.46 2003/08/26 03:37:06 itojun Exp $ */ 2 3/* 4 * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 16 unchanged lines hidden (view full) --- 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * SUCH DAMAGE. 30 */ 31 32#include <sys/cdefs.h> | 1/* $KAME: pfkey.c,v 1.46 2003/08/26 03:37:06 itojun Exp $ */ 2 3/* 4 * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 16 unchanged lines hidden (view full) --- 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * SUCH DAMAGE. 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: stable/11/lib/libipsec/pfkey.c 298214 2016-04-18 15:08:31Z pfg $"); | 33__FBSDID("$FreeBSD: stable/11/lib/libipsec/pfkey.c 315514 2017-03-18 22:04:20Z ae $"); |
| 34 35#include <sys/types.h> 36#include <sys/param.h> 37#include <sys/socket.h> 38#include <net/pfkeyv2.h> 39#include <netipsec/key_var.h> 40#include <netinet/in.h> 41#include <netipsec/ipsec.h> --- 1729 unchanged lines hidden (view full) --- 1771 case SADB_EXT_IDENTITY_DST: 1772 case SADB_EXT_SENSITIVITY: 1773 case SADB_EXT_PROPOSAL: 1774 case SADB_EXT_SUPPORTED_AUTH: 1775 case SADB_EXT_SUPPORTED_ENCRYPT: 1776 case SADB_EXT_SPIRANGE: 1777 case SADB_X_EXT_POLICY: 1778 case SADB_X_EXT_SA2: | 34 35#include <sys/types.h> 36#include <sys/param.h> 37#include <sys/socket.h> 38#include <net/pfkeyv2.h> 39#include <netipsec/key_var.h> 40#include <netinet/in.h> 41#include <netipsec/ipsec.h> --- 1729 unchanged lines hidden (view full) --- 1771 case SADB_EXT_IDENTITY_DST: 1772 case SADB_EXT_SENSITIVITY: 1773 case SADB_EXT_PROPOSAL: 1774 case SADB_EXT_SUPPORTED_AUTH: 1775 case SADB_EXT_SUPPORTED_ENCRYPT: 1776 case SADB_EXT_SPIRANGE: 1777 case SADB_X_EXT_POLICY: 1778 case SADB_X_EXT_SA2: |
| 1779 mhp[ext->sadb_ext_type] = (caddr_t)ext; 1780 break; | |
| 1781 case SADB_X_EXT_NAT_T_TYPE: 1782 case SADB_X_EXT_NAT_T_SPORT: 1783 case SADB_X_EXT_NAT_T_DPORT: | 1779 case SADB_X_EXT_NAT_T_TYPE: 1780 case SADB_X_EXT_NAT_T_SPORT: 1781 case SADB_X_EXT_NAT_T_DPORT: |
| 1784 /* case SADB_X_EXT_NAT_T_OA: is OAI */ | |
| 1785 case SADB_X_EXT_NAT_T_OAI: 1786 case SADB_X_EXT_NAT_T_OAR: 1787 case SADB_X_EXT_NAT_T_FRAG: | 1782 case SADB_X_EXT_NAT_T_OAI: 1783 case SADB_X_EXT_NAT_T_OAR: 1784 case SADB_X_EXT_NAT_T_FRAG: |
| 1788 if (feature_present("ipsec_natt")) { 1789 mhp[ext->sadb_ext_type] = (caddr_t)ext; 1790 break; 1791 } 1792 /* FALLTHROUGH */ | 1785 case SADB_X_EXT_SA_REPLAY: 1786 case SADB_X_EXT_NEW_ADDRESS_SRC: 1787 case SADB_X_EXT_NEW_ADDRESS_DST: 1788 mhp[ext->sadb_ext_type] = (caddr_t)ext; 1789 break; |
| 1793 default: 1794 __ipsec_errcode = EIPSEC_INVAL_EXTTYPE; 1795 return -1; 1796 } 1797 1798 p += PFKEY_EXTLEN(ext); 1799 } 1800 --- 337 unchanged lines hidden --- | 1790 default: 1791 __ipsec_errcode = EIPSEC_INVAL_EXTTYPE; 1792 return -1; 1793 } 1794 1795 p += PFKEY_EXTLEN(ext); 1796 } 1797 --- 337 unchanged lines hidden --- |