ike-sa: Fix build with DEBUG_LEVEL < 1

This commit is contained in:
Tobias Brunner
2023-05-08 17:32:17 +02:00
parent 79d49ea05b
commit 5408b50160
+7 -9
View File
@@ -1541,19 +1541,17 @@ METHOD(ike_sa_t, initiate, status_t,
#endif /* ME */ #endif /* ME */
) )
{ {
char *addr;
addr = this->ike_cfg->get_other_addr(this->ike_cfg);
if (!this->retry_initiate_interval) if (!this->retry_initiate_interval)
{ {
DBG1(DBG_IKE, "unable to resolve %s, initiate aborted", DBG1(DBG_IKE, "unable to resolve %s, initiate aborted",
addr); this->ike_cfg->get_other_addr(this->ike_cfg));
DESTROY_IF(child_cfg); DESTROY_IF(child_cfg);
charon->bus->alert(charon->bus, ALERT_PEER_ADDR_FAILED); charon->bus->alert(charon->bus, ALERT_PEER_ADDR_FAILED);
return DESTROY_ME; return DESTROY_ME;
} }
DBG1(DBG_IKE, "unable to resolve %s, retrying in %ds", DBG1(DBG_IKE, "unable to resolve %s, retrying in %ds",
addr, this->retry_initiate_interval); this->ike_cfg->get_other_addr(this->ike_cfg),
this->retry_initiate_interval);
defer_initiate = TRUE; defer_initiate = TRUE;
} }
@@ -1965,13 +1963,13 @@ METHOD(ike_sa_t, reauth, status_t,
if (!has_condition(this, COND_ORIGINAL_INITIATOR) && if (!has_condition(this, COND_ORIGINAL_INITIATOR) &&
!ike_sa_can_reauthenticate(&this->public)) !ike_sa_can_reauthenticate(&this->public))
{ {
time_t del, now; #if DEBUG_LEVEL >= 1
time_t del = this->stats[STAT_DELETE];
del = this->stats[STAT_DELETE]; time_t now = time_monotonic(NULL);
now = time_monotonic(NULL);
DBG1(DBG_IKE, "initiator did not reauthenticate as requested, IKE_SA " DBG1(DBG_IKE, "initiator did not reauthenticate as requested, IKE_SA "
"%s[%d] will timeout in %V", get_name(this), this->unique_id, "%s[%d] will timeout in %V", get_name(this), this->unique_id,
&now, &del); &now, &del);
#endif
return FAILED; return FAILED;
} }
DBG0(DBG_IKE, "reauthenticating IKE_SA %s[%d]", DBG0(DBG_IKE, "reauthenticating IKE_SA %s[%d]",