denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a 64-bit issue with time_t printf hooks

Browse Source
This commit is contained in:
Andreas Steffen
2009-02-11 16:37:16 +00:00
parent b81d8cd3cc
commit a584a231b1
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/stroke/stroke_list.c
+9 -12
View File
@@ -77,9 +77,7 @@ auth_class_t get_auth_class(peer_cfg_t *config)
static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all) static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all)
{ {
ike_sa_id_t *id = ike_sa->get_id(ike_sa); ike_sa_id_t *id = ike_sa->get_id(ike_sa);
u_int32_t now; time_t now = time(NULL);
now = time(NULL);
fprintf(out, "%12s[%d]: %N", fprintf(out, "%12s[%d]: %N",
ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa), ike_sa->get_name(ike_sa), ike_sa->get_unique_id(ike_sa),
@@ -87,10 +85,10 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all)
if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED) if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED)
{ {
u_int32_t established; time_t established;
established = now - ike_sa->get_statistic(ike_sa, STAT_ESTABLISHED); established = ike_sa->get_statistic(ike_sa, STAT_ESTABLISHED);
fprintf(out, " %V", &established); fprintf(out, " %#V ago", &now, &established);
} }
fprintf(out, ", %H[%D]...%H[%D]\n", fprintf(out, ", %H[%D]...%H[%D]\n",
@@ -111,21 +109,20 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all)
if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED) if (ike_sa->get_state(ike_sa) == IKE_ESTABLISHED)
{ {
u_int32_t rekey, reauth; time_t rekey, reauth;
rekey = ike_sa->get_statistic(ike_sa, STAT_REKEY); rekey = ike_sa->get_statistic(ike_sa, STAT_REKEY);
reauth = ike_sa->get_statistic(ike_sa, STAT_REAUTH); reauth = ike_sa->get_statistic(ike_sa, STAT_REAUTH);
if (rekey) if (rekey)
{ {
rekey -= now; fprintf(out, ", rekeying in %#V", &rekey, &now);
fprintf(out, ", rekeying in %V", &rekey);
} }
if (reauth) if (reauth)
{ {
reauth -= now; fprintf(out, ", %N reauthentication in %#V", auth_class_names,
fprintf(out, ", %N reauthentication in %V", auth_class_names, get_auth_class(ike_sa->get_peer_cfg(ike_sa)),
get_auth_class(ike_sa->get_peer_cfg(ike_sa)), &reauth); &reauth, &now);
} }
if (!rekey && !reauth) if (!rekey && !reauth)
{ {