Include port numbers in Calling-Station-Id, too

diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
index b34e60b4de6835f6f459ac1993e0f9800d1ebe54..1f32a565e0f1552efba7633aa9ec8451df73163c 100644 (file)
--- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
+++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c
@@ -163,7 +163,7 @@ static void send_start(private_eap_radius_accounting_t *this, ike_sa_t *ike_sa)
                                 chunk_create(entry->sid, strlen(entry->sid)));
        snprintf(buf, sizeof(buf), "%Y", ike_sa->get_other_eap_id(ike_sa));
        message->add(message, RAT_USER_NAME, chunk_create(buf, strlen(buf)));
-       snprintf(buf, sizeof(buf), "%H", ike_sa->get_other_host(ike_sa));
+       snprintf(buf, sizeof(buf), "%#H", ike_sa->get_other_host(ike_sa));
        message->add(message, RAT_CALLING_STATION_ID, chunk_create(buf, strlen(buf)));
        vip = ike_sa->get_virtual_ip(ike_sa, FALSE);
        if (vip)
@@ -204,7 +204,7 @@ static void send_stop(private_eap_radius_accounting_t *this, ike_sa_t *ike_sa)
                                         chunk_create(entry->sid, strlen(entry->sid)));
                snprintf(buf, sizeof(buf), "%Y", ike_sa->get_other_eap_id(ike_sa));
                message->add(message, RAT_USER_NAME, chunk_create(buf, strlen(buf)));
-               snprintf(buf, sizeof(buf), "%H", ike_sa->get_other_host(ike_sa));
+               snprintf(buf, sizeof(buf), "%#H", ike_sa->get_other_host(ike_sa));
                message->add(message, RAT_CALLING_STATION_ID,
                                         chunk_create(buf, strlen(buf)));
                vip = ike_sa->get_virtual_ip(ike_sa, FALSE);