Merge branch 'radius-ext'

Bring some extensions to eap-radius, namely a virtual IP address provider based
on received Framed-IPs, forwarding of Cisco Unity banners, Interim Accounting
updates and the reporting of sent/received packets.
This commit is contained in:
Martin Willi
2013-03-18 10:13:36 +01:00
31 changed files with 1333 additions and 114 deletions
+9 -6
View File
@@ -205,7 +205,7 @@ static void log_ike_sa(FILE *out, ike_sa_t *ike_sa, bool all)
static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
{
time_t use_in, use_out, rekey, now;
u_int64_t bytes_in, bytes_out;
u_int64_t bytes_in, bytes_out, packets_in, packets_out;
proposal_t *proposal;
child_cfg_t *config = child_sa->get_config(child_sa);
@@ -273,18 +273,22 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
}
}
child_sa->get_usestats(child_sa, TRUE, &use_in, &bytes_in);
child_sa->get_usestats(child_sa, TRUE,
&use_in, &bytes_in, &packets_in);
fprintf(out, ", %" PRIu64 " bytes_i", bytes_in);
if (use_in)
{
fprintf(out, " (%" PRIu64 "s ago)", (u_int64_t)(now - use_in));
fprintf(out, " (%" PRIu64 " pkts, %" PRIu64 "s ago)",
packets_in, (u_int64_t)(now - use_in));
}
child_sa->get_usestats(child_sa, FALSE, &use_out, &bytes_out);
child_sa->get_usestats(child_sa, FALSE,
&use_out, &bytes_out, &packets_out);
fprintf(out, ", %" PRIu64 " bytes_o", bytes_out);
if (use_out)
{
fprintf(out, " (%" PRIu64 "s ago)", (u_int64_t)(now - use_out));
fprintf(out, " (%" PRIu64 " pkts, %" PRIu64 "s ago)",
packets_out, (u_int64_t)(now - use_out));
}
fprintf(out, ", rekeying ");
@@ -1541,4 +1545,3 @@ stroke_list_t *stroke_list_create(stroke_attribute_t *attribute)
return &this->public;
}