improved P2P_ENDPOINT debugging

diff --git a/src/charon/encoding/payloads/endpoint_notify.c b/src/charon/encoding/payloads/endpoint_notify.c
index 30f3ecd5f118a492370a15040fbd997bb5b4d4f7..34baa5db6c6b7fd7fcf762f8eaff6f05e1b5a742 100644 (file)
--- a/src/charon/encoding/payloads/endpoint_notify.c
+++ b/src/charon/encoding/payloads/endpoint_notify.c
@@ -76,6 +76,13 @@ struct private_endpoint_notify_t {
       +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 
+ENUM(p2p_endpoint_type_names, HOST, RELAYED,
+       "HOST",
+       "SERVER_REFLEXIVE",
+       "PEER_REFLEXIVE",
+       "RELAYED"
+);
+
 /**
  * Helper functions to parse integer values
  */
@@ -251,7 +258,7 @@ static u_int32_t get_priority(private_endpoint_notify_t *this)
  */
 static void set_priority(private_endpoint_notify_t *this, u_int32_t priority)
 {
-       return this->priority = priority;
+       this->priority = priority;
 }
 
 /**

diff --git a/src/charon/encoding/payloads/endpoint_notify.h b/src/charon/encoding/payloads/endpoint_notify.h
index 272301d5b701a33a7797f003642f4952d1f577a0..4a3a68f95bd87684393cd52449b63ec3d9589f8d 100644 (file)
--- a/src/charon/encoding/payloads/endpoint_notify.h
+++ b/src/charon/encoding/payloads/endpoint_notify.h
@@ -35,6 +35,11 @@ typedef struct endpoint_notify_t endpoint_notify_t;
 
 #include <encoding/payloads/notify_payload.h>
 
+/**
+ * @brief P2P endpoint families.
+ *
+ * @ingroup payloads
+ */
 enum p2p_endpoint_family_t {
        
        NO_FAMILY = 0,
@@ -47,6 +52,11 @@ enum p2p_endpoint_family_t {
        
 };
 
+/**
+ * @brief P2P endpoint types.
+ *
+  * @ingroup payloads
+ */
 enum p2p_endpoint_type_t {
        
        NO_TYPE = 0,
@@ -63,6 +73,13 @@ enum p2p_endpoint_type_t {
        
 };
 
+/**
+ * enum name for p2p_endpoint_type_t.
+ *
+ * @ingroup payloads
+ */
+extern enum_name_t *p2p_endpoint_type_names;
+
 /**
  * @brief Class representing a P2P_ENDPOINT notify. In fact it's not
  * the notify per se, but the notification data of that notify that is

diff --git a/src/charon/sa/connect_manager.c b/src/charon/sa/connect_manager.c
index 9a1acb219114fdbc22fa08ae8f22fd6179380818..e53fdeed6495c021027b271e4f366062f157bcb7 100644 (file)
--- a/src/charon/sa/connect_manager.c
+++ b/src/charon/sa/connect_manager.c
@@ -936,7 +936,7 @@ static status_t process_payloads(message_t *message, check_t *check)
                                }
                                check->endpoint = endpoint;
                                check->endpoint_raw = chunk_clone(notify->get_notification_data(notify));
-                               DBG3(DBG_IKE, "received P2P_ENDPOINT notify");
+                               DBG2(DBG_IKE, "received P2P_ENDPOINT notify");
                                break;
                        }
                        case P2P_SESSIONID:

diff --git a/src/charon/sa/tasks/ike_auth.c b/src/charon/sa/tasks/ike_auth.c
index e8fab1dc6f37dd02f41ab86f9611163a0e5419fd..29c38ee831c7d861875dcd1f06b9031a77f4d3ea 100644 (file)
--- a/src/charon/sa/tasks/ike_auth.c
+++ b/src/charon/sa/tasks/ike_auth.c
@@ -650,6 +650,9 @@ static status_t process_i(private_ike_auth_t *this, message_t *message)
                                case AUTH_LIFETIME:
                                        /* handled in ike_auth_lifetime task */
                                        break;
+                               case P2P_ENDPOINT:
+                                       /* handled in ike_p2p task */
+                                       break;
                                default:
                                {
                                        if (type < 16383)

diff --git a/src/charon/sa/tasks/ike_p2p.c b/src/charon/sa/tasks/ike_p2p.c
index de5a2e30e18a7f7c7dde5412a9824a6603437140..adae09e9d36d40fcc70ce7522621762cd5f85b7d 100644 (file)
--- a/src/charon/sa/tasks/ike_p2p.c
+++ b/src/charon/sa/tasks/ike_p2p.c
@@ -215,7 +215,8 @@ static void process_payloads(private_ike_p2p_t *this, message_t *message)
                                        DBG1(DBG_IKE, "received invalid P2P_ENDPOINT notify");
                                        break;
                                }
-                               DBG2(DBG_IKE, "received P2P_ENDPOINT notify");
+                               DBG1(DBG_IKE, "received %N P2P_ENDPOINT %#H", p2p_endpoint_type_names,
+                                       endpoint->get_type(endpoint), endpoint->get_host(endpoint));
                                
                                this->remote_endpoints->insert_last(this->remote_endpoints, endpoint);
                                break;