network_cmds-245.19.tar.gz

[apple/network_cmds.git] / racoon.tproj / isakmp_agg.c

diff --git a/racoon.tproj/isakmp_agg.c b/racoon.tproj/isakmp_agg.c
index bcad8051ee5d2a6d93baf4aed9f877fe41aa5a74..2f1ebc56b4dd85043f2696fceff0eb554ef520f4 100644 (file)
--- a/racoon.tproj/isakmp_agg.c
+++ b/racoon.tproj/isakmp_agg.c
@@ -457,18 +457,7 @@ agg_i2recv(iph1, msg)
             pa->type != ISAKMP_NPTYPE_NONE;
             pa++)
        {
             pa->type != ISAKMP_NPTYPE_NONE;
             pa++)
        {

-               if (pa->type == ISAKMP_NPTYPE_NATD_RFC ||
-                       pa->type == ISAKMP_NPTYPE_NATD_DRAFT ||
-                       pa->type == ISAKMP_NPTYPE_NATD_BADDRAFT)
-               {
-                       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;
-                       }                       
-                       
+               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)
                        natd_match_t match = natd_matches(iph1, pa->ptr);
                        iph1->natt_flags |= natt_natd_received;
                        if ((match & natd_match_local) != 0)


@@ -1388,15 +1377,7 @@ agg_r2recv(iph1, msg0)
                case ISAKMP_NPTYPE_NATD_DRAFT:
                case ISAKMP_NPTYPE_NATD_BADDRAFT:
 #ifdef IKE_NAT_T
                case ISAKMP_NPTYPE_NATD_DRAFT:
                case ISAKMP_NPTYPE_NATD_BADDRAFT:
 #ifdef IKE_NAT_T

-                       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;
-                       }
-                               
-                       {
+                       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)
                                natd_match_t match = natd_matches(iph1, pa->ptr);
                                iph1->natt_flags |= natt_natd_received;
                                if ((match & natd_match_local) != 0)