From: Arran Cudbard-Bell Date: Wed, 6 Jan 2021 17:49:00 +0000 (+0000) Subject: ...and some more X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18081676c2cd8f20d6050d6024f194fc400867d6;p=thirdparty%2Ffreeradius-server.git ...and some more --- diff --git a/src/lib/server/pair.h b/src/lib/server/pair.h index 8e5f5639f2c..2ae47fdb84a 100644 --- a/src/lib/server/pair.h +++ b/src/lib/server/pair.h @@ -156,5 +156,5 @@ RCSIDH(server_pair_h, "$Id$") * - >0 the number of pairs deleted. * - 0 if no pairs were deleted. */ -#define pair_delete_session_state(_pair) pair_delete(&request->state, _pair) +#define pair_delete_session_state(_pair) pair_delete(&request->state_pairs, _pair) diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c index 474b798bbe7..a0448dc7038 100644 --- a/src/lib/server/pair_server_tests.c +++ b/src/lib/server/pair_server_tests.c @@ -393,7 +393,7 @@ static void test_pair_update_session_state(void) vp->vp_uint32 = 7890; TEST_CASE("Expected attr_test_integer (vp->vp_uint32 == 7890)"); - TEST_CHECK((vp = fr_pair_find_by_da(&request->state, attr_test_integer)) != NULL); + TEST_CHECK((vp = fr_pair_find_by_da(&request->state_pairs, attr_test_integer)) != NULL); TEST_CASE("Validating VP_VERIFY()"); VP_VERIFY(vp); @@ -448,13 +448,13 @@ static void test_pair_delete_session_state(void) request_t *request = request_fake_alloc(); TEST_CASE("Copy 'sample_pairs' into 'request->state'"); - TEST_CHECK(fr_pair_list_copy(autofree, &request->state, &sample_pairs) > 0); + TEST_CHECK(fr_pair_list_copy(autofree, &request->state_pairs, &sample_pairs) > 0); TEST_CASE("Delete 'Test-Integer' in 'request->state' using pair_delete_session_state()"); TEST_CHECK(pair_delete_session_state(attr_test_integer) > 0); TEST_CASE("The 'Test-Integer' shouldn't exist in 'request->state'"); - TEST_CHECK(fr_pair_find_by_da(&request->state, attr_test_integer) == NULL); + TEST_CHECK(fr_pair_find_by_da(&request->state_pairs, attr_test_integer) == NULL); } TEST_LIST = { diff --git a/src/lib/server/state.c b/src/lib/server/state.c index 9feb84fbd34..6353990116e 100644 --- a/src/lib/server/state.c +++ b/src/lib/server/state.c @@ -647,7 +647,7 @@ void fr_state_to_request(fr_state_tree_t *state, request_t *request) if (request->state) { RDEBUG2("Restored &session-state"); - log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->state, "&session-state."); + log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->state_pairs, "&session-state."); } /* @@ -682,7 +682,7 @@ int fr_request_to_state(fr_state_tree_t *state, request_t *request) if (request->state) { RDEBUG2("Saving &session-state"); - log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->state, "&session-state."); + log_request_pair_list(L_DBG_LVL_2, request, NULL, &request->state_pairs, "&session-state."); } vp = fr_pair_find_by_da(&request->request_pairs, state->da); diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c index 84f26705196..efcacc16f45 100644 --- a/src/lib/tls/cache.c +++ b/src/lib/tls/cache.c @@ -288,7 +288,7 @@ int fr_tls_cache_write(request_t *request, fr_tls_session_t *tls_session) RINDENT(); RDEBUG2("&session-state.%pP", vp); REXDENT(); - fr_pair_add(&request->state, vp); + fr_pair_add(&request->state_pairs, vp); /* * Call the virtual server to write the session @@ -308,7 +308,7 @@ int fr_tls_cache_write(request_t *request, fr_tls_session_t *tls_session) /* * Ensure that the session data can't be used by anyone else. */ - fr_pair_delete_by_da(&request->state, attr_tls_session_data); + fr_pair_delete_by_da(&request->state_pairs, attr_tls_session_data); return ret; } @@ -365,7 +365,7 @@ static SSL_SESSION *fr_tls_cache_read(SSL *ssl, return NULL; } - vp = fr_pair_find_by_da(&request->state, attr_tls_session_data); + vp = fr_pair_find_by_da(&request->state_pairs, attr_tls_session_data); if (!vp) { RWDEBUG("No cached session found"); return NULL; @@ -411,7 +411,7 @@ static SSL_SESSION *fr_tls_cache_read(SSL *ssl, /* * Ensure that the session data can't be used by anyone else. */ - fr_pair_delete_by_da(&request->state, attr_tls_session_data); + fr_pair_delete_by_da(&request->state_pairs, attr_tls_session_data); return sess; } diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c index cd829bc1951..81ea6d1f212 100644 --- a/src/lib/tls/session.c +++ b/src/lib/tls/session.c @@ -1440,7 +1440,7 @@ int fr_tls_session_handshake(request_t *request, fr_tls_session_t *session) vp = fr_pair_afrom_da(request->state_ctx, attr_tls_session_cipher_suite); if (vp) { fr_pair_value_strdup(vp, SSL_CIPHER_get_name(cipher)); - fr_pair_add(&request->state, vp); + fr_pair_add(&request->state_pairs, vp); RINDENT(); RDEBUG2("&session-state.%pP", vp); REXDENT(); @@ -1456,7 +1456,7 @@ int fr_tls_session_handshake(request_t *request, fr_tls_session_t *session) vp = fr_pair_afrom_da(request->state_ctx, attr_tls_session_version); if (vp) { fr_pair_value_strdup(vp, version); - fr_pair_add(&request->state, vp); + fr_pair_add(&request->state_pairs, vp); RINDENT(); RDEBUG2("&session-state.TLS-Session-Version := \"%s\"", version); REXDENT(); diff --git a/src/lib/tls/validate.c b/src/lib/tls/validate.c index a68213d6cd4..9acca4c7fd7 100644 --- a/src/lib/tls/validate.c +++ b/src/lib/tls/validate.c @@ -166,7 +166,7 @@ int fr_tls_validate_cert_cb(int ok, X509_STORE_CTX *x509_ctx) * cert_vps have a different talloc parent, so we * can't just reference them. */ - MEM(fr_pair_list_copy(request->state_ctx, &request->state, &cert_vps) >= 0); + MEM(fr_pair_list_copy(request->state_ctx, &request->state_pairs, &cert_vps) >= 0); fr_pair_list_free(&cert_vps); } } diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c index 2a8cae66742..b57874e1c1a 100644 --- a/src/modules/rlm_perl/rlm_perl.c +++ b/src/modules/rlm_perl/rlm_perl.c @@ -871,7 +871,7 @@ static unlang_action_t do_perl(rlm_rcode_t *p_result, void *instance, request_t perl_store_vps(request->packet, request, &request->request_pairs, rad_request_hv, "RAD_REQUEST", "request"); perl_store_vps(request->reply, request, &request->reply_pairs, rad_reply_hv, "RAD_REPLY", "reply"); perl_store_vps(request, request, &request->control_pairs, rad_config_hv, "RAD_CONFIG", "control"); - perl_store_vps(request->state_ctx, request, &request->state, rad_state_hv, "RAD_STATE", "session-state"); + perl_store_vps(request->state_ctx, request, &request->state_pairs, rad_state_hv, "RAD_STATE", "session-state"); /* * Store pointer to request structure globally so radiusd::xlat works