improved P2P_ENDPOINT debugging
This commit is contained in:
@@ -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
|
* 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)
|
static void set_priority(private_endpoint_notify_t *this, u_int32_t priority)
|
||||||
{
|
{
|
||||||
return this->priority = priority;
|
this->priority = priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ typedef struct endpoint_notify_t endpoint_notify_t;
|
|||||||
|
|
||||||
#include <encoding/payloads/notify_payload.h>
|
#include <encoding/payloads/notify_payload.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief P2P endpoint families.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
enum p2p_endpoint_family_t {
|
enum p2p_endpoint_family_t {
|
||||||
|
|
||||||
NO_FAMILY = 0,
|
NO_FAMILY = 0,
|
||||||
@@ -47,6 +52,11 @@ enum p2p_endpoint_family_t {
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief P2P endpoint types.
|
||||||
|
*
|
||||||
|
* @ingroup payloads
|
||||||
|
*/
|
||||||
enum p2p_endpoint_type_t {
|
enum p2p_endpoint_type_t {
|
||||||
|
|
||||||
NO_TYPE = 0,
|
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
|
* @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
|
* the notify per se, but the notification data of that notify that is
|
||||||
|
|||||||
@@ -936,7 +936,7 @@ static status_t process_payloads(message_t *message, check_t *check)
|
|||||||
}
|
}
|
||||||
check->endpoint = endpoint;
|
check->endpoint = endpoint;
|
||||||
check->endpoint_raw = chunk_clone(notify->get_notification_data(notify));
|
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;
|
break;
|
||||||
}
|
}
|
||||||
case P2P_SESSIONID:
|
case P2P_SESSIONID:
|
||||||
|
|||||||
@@ -650,6 +650,9 @@ static status_t process_i(private_ike_auth_t *this, message_t *message)
|
|||||||
case AUTH_LIFETIME:
|
case AUTH_LIFETIME:
|
||||||
/* handled in ike_auth_lifetime task */
|
/* handled in ike_auth_lifetime task */
|
||||||
break;
|
break;
|
||||||
|
case P2P_ENDPOINT:
|
||||||
|
/* handled in ike_p2p task */
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
if (type < 16383)
|
if (type < 16383)
|
||||||
|
|||||||
@@ -215,7 +215,8 @@ static void process_payloads(private_ike_p2p_t *this, message_t *message)
|
|||||||
DBG1(DBG_IKE, "received invalid P2P_ENDPOINT notify");
|
DBG1(DBG_IKE, "received invalid P2P_ENDPOINT notify");
|
||||||
break;
|
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);
|
this->remote_endpoints->insert_last(this->remote_endpoints, endpoint);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user