wo#4822 . minor edits to nat_traversal defines, mention final RFC

xelerance · Jun 12, 2017 · f2ff8b4 · f2ff8b4
1 parent 8800a81
commit f2ff8b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/linux/include/openswan.h b/linux/include/openswan.h
@@ -133,7 +133,7 @@
 
 #if !defined(ESPINUDP_WITH_NON_IKE)
 #define ESPINUDP_WITH_NON_IKE   1  /* draft-ietf-ipsec-nat-t-ike-00/01 */
-#define ESPINUDP_WITH_NON_ESP   2  /* draft-ietf-ipsec-nat-t-ike-02    */
+#define ESPINUDP_WITH_NON_ESP   2  /* ipsec-nat-t-ike-02, rfc3948      */
 #endif
 
 /*

diff --git a/programs/pluto/ikev2_notify.c b/programs/pluto/ikev2_notify.c
@@ -123,7 +123,9 @@ stf_status process_nat_payload(struct state *st
     if(same_chunk(*data, calculated_hash)) {
         DBG(DBG_PARSING|DBG_CONTROLMORE, DBG_log("nat-t payloads for %s match: no NAT", payload_name));
     } else {
-        st->hidden_variables.st_nat_traversal = NAT_T_WITH_RFC_VALUES | NAT_T_DETECTED;
+        st->hidden_variables.st_nat_traversal = NAT_T_WITH_RFC_VALUES |
+            NAT_T_DETECTED;
+
         switch(notify_type) {
         case v2N_NAT_DETECTION_DESTINATION_IP:
             loglog(RC_COMMENT, "detected that I am NATed");

diff --git a/programs/pluto/kernel.c b/programs/pluto/kernel.c
@@ -1668,7 +1668,7 @@ setup_half_ipsec_sa(struct state *parent_st
     if (st->hidden_variables.st_nat_traversal & NAT_T_DETECTED) {
         if(st->hidden_variables.st_nat_traversal & NAT_T_WITH_PORT_FLOATING) {
             natt_type = ESPINUDP_WITH_NON_ESP;
-            nattype_str = "nonesp";
+            nattype_str = "rfc3849";
         } else {
             natt_type = ESPINUDP_WITH_NON_IKE;
             nattype_str = "nonike";