ipsec-292.tar.gz

diff --git a/ipsec-tools/racoon/api_support.h b/ipsec-tools/racoon/api_support.h
index 6143116330a74e9ec6b4b99683cda86cc3246583..96e4e20bd7c236184b9790db19242102b836930d 100644 (file)
--- a/ipsec-tools/racoon/api_support.h
+++ b/ipsec-tools/racoon/api_support.h
@@ -28,8 +28,6 @@
 #include <net/pfkeyv2.h>
 #include "racoon_types.h"
 #include <sys/socket.h>
-#include <SNIPSecIKEDefinitions.h>
-#include <SNIPSecIKE.h>
 
 typedef uint32_t InternalSessionRef;
 typedef uint32_t InternalItemRef;

diff --git a/ipsec-tools/racoon/ipsec_xpc.h b/ipsec-tools/racoon/ipsec_xpc.h
index 3b64e8378bfcd725ccbc9452868346ccc1810561..6939608496fb2e19afb8cf8e4a8e21734a0c8593 100644 (file)
--- a/ipsec-tools/racoon/ipsec_xpc.h
+++ b/ipsec-tools/racoon/ipsec_xpc.h
@@ -59,8 +59,6 @@
 
 #define REPLYOFFSET         0x1000
 
-#define kSNIPSecDBInvalidSPI        0
-
 enum {
        IPSECIKE_CREATE         = 0x0001,
        IPSECIKE_START,

diff --git a/ipsec-tools/racoon/pfkey_racoon.c b/ipsec-tools/racoon/pfkey_racoon.c
index 665f69e6f3648b532b38696695d26dbaf1483a2e..63c61dd94dc897e203f7745e19378bf780dfa4e0 100644 (file)
--- a/ipsec-tools/racoon/pfkey_racoon.c
+++ b/ipsec-tools/racoon/pfkey_racoon.c
@@ -157,10 +157,11 @@ NULL,     /* SADB_X_SPDSETIDX */
 pk_recvspdexpire,
 NULL,  /* SADB_X_SPDDELETE2 */
 pk_recvgetsastat, /* SADB_GETSASTAT */
-NULL,  /* SADB_X_NAT_T_NEW_MAPPING */
-NULL, /* SADB_X_MIGRATE */
-#if (SADB_MAX > 25)
-#error "SADB extra message?"
+NULL,  /* SADB_X_SPDENABLE */
+NULL, /* SADB_X_SPDDISNABLE */
+NULL, /* SADB_MIGRATE */
+#if (SADB_MAX > 26)
+#warning "SADB extra message?"
 #endif
 };
 

diff --git a/ipsec-tools/racoon/session.c b/ipsec-tools/racoon/session.c
index 694ca2fab461251d38091e30b331dfcbabcb9195..11915b2133ea467fa3daf74ced598336ae89d948 100644 (file)
--- a/ipsec-tools/racoon/session.c
+++ b/ipsec-tools/racoon/session.c
@@ -72,6 +72,7 @@
 #include <TargetConditionals.h>
 #include <vproc_priv.h>
 #include <dispatch/dispatch.h>
+#include <xpc/xpc.h>
 
 #include "libpfkey.h"
 
@@ -314,6 +315,9 @@ session(void)
                                "cannot open %s", pid_file);
                }
        }
+       
+       xpc_transaction_begin();
+       
 #if !TARGET_OS_EMBEDDED
        // enable keepalive for recovery (from crashes and bad exits... after init)
        (void)launchd_update_racoon_keepalive(true);
@@ -339,6 +343,8 @@ close_session(int error)
        ike_session_flush_all_phase1(false);
        close_sockets();
 
+       xpc_transaction_end();
+       
 #if !TARGET_OS_EMBEDDED
        // a clean exit, so disable launchd keepalive
        (void)launchd_update_racoon_keepalive(false);

diff --git a/ipsec.xcodeproj/project.pbxproj b/ipsec.xcodeproj/project.pbxproj
index 33ec9e6ce0f8630b9bcd5552a8acfb3e39be76a1..1aa91c10cd88b56eb1359875816f39b77cd7b95f 100644 (file)
--- a/ipsec.xcodeproj/project.pbxproj
+++ b/ipsec.xcodeproj/project.pbxproj
@@ -722,7 +722,6 @@
                BACBF18B10290AE000BBFC85 /* ipsec.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipsec.txt; sourceTree = "<group>"; };
                BACD8C681496A50C0042DEA1 /* Preferences.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Preferences.c; sourceTree = "<group>"; };
                BACD8C691496A50C0042DEA1 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Preferences.h; sourceTree = "<group>"; };
-               C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = AspenSDK.xcconfig; path = AppleInternal/XcodeConfig/AspenSDK.xcconfig; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -799,7 +798,6 @@
                                BA64A933114EFE5C00F3574C /* racoon.sb */,
                                BACBF18B10290AE000BBFC85 /* ipsec.txt */,
                                72265DDB0F818F9300730A7D /* ipsec.plist */,
-                               C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */,
                                25E5E82D0981A61900F2834C /* ipsec-tools */,
                                2589CB5409D8AE95002DC960 /* Libraries */,
                                25D3DB4C098998230025F703 /* Frameworks */,
@@ -2108,7 +2106,6 @@
                };
                812530B60D3FE994006BDF4F /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
@@ -2134,7 +2131,6 @@
                };
                812530B70D3FE994006BDF4F /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
@@ -2160,7 +2156,6 @@
                };
                812530B90D3FE994006BDF4F /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ADDITIONAL_SDKS = "";
                                ARCHS = (
@@ -2186,7 +2181,6 @@
                };
                812531060D3FE9DC006BDF4F /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
@@ -2244,7 +2238,6 @@
                };
                812531070D3FE9DC006BDF4F /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
@@ -2299,7 +2292,6 @@
                };
                812531090D3FE9DC006BDF4F /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "$(inherited)";
@@ -2354,7 +2346,6 @@
                };
                81DDFDA70D622C1700C5CB87 /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                CODE_SIGN_IDENTITY = "";
@@ -2397,7 +2388,6 @@
                };
                81DDFDA80D622C1700C5CB87 /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                CODE_SIGN_IDENTITY = "";
@@ -2439,7 +2429,6 @@
                };
                81DDFDA90D622C1700C5CB87 /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                CODE_SIGN_IDENTITY = "";
@@ -2479,7 +2468,6 @@
                };
                81DDFDCA0D622C2700C5CB87 /* Development */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
@@ -2518,7 +2506,6 @@
                };
                81DDFDCB0D622C2700C5CB87 /* Deployment */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";
@@ -2554,7 +2541,6 @@
                };
                81DDFDCC0D622C2700C5CB87 /* Default */ = {
                        isa = XCBuildConfiguration;
-                       baseConfigurationReference = C172BD980E6369BE0030F8EB /* AspenSDK.xcconfig */;
                        buildSettings = {
                                ALTERNATE_GROUP = "$(inherited)";
                                ALTERNATE_MODE = "";