From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Mon, 4 Mar 2013 10:23:22 +0000 (+0100)
Subject: Use network byte order for ESA SPIs
X-Git-Tag: 5.0.3rc1~39^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c57b7a66c30e7c9c5484818bb5b2c6a7779838e2;p=thirdparty%2Fstrongswan.git

Use network byte order for ESA SPIs
---

diff --git a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
index 734bec73c4..7d14ba702f 100644
--- a/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
+++ b/src/charon-tkm/src/tkm/tkm_kernel_ipsec.c
@@ -149,8 +149,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 	 */
 	if (nonce_loc_id == 0 && esa.dh_id == 0)
 	{
-		if (ike_esa_create_first(esa_id, esa.isa_id, reqid, 1, ntohl(spi_loc),
-								 ntohl(spi_rem)) != TKM_OK)
+		if (ike_esa_create_first(esa_id, esa.isa_id, reqid, 1, spi_loc, spi_rem)
+			!= TKM_OK)
 		{
 			DBG1(DBG_KNL, "child SA (%llu, first) creation failed", esa_id);
 			goto failure;
@@ -162,8 +162,8 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 		nonce_type nc_rem;
 		chunk_to_sequence(nonce_rem, &nc_rem, sizeof(nonce_type));
 		if (ike_esa_create_no_pfs(esa_id, esa.isa_id, reqid, 1, nonce_loc_id,
-								  nc_rem, initiator, ntohl(spi_loc),
-								  ntohl(spi_rem)) != TKM_OK)
+								  nc_rem, initiator, spi_loc, spi_rem)
+			!= TKM_OK)
 		{
 			DBG1(DBG_KNL, "child SA (%llu, no PFS) creation failed", esa_id);
 			goto failure;
@@ -176,8 +176,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
 		nonce_type nc_rem;
 		chunk_to_sequence(nonce_rem, &nc_rem, sizeof(nonce_type));
 		if (ike_esa_create(esa_id, esa.isa_id, reqid, 1, esa.dh_id, nonce_loc_id,
-						   nc_rem, initiator, ntohl(spi_loc),
-						   ntohl(spi_rem)) != TKM_OK)
+						   nc_rem, initiator, spi_loc, spi_rem) != TKM_OK)
 		{
 			DBG1(DBG_KNL, "child SA (%llu) creation failed", esa_id);
 			goto failure;