From: Martin Willi <martin@revosec.ch>
Date: Fri, 24 Feb 2012 09:48:54 +0000 (+0100)
Subject: Include port numbers in Calling-Station-Id, too
X-Git-Tag: 4.6.3~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d93f204ca5374fb96a154e57223a53003c4445af;p=thirdparty%2Fstrongswan.git

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 b34e60b4de..1f32a565e0 100644
--- 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);