Skip to content
Permalink
Browse files

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

  • Loading branch information...
Michael Richardson authored and mcr committed Jun 5, 2017
1 parent 8800a81 commit f2ff8b498e1fbbbcfdf719680230cf0fe1273542
Showing with 5 additions and 3 deletions.
  1. +1 −1 linux/include/openswan.h
  2. +3 −1 programs/pluto/ikev2_notify.c
  3. +1 −1 programs/pluto/kernel.c
@@ -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

/*
@@ -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");
@@ -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";

0 comments on commit f2ff8b4

Please sign in to comment.
You can’t perform that action at this time.