X-Git-Url: https://git.saurik.com/apple/network_cmds.git/blobdiff_plain/a2c93a7642e62c7ca181f6c580d729f73b14bded..f47db663cb3ae4d2fc391bb3acf9d0c2b38a41b7:/racoon.tproj/isakmp_ident.c?ds=sidebyside

diff --git a/racoon.tproj/isakmp_ident.c b/racoon.tproj/isakmp_ident.c
index 6ed424f..e5c46c2 100644
--- a/racoon.tproj/isakmp_ident.c
+++ b/racoon.tproj/isakmp_ident.c
@@ -441,17 +441,9 @@ ident_i3recv(iph1, msg)
 		case ISAKMP_NPTYPE_NATD_DRAFT:
 		case ISAKMP_NPTYPE_NATD_BADDRAFT:
 #ifdef IKE_NAT_T
-			{
-				natd_match_t match;
 				
-				if (pa->type != iph1->natd_payload_type) {
-					plog(LLV_ERROR, LOCATION, iph1->remote,
-						"ignore the packet, "
-						"received unexpected natd payload type %d.\n",
-						pa->type);
-					goto end;
-				}			
-				match = natd_matches(iph1, pa->ptr);
+			if (pa->type == iph1->natd_payload_type) {
+				natd_match_t match = natd_matches(iph1, pa->ptr);
 				iph1->natt_flags |= natt_natd_received;
 				if ((match & natd_match_local) != 0)
 					iph1->natt_flags |= natt_no_local_nat;
@@ -1098,17 +1090,8 @@ ident_r2recv(iph1, msg)
 		case ISAKMP_NPTYPE_NATD_DRAFT:
 		case ISAKMP_NPTYPE_NATD_BADDRAFT:
 #ifdef IKE_NAT_T
-			{
-				natd_match_t match;
-				
-				if (pa->type != iph1->natd_payload_type) {
-					plog(LLV_ERROR, LOCATION, iph1->remote,
-						"ignore the packet, "
-						"received unexpected natd payload type %d.\n",
-						pa->type);
-					goto end;
-				}			
-				match = natd_matches(iph1, pa->ptr);
+			if (pa->type == iph1->natd_payload_type) {
+				natd_match_t match = natd_matches(iph1, pa->ptr);
 				iph1->natt_flags |= natt_natd_received;
 				if ((match & natd_match_local) != 0)
 					iph1->natt_flags |= natt_no_local_nat;