From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 4 Jun 2015 16:31:18 +0000 (-0600)
Subject: expose request in eaptls_operation
X-Git-Tag: release_3_0_9~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4769706ff88ad7f8c41367e9da9e5f4a8bd8dcb5;p=thirdparty%2Ffreeradius-server.git

expose request in eaptls_operation
---

diff --git a/src/main/tls.c b/src/main/tls.c
index 5e5cf34961d..565f0495c46 100644
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -83,7 +83,7 @@ FR_NAME_NUMBER const fr_tls_status_table[] = {
 	{ "more fragments with length",	FR_TLS_MORE_FRAGMENTS_WITH_LENGTH },
 	{ "handled",			FR_TLS_HANDLED },
 	{  NULL , 			-1},
-}
+};
 
 /* Record critical defects in libssl here (newest first)*/
 static libssl_defect_t libssl_defects[] =
diff --git a/src/modules/rlm_eap/libeap/eap_tls.c b/src/modules/rlm_eap/libeap/eap_tls.c
index c774774ff5b..251703e1fa5 100644
--- a/src/modules/rlm_eap/libeap/eap_tls.c
+++ b/src/modules/rlm_eap/libeap/eap_tls.c
@@ -460,8 +460,7 @@ static EAPTLS_PACKET *eaptls_extract(REQUEST *request, EAP_DS *eap_ds, fr_tls_st
 	uint32_t	len = 0;
 	uint8_t		*data = NULL;
 
-	if (status  == FR_TLS_INVALID)
-		return NULL;
+	if (status == FR_TLS_INVALID) return NULL;
 
 	/*
 	 *	The main EAP code & eaptls_verify() take care of
@@ -624,12 +623,10 @@ static EAPTLS_PACKET *eaptls_extract(REQUEST *request, EAP_DS *eap_ds, fr_tls_st
  *	SSL_CTX (internally) or TLS module(explicitly). If TLS module,
  *	then how to let SSL API know about these sessions.)
  */
-static fr_tls_status_t eaptls_operation(fr_tls_status_t status,
-					eap_handler_t *handler)
+static fr_tls_status_t eaptls_operation(fr_tls_status_t status, eap_handler_t *handler)
 {
-	tls_session_t *tls_session;
-
-	tls_session = (tls_session_t *)handler->opaque;
+	REQUEST		*request = handler->request;
+	tls_session_t	*tls_session = handler->opaque;
 
 	if ((status == FR_TLS_MORE_FRAGMENTS) ||
 	    (status == FR_TLS_MORE_FRAGMENTS_WITH_LENGTH) ||