s/request->reply->vps/request->reply_list/g

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index 49a39305629dcd0745a8ed37bb26bca0cf190cff..6bee5878fcbb211e14431130d39746c1e622bfa8 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -1075,8 +1075,8 @@ static int recv_one_packet(fr_time_t wait_time)
        } else {
                VALUE_PAIR const *failed[2];
 
-               fr_pair_list_sort(&request->reply->vps, fr_pair_cmp_by_da);
-               if (fr_pair_validate(failed, request->filter, request->reply->vps)) {
+               fr_pair_list_sort(&request->reply_pairs, fr_pair_cmp_by_da);
+               if (fr_pair_validate(failed, request->filter, request->reply_pairs)) {
                        RDEBUG("%s: Response passed filter", request->name);
                        stats.passed++;
                } else {

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 3f972b335f2caf6ad3e551a07a6ea30e3cbcf3e9..2a02cba1fda49f3f6dc62d4dbb33ee5d3479f5b3 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -278,7 +278,7 @@ static REQUEST *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *el
        request->reply->id = request->packet->id;
        request->reply->code = 0; /* UNKNOWN code */
        memcpy(request->reply->vector, request->packet->vector, sizeof(request->reply->vector));
-       request->reply->vps = NULL;
+       request->reply_pairs = NULL;
        request->reply->data = NULL;
        request->reply->data_len = 0;
 
@@ -991,7 +991,7 @@ int main(int argc, char *argv[])
                vp->vp_uint32 = request->reply->code;
 
 
-               if (!fr_pair_validate(failed, filter_vps, request->reply->vps)) {
+               if (!fr_pair_validate(failed, filter_vps, request->reply_pairs)) {
                        fr_pair_validate_debug(request, failed);
                        fr_perror("Output file %s does not match attributes in filter %s",
                                  output_file ? output_file : input_file, filter_file);

diff --git a/src/lib/eap/chbind.c b/src/lib/eap/chbind.c
index bda239b19c67c284f11f86eb8e6f9d81c6fda85b..ec3d9c07a22eaf3a848e8a3f71885e4cadbe70bf 100644 (file)
--- a/src/lib/eap/chbind.c
+++ b/src/lib/eap/chbind.c
@@ -38,7 +38,7 @@ static bool chbind_build_response(REQUEST *request, CHBIND_REQ *chbind)
        fr_cursor_t             cursor;
 
        total = 0;
-       for (vp = fr_cursor_init(&cursor, &request->reply->vps);
+       for (vp = fr_cursor_init(&cursor, &request->reply_pairs);
             vp != NULL;
             vp = fr_cursor_next(&cursor)) {
                /*
@@ -80,13 +80,13 @@ static bool chbind_build_response(REQUEST *request, CHBIND_REQ *chbind)
        ptr[3] = CHBIND_NSID_RADIUS;
 
        RDEBUG2("Sending chbind response: code %i", (int )(ptr[0]));
-       log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
+       log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, NULL);
 
        /* Encode the chbind attributes into the response */
        ptr += 4;
        end = ptr + total;
 
-       fr_cursor_init(&cursor, &request->reply->vps);
+       fr_cursor_init(&cursor, &request->reply_pairs);
        while ((vp = fr_cursor_current(&cursor)) && (ptr < end)) {
                /*
                 *      Skip things which shouldn't be in channel bindings.

diff --git a/src/lib/eap/compose.c b/src/lib/eap/compose.c
index cc45b83e85996bf77a3003f29f696e224a0d74ff..56f0d5ae4a517cb29237e8339aca3ac477e94ca6 100644 (file)
--- a/src/lib/eap/compose.c
+++ b/src/lib/eap/compose.c
@@ -239,7 +239,7 @@ rlm_rcode_t eap_compose(eap_session_t *eap_session)
         *      Don't add a Message-Authenticator if
         *      it's already there.
         */
-       vp = fr_pair_find_by_da(request->reply->vps, attr_message_authenticator);
+       vp = fr_pair_find_by_da(request->reply_pairs, attr_message_authenticator);
        if (!vp) {
                static uint8_t auth_vector[RADIUS_AUTH_VECTOR_LENGTH] = { 0x00 };
 
@@ -505,8 +505,8 @@ rlm_rcode_t eap_fail(eap_session_t *eap_session)
        /*
         *      Delete any previous replies.
         */
-       fr_pair_delete_by_da(&eap_session->request->reply->vps, attr_eap_message);
-       fr_pair_delete_by_da(&eap_session->request->reply->vps, attr_state);
+       fr_pair_delete_by_da(&eap_session->request->reply_pairs, attr_eap_message);
+       fr_pair_delete_by_da(&eap_session->request->reply_pairs, attr_state);
 
        talloc_free(eap_session->this_round->request);
        eap_session->this_round->request = talloc_zero(eap_session->this_round, eap_packet_t);

diff --git a/src/lib/eap_aka_sim/state_machine.c b/src/lib/eap_aka_sim/state_machine.c
index 5ddcd81859593d99e693aa4be0cad152234d6d5e..5eb02f06d77b6656dcfa3e7ee98919a749639e96 100644 (file)
--- a/src/lib/eap_aka_sim/state_machine.c
+++ b/src/lib/eap_aka_sim/state_machine.c
@@ -169,7 +169,7 @@ static bool identity_req_set_by_user(REQUEST *request, eap_aka_sim_session_t *ea
         *      then delete them so they don't screw
         *      up any of the other code.
         */
-       for (vp = fr_cursor_init(&cursor, &request->reply->vps);
+       for (vp = fr_cursor_init(&cursor, &request->reply_pairs);
             vp;
             vp = fr_cursor_next(&cursor)) {
                if (vp->da == attr_eap_aka_sim_permanent_id_req) {
@@ -516,7 +516,7 @@ static rlm_rcode_t pseudonym_store_resume(module_ctx_t const *mctx, REQUEST *req
 
        pair_delete_request(attr_eap_aka_sim_next_pseudonym);
 
-       vp = fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_next_reauth_id);
+       vp = fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_next_reauth_id);
        if (vp) {
                /*
                 *      Generate a random fastauth string
@@ -642,7 +642,7 @@ static rlm_rcode_t session_and_pseudonym_store(module_ctx_t const *mctx,
 
        request->rcode = RLM_MODULE_NOOP;       /* Needed because we may call resume functions directly */
 
-       vp = fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_next_pseudonym);
+       vp = fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_next_pseudonym);
        if (vp) {
                /*
                 *      Generate a random pseudonym string
@@ -837,7 +837,7 @@ static int common_encode(REQUEST *request, eap_session_t *eap_session, uint16_t
                }
        }
 
-       fr_cursor_init(&cursor, &request->reply->vps);
+       fr_cursor_init(&cursor, &request->reply_pairs);
        fr_cursor_init(&to_encode, &head);
 
        /*
@@ -931,7 +931,7 @@ static rlm_rcode_t common_failure_notification_send(module_ctx_t const *mctx,
         *      - FR_NOTIFICATION_VALUE_NOT_SUBSCRIBED
         *        User has not subscribed to the requested service.
         */
-       notification_vp = fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_notification);
+       notification_vp = fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_notification);
 
        /*
         *      Change the failure notification depending where
@@ -1121,7 +1121,7 @@ static rlm_rcode_t common_reauthentication_request_compose(module_ctx_t const *m
 {
        eap_aka_sim_session_t   *eap_aka_sim_session = talloc_get_type_abort(eap_session->opaque,
                                                                             eap_aka_sim_session_t);
-       VALUE_PAIR              *to_peer = request->reply->vps, *vp;
+       VALUE_PAIR              *to_peer = request->reply_pairs, *vp;
 
        VALUE_PAIR              *kdf_id;
 
@@ -1164,7 +1164,7 @@ static rlm_rcode_t common_reauthentication_request_compose(module_ctx_t const *m
                        case AKA_SIM_ANY_ID_REQ:
                                RDEBUG2("Composing EAP-Request/Reauthentication failed.  Clearing reply attributes and "
                                        "requesting additional Identity");
-                               fr_pair_list_free(&request->reply->vps);
+                               fr_pair_list_free(&request->reply_pairs);
                                eap_aka_sim_session->id_req = AKA_SIM_FULLAUTH_ID_REQ;
                                return common_identity_enter(mctx, request, eap_session);
 
@@ -1310,7 +1310,7 @@ static rlm_rcode_t aka_challenge_request_compose(module_ctx_t const *mctx,
                                                 REQUEST *request, eap_session_t *eap_session)
 {
        eap_aka_sim_session_t   *eap_aka_sim_session = talloc_get_type_abort(eap_session->opaque, eap_aka_sim_session_t);
-       VALUE_PAIR              *to_peer = request->reply->vps, *vp;
+       VALUE_PAIR              *to_peer = request->reply_pairs, *vp;
        fr_aka_sim_vector_src_t src = AKA_SIM_VECTOR_SRC_AUTO;
 
        VALUE_PAIR              *kdf_id;
@@ -1513,7 +1513,7 @@ static rlm_rcode_t sim_challenge_request_compose(module_ctx_t const *mctx,
 {
        eap_aka_sim_session_t   *eap_aka_sim_session = talloc_get_type_abort(eap_session->opaque,
                                                                             eap_aka_sim_session_t);
-       VALUE_PAIR              *to_peer = request->reply->vps, *vp;
+       VALUE_PAIR              *to_peer = request->reply_pairs, *vp;
        fr_aka_sim_vector_src_t src = AKA_SIM_VECTOR_SRC_AUTO;
 
        VALUE_PAIR              *kdf_id;
@@ -1712,7 +1712,7 @@ static rlm_rcode_t sim_start_request_send(module_ctx_t const *mctx,
         *      If the user provided no versions, then
         *      just add the default (1).
         */
-       if (!(fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_version_list))) {
+       if (!(fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_version_list))) {
                MEM(pair_add_reply(&vp, attr_eap_aka_sim_version_list) >= 0);
                vp->vp_uint16 = EAP_SIM_VERSION;
        }
@@ -1721,7 +1721,7 @@ static rlm_rcode_t sim_start_request_send(module_ctx_t const *mctx,
         *      Iterate over the the versions adding them
         *      to the version list we use for keying.
         */
-       for (vp = fr_cursor_init(&cursor, &request->reply->vps); vp; vp = fr_cursor_next(&cursor)) {
+       for (vp = fr_cursor_init(&cursor, &request->reply_pairs); vp; vp = fr_cursor_next(&cursor)) {
                if (vp->da != attr_eap_aka_sim_version_list) continue;
 
                if ((end - p) < 2) break;
@@ -1809,7 +1809,7 @@ static rlm_rcode_t common_eap_failure_enter(module_ctx_t const *mctx, REQUEST *r
        /*
         *      Free anything we were going to send out...
         */
-       fr_pair_list_free(&request->reply->vps);
+       fr_pair_list_free(&request->reply_pairs);
 
        /*
         *      If we're failing, then any identities
@@ -1844,7 +1844,7 @@ static rlm_rcode_t common_failure_notification_enter_resume(module_ctx_t const *
        /*
         *      Free anything we were going to send out...
         */
-       fr_pair_list_free(&request->reply->vps);
+       fr_pair_list_free(&request->reply_pairs);
 
        /*
         *      If there's an issue composing the failure
@@ -2017,7 +2017,7 @@ static rlm_rcode_t common_reauthentication_send_resume(module_ctx_t const *mctx,
                        RDEBUG2("Previous section returned (%s), clearing reply attributes and "
                                "requesting additional identity",
                                fr_table_str_by_value(rcode_table, request->rcode, "<INVALID>"));
-                       fr_pair_list_free(&request->reply->vps);
+                       fr_pair_list_free(&request->reply_pairs);
                        eap_aka_sim_session->id_req = AKA_SIM_FULLAUTH_ID_REQ;
 
                        return common_identity_enter(mctx, request, eap_session);
@@ -2086,7 +2086,7 @@ static rlm_rcode_t session_load_resume(module_ctx_t const *mctx,
                        RDEBUG2("Previous section returned (%s), clearing reply attributes and "
                                "requesting additional identity",
                                fr_table_str_by_value(rcode_table, request->rcode, "<INVALID>"));
-                       fr_pair_list_free(&request->reply->vps);
+                       fr_pair_list_free(&request->reply_pairs);
                        eap_aka_sim_session->id_req = AKA_SIM_FULLAUTH_ID_REQ;
                        return common_identity_enter(mctx, request, eap_session);
 
@@ -2160,7 +2160,7 @@ static rlm_rcode_t pseudonym_load_resume(module_ctx_t const *mctx,
                        RDEBUG2("Previous section returned (%s), clearing reply attributes and "
                                "requesting additional identity",
                                fr_table_str_by_value(rcode_table, request->rcode, "<INVALID>"));
-                       fr_pair_list_free(&request->reply->vps);
+                       fr_pair_list_free(&request->reply_pairs);
                        eap_aka_sim_session->id_req = AKA_SIM_FULLAUTH_ID_REQ;
                        return common_identity_enter(mctx, request, eap_session);
 
@@ -2273,7 +2273,7 @@ static rlm_rcode_t aka_challenge_enter(module_ctx_t const *mctx,
                 *      and send it to the peer.
                 */
                if (inst->network_name &&
-                   !fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_kdf_input)) {
+                   !fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_kdf_input)) {
                        MEM(pair_add_reply(&vp, attr_eap_aka_sim_kdf_input) >= 0);
                        fr_pair_value_bstrdup_buffer(vp, inst->network_name, false);
                }
@@ -2285,7 +2285,7 @@ static rlm_rcode_t aka_challenge_enter(module_ctx_t const *mctx,
                 *      Use the default bidding value we have configured
                 */
                if (eap_aka_sim_session->send_at_bidding_prefer_prime &&
-                   !fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_bidding)) {
+                   !fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_bidding)) {
                        MEM(pair_add_reply(&vp, attr_eap_aka_sim_bidding) >= 0);
                        vp->vp_uint16 = FR_BIDDING_VALUE_PREFER_AKA_PRIME;
                }
@@ -2297,7 +2297,7 @@ static rlm_rcode_t aka_challenge_enter(module_ctx_t const *mctx,
         *      Set the defaults for protected result indicator
         */
        if (eap_aka_sim_session->send_result_ind &&
-           !fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_result_ind)) {
+           !fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_result_ind)) {
                MEM(pair_add_reply(&vp, attr_eap_aka_sim_result_ind) >= 0);
                vp->vp_bool = true;
        }
@@ -2350,7 +2350,7 @@ static rlm_rcode_t sim_challenge_enter(module_ctx_t const *mctx,
         *      Set the defaults for protected result indicator
         */
        if (eap_aka_sim_session->send_result_ind &&
-           !fr_pair_find_by_da(request->reply->vps, attr_eap_aka_sim_result_ind)) {
+           !fr_pair_find_by_da(request->reply_pairs, attr_eap_aka_sim_result_ind)) {
                MEM(pair_add_reply(&vp, attr_eap_aka_sim_result_ind) >= 0);
                vp->vp_bool = true;
        }

diff --git a/src/lib/server/pair.h b/src/lib/server/pair.h
index f8a06f4b158b28c9366b1c4196a3ac21417180e3..e6a7b7849e56602aed9157c2b20663ddc3831e65 100644 (file)
--- a/src/lib/server/pair.h
+++ b/src/lib/server/pair.h
@@ -43,7 +43,7 @@ RCSIDH(server_pair_h, "$Id$")
  *     - 0 on success.
  *     - -1 on failure.
  */
-#define pair_add_reply(_attr, _da) fr_pair_add_by_da(request->reply, _attr, &request->reply->vps, _da)
+#define pair_add_reply(_attr, _da) fr_pair_add_by_da(request->reply, _attr, &request->reply_pairs, _da)
 
 /** Allocate a VALUE_PAIR in the control list
  *
@@ -85,7 +85,7 @@ RCSIDH(server_pair_h, "$Id$")
  *     - 0 if we allocated a new attribute.
  *     - -1 on failure.
  */
-#define pair_update_reply(_attr, _da) fr_pair_update_by_da(request->reply, _attr, &request->reply->vps, _da)
+#define pair_update_reply(_attr, _da) fr_pair_update_by_da(request->reply, _attr, &request->reply_pairs, _da)
 
 /** Return or allocate a VALUE_PAIR in the control list
  *
@@ -138,7 +138,7 @@ RCSIDH(server_pair_h, "$Id$")
  *     - >0 the number of pairs deleted.
  *     - 0 if no pairs were deleted.
  */
-#define pair_delete_reply(_pair) pair_delete(&request->reply->vps, _pair)
+#define pair_delete_reply(_pair) pair_delete(&request->reply_pairs, _pair)
 
 /** Delete a VALUE_PAIR in the control list
  *

diff --git a/src/lib/server/snmp.c b/src/lib/server/snmp.c
index e47397c564db48a930ee91083391b68c25ab07c8..2fc0a0a3b75ffb180c6ba78ce9e543121a372f8d 100644 (file)
--- a/src/lib/server/snmp.c
+++ b/src/lib/server/snmp.c
@@ -934,7 +934,7 @@ int fr_snmp_process(REQUEST *request)
 
        fr_cursor_init(&request_cursor, &request->packet->vps);
        fr_cursor_iter_by_da_init(&op_cursor, &request->packet->vps, attr_snmp_operation);
-       fr_cursor_init(&reply_cursor, &request->reply->vps);
+       fr_cursor_init(&reply_cursor, &request->reply_pairs);
        fr_cursor_init(&out_cursor, &head);
 
        RDEBUG2("Processing SNMP stats request");

diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index c29c71c8b68ae7e918d3a5c3374b1bb1ba936ca5..5bfef64b286df12d373b8b7d69958a076280f41c 100644 (file)
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -59,7 +59,7 @@ VALUE_PAIR **radius_list(REQUEST *request, pair_list_t list)
 
        case PAIR_LIST_REPLY:
                if (!request->reply) return NULL;
-               return &request->reply->vps;
+               return &request->reply_pairs;
 
        case PAIR_LIST_CONTROL:
                return &request->control_pairs;

diff --git a/src/lib/unlang/call.c b/src/lib/unlang/call.c
index ae34ea29d21e960fa13abd830a6d24875895c4d5..46b8f7c6c592082c568fffe62d242178ada995f4 100644 (file)
--- a/src/lib/unlang/call.c
+++ b/src/lib/unlang/call.c
@@ -166,7 +166,7 @@ static unlang_action_t unlang_call(REQUEST *request, rlm_rcode_t *presult)
                               request->packet->vps) < 0) ||
            (fr_pair_list_copy(child->reply,
                               &child->reply->vps,
-                              request->reply->vps) < 0) ||
+                              request->reply_pairs) < 0) ||
            (fr_pair_list_copy(child,
                               &child->control,
                               request->control_pairs) < 0)) {

diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index 0cc4f5524b9c54b836a8a664b7196baff2b3d005..77bf41b990f69cd9beb46124d439f0e5d4a16438 100644 (file)
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -116,7 +116,7 @@ static unlang_action_t unlang_parallel_process(REQUEST *request, rlm_rcode_t *pr
                                                       request->packet->vps) < 0) ||
                                    (fr_pair_list_copy(child->reply,
                                                       &child->reply->vps,
-                                                      request->reply->vps) < 0) ||
+                                                      request->reply_pairs) < 0) ||
                                    (fr_pair_list_copy(child,
                                                       &child->control,
                                                       request->control_pairs) < 0)) {

diff --git a/src/modules/proto_arp/proto_arp.c b/src/modules/proto_arp/proto_arp.c
index b4b811c672fe4c0c7cdd390a62295120c6685fb2..909bb4144e55f09faa79eeed00194bacd4c6b1ae 100644 (file)
--- a/src/modules/proto_arp/proto_arp.c
+++ b/src/modules/proto_arp/proto_arp.c
@@ -127,7 +127,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
                return 1;
        }
 
-       slen = fr_arp_encode(buffer, buffer_len, request->packet->data, request->reply->vps);
+       slen = fr_arp_encode(buffer, buffer_len, request->packet->data, request->reply_pairs);
        if (slen <= 0) {
                RPEDEBUG("Failed encoding reply");
                return -1;
@@ -146,7 +146,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
                       request->reply->code,
                       request->async->listen->name);
 
-               log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+               log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
        }
 
        return slen;

diff --git a/src/modules/proto_arp/proto_arp_process.c b/src/modules/proto_arp/proto_arp_process.c
index 17da29fbfc5b48e1a0b11fc58209f6fa78c9323d..cc7e3921bfe3550f293182f7ec2186327c0d49ea 100644 (file)
--- a/src/modules/proto_arp/proto_arp_process.c
+++ b/src/modules/proto_arp/proto_arp_process.c
@@ -109,7 +109,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                 *      Allow the admin to explicitly set the reply
                 *      type.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_arp_operation);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_arp_operation);
                if (vp) {
                        request->reply->code = vp->vp_uint8;
                } else switch (rcode) {
@@ -205,7 +205,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
 
                if (request->parent && RDEBUG_ENABLED) {
                        RDEBUG("Sending %s", fr_arp_packet_codes[request->reply->code]);
-                       log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+                       log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
                }
                break;
 

diff --git a/src/modules/proto_detail/proto_detail_process.c b/src/modules/proto_detail/proto_detail_process.c
index 39d9b4ad837ec58022e035eb3974e1f4ac3ee2c3..61a352cd4c2a5b94cfe799966b1f1d9f532b3821 100644 (file)
--- a/src/modules/proto_detail/proto_detail_process.c
+++ b/src/modules/proto_detail/proto_detail_process.c
@@ -134,7 +134,7 @@ static rlm_rcode_t mod_process(module_ctx_t const *mctx, REQUEST *request)
                /*
                 *      Allow for over-ride of reply code.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, inst->attr_packet_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, inst->attr_packet_type);
                if (vp) request->reply->code = vp->vp_uint32;
 
                if (request->reply->code == FR_CODE_DO_NOT_RESPOND) {
@@ -184,7 +184,7 @@ static rlm_rcode_t mod_process(module_ctx_t const *mctx, REQUEST *request)
                               request->reply->id);
                }
 
-               log_request_proto_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+               log_request_proto_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
                break;
 
        default:

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4.c b/src/modules/proto_dhcpv4/proto_dhcpv4.c
index c54810962ec9824302d251bc083d7df68b362bad..540c722d663518433ef61a388ead69f8c4e1276c 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4.c
@@ -400,7 +400,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
        }
 
        data_len = fr_dhcpv4_encode(buffer, buffer_len, original, request->reply->code,
-                                   ntohl(original->xid), request->reply->vps);
+                                   ntohl(original->xid), request->reply_pairs);
        if (data_len < 0) {
                RPEDEBUG("Failed encoding DHCPV4 reply");
                return -1;

diff --git a/src/modules/proto_dhcpv4/proto_dhcpv4_process.c b/src/modules/proto_dhcpv4/proto_dhcpv4_process.c
index fbea5fe77707937c9a74d9c4a9645e90a9af89cb..cb0cf506476e5a77168ee1d20db0be77c3e348f4 100644 (file)
--- a/src/modules/proto_dhcpv4/proto_dhcpv4_process.c
+++ b/src/modules/proto_dhcpv4/proto_dhcpv4_process.c
@@ -185,7 +185,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                 *      Allow the admin to explicitly set the reply
                 *      type.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_message_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_message_type);
                if (vp) {
                        request->reply->code = vp->vp_uint8;
                } else switch (rcode) {
@@ -217,7 +217,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                 *      Offer and ACK MUST have YIADDR.
                 */
                if ((request->reply->code == FR_DHCP_OFFER) || (request->reply->code == FR_DHCP_ACK)) {
-                       vp = fr_pair_find_by_da(request->reply->vps, attr_yiaddr);
+                       vp = fr_pair_find_by_da(request->reply_pairs, attr_yiaddr);
                        if (!vp) {
                                REDEBUG("%s packet does not have YIADDR.  The client will not receive an IP address.",
                                        dhcp_message_types[request->reply->code]);

diff --git a/src/modules/proto_dhcpv6/proto_dhcpv6.c b/src/modules/proto_dhcpv6/proto_dhcpv6.c
index 3cadb95a7459e3b526cd55014c0c79127bfb50f5..29569812b5e5a971dfcd36f34eeb09e0bd39e796 100644 (file)
--- a/src/modules/proto_dhcpv6/proto_dhcpv6.c
+++ b/src/modules/proto_dhcpv6/proto_dhcpv6.c
@@ -391,7 +391,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
        }
 
        data_len = fr_dhcpv6_encode(buffer, buffer_len, request->packet->data, request->packet->data_len,
-                                   request->reply->code, request->reply->vps);
+                                   request->reply->code, request->reply_pairs);
        if (data_len < 0) {
                RPEDEBUG("Failed encoding DHCPv6 reply");
                return -1;

diff --git a/src/modules/proto_dhcpv6/proto_dhcpv6_process.c b/src/modules/proto_dhcpv6/proto_dhcpv6_process.c
index 4f4621c275fd527937eeed48bfdfe51127b408b2..3f8d2df7a757e5d982825d97ecee482185b38ee7 100644 (file)
--- a/src/modules/proto_dhcpv6/proto_dhcpv6_process.c
+++ b/src/modules/proto_dhcpv6/proto_dhcpv6_process.c
@@ -157,7 +157,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                 *      Allow the admin to explicitly set the reply
                 *      type.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                if (vp) {
                        request->reply->code = vp->vp_uint32;
                } else switch (rcode) {

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index 1d71c10d9e7376c330dbfecaf62526c8a5201328..c68f79b2e18ab81c0f13bf738be1e458883c6b67 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -840,7 +840,7 @@ static int proto_ldap_cookie_load(TALLOC_CTX *ctx, uint8_t **cookie, rad_listen_
        {
                VALUE_PAIR *vp;
 
-               vp = fr_pair_find_by_da(request->reply->vps, attr_ldap_sync_cookie);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_ldap_sync_cookie);
                if (!vp) {
                        if (config->allow_refresh) RDEBUG2("No &reply.Cookie attribute found.  All entries matching "
                                                           "sync configuration will be returned");

diff --git a/src/modules/proto_radius/proto_radius.c b/src/modules/proto_radius/proto_radius.c
index d6fd68ad6b9526f78c9193e2b1c8389bab99a180..c3dabe590e659d309c2e61153a2df60fb1488596 100644 (file)
--- a/src/modules/proto_radius/proto_radius.c
+++ b/src/modules/proto_radius/proto_radius.c
@@ -485,7 +485,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
 
        data_len = fr_radius_encode(buffer, buffer_len, request->packet->data,
                                    client->secret, talloc_array_length(client->secret) - 1,
-                                   request->reply->code, request->reply->id, request->reply->vps);
+                                   request->reply->code, request->reply->id, request->reply_pairs);
        if (data_len < 0) {
                RPEDEBUG("Failed encoding RADIUS reply");
                return -1;
@@ -508,7 +508,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
                       data_len,
                       request->async->listen->name);
 
-               log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+               log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
        }
 
        return data_len;

diff --git a/src/modules/proto_radius/proto_radius_acct.c b/src/modules/proto_radius/proto_radius_acct.c
index f1b5a24f151f56ac26a81e81b1cd0a844a760f7b..a0a58bed6763706530dd7bffb251347023d7c63b 100644 (file)
--- a/src/modules/proto_radius/proto_radius_acct.c
+++ b/src/modules/proto_radius/proto_radius_acct.c
@@ -176,7 +176,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                /*
                 *      Allow for over-ride of reply code.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                if (vp) request->reply->code = vp->vp_uint32;
 
                dv = fr_dict_enum_by_value(attr_packet_type, fr_box_uint32(request->reply->code));
@@ -227,7 +227,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
 
                if (request->parent && RDEBUG_ENABLED) {
                        RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-                       log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+                       log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
                }
                break;
 

diff --git a/src/modules/proto_radius/proto_radius_auth.c b/src/modules/proto_radius/proto_radius_auth.c
index 0d03efdf6ea3760a065b7d4e806270512309ca71..ec65d8233b65e90e62427dc06c3b1e7e9d3344ab 100644 (file)
--- a/src/modules/proto_radius/proto_radius_auth.c
+++ b/src/modules/proto_radius/proto_radius_auth.c
@@ -380,7 +380,7 @@ static rlm_rcode_t mod_process(module_ctx_t const *mctx, REQUEST *request)
                        /*
                         *      Allow for over-ride of reply code.
                         */
-                       vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+                       vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                        if (vp) {
                                request->reply->code = vp->vp_uint32;
                                goto setup_send;
@@ -493,12 +493,12 @@ static rlm_rcode_t mod_process(module_ctx_t const *mctx, REQUEST *request)
                /*
                 *      Allow for over-ride of reply code.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                if (vp) request->reply->code = vp->vp_uint32;
 
        setup_send:
                if (!request->reply->code) {
-                       vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+                       vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                        if (vp) {
                                request->reply->code = vp->vp_uint32;
                        } else {
@@ -515,7 +515,7 @@ static rlm_rcode_t mod_process(module_ctx_t const *mctx, REQUEST *request)
                 *      "send Access-Challenge" section.
                 */
                if ((request->reply->code == FR_CODE_ACCESS_CHALLENGE) &&
-                   !(vp = fr_pair_find_by_da(request->reply->vps, attr_state))) {
+                   !(vp = fr_pair_find_by_da(request->reply_pairs, attr_state))) {
                        uint8_t buffer[16];
 
                        fr_rand_buffer(buffer, sizeof(buffer));
@@ -664,7 +664,7 @@ static rlm_rcode_t mod_process(module_ctx_t const *mctx, REQUEST *request)
                }
                if (request->parent && RDEBUG_ENABLED) {
                        RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-                       log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+                       log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
                }
                break;
 

diff --git a/src/modules/proto_radius/proto_radius_coa.c b/src/modules/proto_radius/proto_radius_coa.c
index f76f2f7e5ab5aacc0889231dbef935b346a96c83..eb911f1a6265b50b9a1405cc6530bd0675c2f204 100644 (file)
--- a/src/modules/proto_radius/proto_radius_coa.c
+++ b/src/modules/proto_radius/proto_radius_coa.c
@@ -82,8 +82,8 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                 *      re-authorization requests.
                 */
                if (request->packet->code == FR_CODE_COA_REQUEST) {
-                       vp = fr_pair_find_by_da(request->reply->vps, attr_service_type);
-                       if (vp && !fr_pair_find_by_da(request->reply->vps, attr_state)) {
+                       vp = fr_pair_find_by_da(request->reply_pairs, attr_service_type);
+                       if (vp && !fr_pair_find_by_da(request->reply_pairs, attr_state)) {
                                REDEBUG("CoA-Request with Service-Type = Authorize-Only MUST contain a State attribute");
                                request->reply->code = FR_CODE_COA_NAK;
                                goto nak;
@@ -135,7 +135,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                /*
                 *      Allow for over-ride of reply code.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                if (vp) request->reply->code = vp->vp_uint32;
 
        nak:
@@ -226,7 +226,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
 
                if (request->parent && RDEBUG_ENABLED) {
                        RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-                       log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+                       log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
                }
                break;
 

diff --git a/src/modules/proto_radius/proto_radius_status.c b/src/modules/proto_radius/proto_radius_status.c
index 7396cfe38bdc642d060788b1a0c0a56360e8ce27..7c1491bbf0eb880cecb342b21041de00950c823c 100644 (file)
--- a/src/modules/proto_radius/proto_radius_status.c
+++ b/src/modules/proto_radius/proto_radius_status.c
@@ -106,7 +106,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                /*
                 *      Allow for over-ride of reply code.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                if (vp) request->reply->code = vp->vp_uint32;
 
                dv = fr_dict_enum_by_value(attr_packet_type, fr_box_uint32(request->reply->code));
@@ -175,7 +175,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
 
                if (request->parent && RDEBUG_ENABLED) {
                        RDEBUG("Sending %s ID %i", fr_packet_codes[request->reply->code], request->reply->id);
-                       log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+                       log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
                }
                break;
 

diff --git a/src/modules/proto_tacacs/proto_tacacs.c b/src/modules/proto_tacacs/proto_tacacs.c
index ad16e56769fbd39ba42de241c019dc53c37951f5..7ffa880667e10b599cbf767bc1950cafd0ddc667 100644 (file)
--- a/src/modules/proto_tacacs/proto_tacacs.c
+++ b/src/modules/proto_tacacs/proto_tacacs.c
@@ -450,7 +450,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
 
        data_len = fr_tacacs_encode(buffer, buffer_len, request->packet->data,
                                    client->secret, talloc_array_length(client->secret) - 1,
-                                   request->reply->vps);
+                                   request->reply_pairs);
        if (data_len < 0) {
                RPEDEBUG("Failed encoding TACACS+ reply");
                return -1;
@@ -467,7 +467,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
                       data_len,
                       request->async->listen->name);
 
-               log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, "");
+               log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, "");
        }
 
        RHEXDUMP3(buffer, data_len, "proto_tacacs encode packet");

diff --git a/src/modules/proto_tacacs/proto_tacacs_acct.c b/src/modules/proto_tacacs/proto_tacacs_acct.c
index e2a6c7cedaa7b85df281ed09e6139ec36766c743..30947c59fc39d71c53978cdbda40feac1681a33e 100644 (file)
--- a/src/modules/proto_tacacs/proto_tacacs_acct.c
+++ b/src/modules/proto_tacacs/proto_tacacs_acct.c
@@ -101,7 +101,7 @@ static void accounting_failed(REQUEST *request, char const *msg)
        /*
         *      Set the server reply message.
         */
-       if (!fr_pair_find_by_da(request->reply->vps, attr_tacacs_server_message)) {
+       if (!fr_pair_find_by_da(request->reply_pairs, attr_tacacs_server_message)) {
                MEM(pair_update_reply(&vp, attr_tacacs_server_message) >= 0);
                fr_pair_value_strdup(vp, "Accounting failed");
        }

diff --git a/src/modules/proto_tacacs/proto_tacacs_auth.c b/src/modules/proto_tacacs/proto_tacacs_auth.c
index cb8b402e39efad2e2b2c7334ff6026d02e6127fe..2e5adfacd545320dd66e1c631930f17d4c8bf030 100644 (file)
--- a/src/modules/proto_tacacs/proto_tacacs_auth.c
+++ b/src/modules/proto_tacacs/proto_tacacs_auth.c
@@ -131,7 +131,7 @@ static void authentication_failed(REQUEST *request, char const *msg)
        /*
         *      Set the server reply message.  Note that we do not tell the user *why* they failed authentication.
         */
-       if (!fr_pair_find_by_da(request->reply->vps, attr_tacacs_server_message)) {
+       if (!fr_pair_find_by_da(request->reply_pairs, attr_tacacs_server_message)) {
                MEM(pair_update_reply(&vp, attr_tacacs_server_message) >= 0);
                fr_pair_value_strdup(vp, "Authentication failed");
        }

diff --git a/src/modules/proto_tacacs/proto_tacacs_autz.c b/src/modules/proto_tacacs/proto_tacacs_autz.c
index db0ff5c429b0fcda4aa1a39c76365153ff1a4c0b..5a12cc95ff44b54746a8b5712d34aa7df9028d14 100644 (file)
--- a/src/modules/proto_tacacs/proto_tacacs_autz.c
+++ b/src/modules/proto_tacacs/proto_tacacs_autz.c
@@ -84,7 +84,7 @@ static void authorization_failed(REQUEST *request, char const *msg)
        /*
         *      Set the server reply message.  Note that we do not tell the user *why* they failed authentication.
         */
-       if (!fr_pair_find_by_da(request->reply->vps, attr_tacacs_server_message)) {
+       if (!fr_pair_find_by_da(request->reply_pairs, attr_tacacs_server_message)) {
                MEM(pair_update_reply(&vp, attr_tacacs_server_message) >= 0);
                fr_pair_value_strdup(vp, "Authentication failed");
        }

diff --git a/src/modules/proto_vmps/proto_vmps.c b/src/modules/proto_vmps/proto_vmps.c
index 1d8e90c590453969b3e3895aee6e22f5a0d5c3fc..0ded764667b312b5792736fd7ec2c6490f60e22b 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps.c
+++ b/src/modules/proto_vmps/proto_vmps.c
@@ -371,7 +371,7 @@ static ssize_t mod_encode(void const *instance, REQUEST *request, uint8_t *buffe
 #endif
 
        data_len = fr_vmps_encode(buffer, buffer_len, request->packet->data,
-                                 request->reply->code, request->reply->id, request->reply->vps);
+                                 request->reply->code, request->reply->id, request->reply_pairs);
        if (data_len < 0) {
                RPEDEBUG("Failed encoding VMPS reply");
                return -1;

diff --git a/src/modules/proto_vmps/proto_vmps_dynamic_client.c b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
index 6a4cfef91639c3b44e038e7a730a647b670d4591..609adc667be8290ddfa75eead8dab9502e37baee 100644 (file)
--- a/src/modules/proto_vmps/proto_vmps_dynamic_client.c
+++ b/src/modules/proto_vmps/proto_vmps_dynamic_client.c
@@ -178,7 +178,7 @@ static rlm_rcode_t mod_process(UNUSED module_ctx_t const *mctx, REQUEST *request
                } else {
                        RDEBUG("Denying client");
                }
-               if (RDEBUG_ENABLED) log_request_pair_list(L_DBG_LVL_1, request, request->reply->vps, NULL);
+               if (RDEBUG_ENABLED) log_request_pair_list(L_DBG_LVL_1, request, request->reply_pairs, NULL);
                break;
 
        default:

diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index e233805817276e33276522344c1c482c488790b2..8b0da6a995e8f6e35883c3a5fce1c9aafa77816e 100644 (file)
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -906,10 +906,10 @@ static rlm_rcode_t mod_post_auth(module_ctx_t const *mctx, REQUEST *request)
                /*
                 *      Doesn't exist, add it in.
                 */
-               vp = fr_pair_find_by_da(request->reply->vps, attr_user_name);
+               vp = fr_pair_find_by_da(request->reply_pairs, attr_user_name);
                if (!vp) {
                        vp = fr_pair_copy(request->reply, username);
-                       fr_pair_add(&request->reply->vps, vp);
+                       fr_pair_add(&request->reply_pairs, vp);
                }
 
                /*
@@ -936,7 +936,7 @@ static rlm_rcode_t mod_post_auth(module_ctx_t const *mctx, REQUEST *request)
                return RLM_MODULE_NOOP;
        }
 
-       if (fr_pair_find_by_da(request->reply->vps, attr_eap_message)) {
+       if (fr_pair_find_by_da(request->reply_pairs, attr_eap_message)) {
                RDEBUG3("Reply already contained an EAP-Message, not inserting EAP-Failure");
                return RLM_MODULE_NOOP;
        }

diff --git a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
index e13e09174a80f3dc52cd2abeffdb8e458400a24f..1d02d7438f3458a31faa564d484ebc435c9bf133 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
+++ b/src/modules/rlm_eap/types/rlm_eap_mschapv2/rlm_eap_mschapv2.c
@@ -100,19 +100,19 @@ static void mppe_keys_store(REQUEST *request, mschapv2_opaque_t *data)
        RDEBUG2("Storing attributes for final response");
 
        RINDENT();
-       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply->vps,
+       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply_pairs,
                                    attr_ms_mppe_encryption_policy) > 0) {
                RDEBUG2("%s", attr_ms_mppe_encryption_policy->name);
        }
-       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply->vps,
+       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply_pairs,
                                    attr_ms_mppe_encryption_type) > 0) {
                RDEBUG2("%s", attr_ms_mppe_encryption_type->name);
        }
-       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply->vps,
+       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply_pairs,
                                    attr_ms_mppe_recv_key) > 0) {
                RDEBUG2("%s", attr_ms_mppe_recv_key->name);
        }
-       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply->vps,
+       if (fr_pair_list_copy_by_da(data, &data->mppe_keys, request->reply_pairs,
                                    attr_ms_mppe_send_key) > 0) {
                RDEBUG2("%s", attr_ms_mppe_send_key->name);
        }
@@ -292,7 +292,7 @@ static int CC_HINT(nonnull) mschap_postproxy(eap_session_t *eap_session, UNUSED
                 *      Move the attribute, so it doesn't go into
                 *      the reply.
                 */
-               fr_pair_list_copy_by_da(data, &response, request->reply->vps, attr_ms_chap2_success);
+               fr_pair_list_copy_by_da(data, &response, request->reply_pairs, attr_ms_chap2_success);
                break;
 
        default:
@@ -329,7 +329,7 @@ static int CC_HINT(nonnull) mschap_postproxy(eap_session_t *eap_session, UNUSED
         *      access-accept e.g. vlan, etc. This lets the PEAP
         *      use_tunneled_reply code work
         */
-       MEM(fr_pair_list_copy(data, &data->reply, request->reply->vps) >= 0);
+       MEM(fr_pair_list_copy(data, &data->reply, request->reply_pairs) >= 0);
 
        /*
         *      And we need to challenge the user, not ack/reject them,
@@ -361,14 +361,14 @@ static rlm_rcode_t mschap_finalize(REQUEST *request, rlm_eap_mschapv2_t const *i
         *      return success or failure, depending on the result.
         */
        if (rcode == RLM_MODULE_OK) {
-               if (fr_pair_list_copy_by_da(data, &response, request->reply->vps, attr_ms_chap2_success) < 0) {
+               if (fr_pair_list_copy_by_da(data, &response, request->reply_pairs, attr_ms_chap2_success) < 0) {
                        RPERROR("Failed copying %s", attr_ms_chap2_success->name);
                        return RLM_MODULE_FAIL;
                }
 
                data->code = FR_EAP_MSCHAPV2_SUCCESS;
        } else if (inst->send_error) {
-               if (fr_pair_list_copy_by_da(data, &response, request->reply->vps, attr_ms_chap_error) < 0) {
+               if (fr_pair_list_copy_by_da(data, &response, request->reply_pairs, attr_ms_chap_error) < 0) {
                        RPERROR("Failed copying %s", attr_ms_chap_error->name);
                        return RLM_MODULE_FAIL;
                }

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
index 66bef2d01b298f92430908a52a7c65f07a8cbb71..2261871cc4e3f4bed912985abc5f15c7fa8e2ae9 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/ttls.c
@@ -708,7 +708,7 @@ FR_CODE eap_ttls_process(REQUEST *request, eap_session_t *eap_session, fr_tls_se
                /* encapsulate response here */
                if (req->response) {
                        RDEBUG2("sending chbind response");
-                       fr_pair_add(&request->reply->vps,
+                       fr_pair_add(&request->reply_pairs,
                                    eap_chbind_packet2vp(request->reply, req->response));
                } else {
                        RDEBUG2("no chbind response");

diff --git a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
index 270fcf1051bfc40b89b59f4a7eda6cfabcfd0ea2..640a83cbaf5a276291a237da56a025eb5dc94a91 100644 (file)
--- a/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
+++ b/src/modules/rlm_isc_dhcp/rlm_isc_dhcp.c
@@ -1758,7 +1758,7 @@ static int apply_fixed_ip(rlm_isc_dhcp_t const *inst, REQUEST *request)
        /*
         *      If there's already a fixed IP, don't do anything
         */
-       yiaddr = fr_pair_find_by_da(request->reply->vps, attr_your_ip_address);
+       yiaddr = fr_pair_find_by_da(request->reply_pairs, attr_your_ip_address);
        if (yiaddr) return 0;
 
        host = get_host(request, inst->hosts_by_ether, inst->hosts_by_uid);
@@ -1779,7 +1779,7 @@ static int apply_fixed_ip(rlm_isc_dhcp_t const *inst, REQUEST *request)
 
                if (info->cmd->type != ISC_FIXED_ADDRESS) continue;
 
-               MEM(vp = fr_pair_afrom_da(request->reply->vps, attr_your_ip_address));
+               MEM(vp = fr_pair_afrom_da(request->reply_pairs, attr_your_ip_address));
 
                rcode = fr_value_box_copy(vp, &(vp->data), info->argv[0]);
                if (rcode < 0) return rcode;
@@ -1787,7 +1787,7 @@ static int apply_fixed_ip(rlm_isc_dhcp_t const *inst, REQUEST *request)
                /*
                 *      <sigh> I miss pair_add()
                 */
-               (void) fr_cursor_init(&cursor, &request->reply->vps);
+               (void) fr_cursor_init(&cursor, &request->reply_pairs);
                (void) fr_cursor_tail(&cursor);
                fr_cursor_append(&cursor, vp);
 
@@ -1812,7 +1812,7 @@ static int apply(rlm_isc_dhcp_t const *inst, REQUEST *request, rlm_isc_dhcp_info
        VALUE_PAIR *yiaddr;
 
        rcode = 0;
-       yiaddr = fr_pair_find_by_da(request->reply->vps, attr_your_ip_address);
+       yiaddr = fr_pair_find_by_da(request->reply_pairs, attr_your_ip_address);
 
        /*
         *      First, apply any "host" options
@@ -1867,7 +1867,7 @@ recurse:
                fr_cursor_t option_cursor;
                fr_cursor_t reply_cursor;
 
-               (void) fr_cursor_init(&reply_cursor, &request->reply->vps);
+               (void) fr_cursor_init(&reply_cursor, &request->reply_pairs);
                (void) fr_cursor_tail(&reply_cursor);
 
                /*
@@ -1894,7 +1894,7 @@ recurse:
                     vp = fr_cursor_next(&option_cursor)) {
                        VALUE_PAIR *reply;
 
-                       reply = fr_pair_find_by_da(request->reply->vps, vp->da);
+                       reply = fr_pair_find_by_da(request->reply_pairs, vp->da);
                        if (reply) continue;
 
                        /*

diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c
index 03d116ac954b02869053f8f0d82c515b7ae9bfda..15bf95082815f461cfbdbb0fbc30748384f67ad4 100644 (file)
--- a/src/modules/rlm_mruby/rlm_mruby.c
+++ b/src/modules/rlm_mruby/rlm_mruby.c
@@ -406,7 +406,7 @@ static rlm_rcode_t CC_HINT(nonnull) do_mruby(REQUEST *request, rlm_mruby_t const
        mruby_request = mrb_obj_new(mrb, inst->mruby_request, 0, NULL);
        mrb_iv_set(mrb, mruby_request, mrb_intern_cstr(mrb, "@frconfig"), inst->mrubyconf_hash);
        mruby_set_vps(request, mrb, mruby_request, "@request", &request->packet->vps);
-       mruby_set_vps(request, mrb, mruby_request, "@reply", &request->reply->vps);
+       mruby_set_vps(request, mrb, mruby_request, "@reply", &request->reply_pairs);
        mruby_set_vps(request, mrb, mruby_request, "@control", &request->control_pairs);
        mruby_set_vps(request, mrb, mruby_request, "@session_state", &request->state);
 
@@ -449,7 +449,7 @@ DIAG_ON(class-varargs)
                                return RLM_MODULE_FAIL;
                        }
 
-                       add_vp_tuple(request->reply, request, &request->reply->vps, mrb, mrb_ary_entry(mruby_result, 1), function_name);
+                       add_vp_tuple(request->reply, request, &request->reply_pairs, mrb, mrb_ary_entry(mruby_result, 1), function_name);
                        add_vp_tuple(request, request, &request->control_pairs, mrb, mrb_ary_entry(mruby_result, 2), function_name);
                        return (rlm_rcode_t)mrb_int(mrb, mrb_ary_entry(mruby_result, 0));
 

diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index f6de4b074e064ce25e127b8f2dc9c78369cf39d4..6613575f6d2bf882b2a17605b835cc433ca7c97e 100644 (file)
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -564,7 +564,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_passwd_map(module_ctx_t const *mctx, REQ
 
                do {
                        result_add(request, inst, request, &request->control_pairs, pw, 0, "config");
-                       result_add(request->reply, inst, request, &request->reply->vps, pw, 1, "reply_items");
+                       result_add(request->reply, inst, request, &request->reply_pairs, pw, 1, "reply_items");
                        result_add(request->packet, inst, request, &request->packet->vps, pw, 2, "request_items");
                } while ((pw = get_next(buffer, inst->ht, &last_found)));
 

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 9939a1c469d80193cfbc835f6d78d402b679e5af..d7a4fc97f7c53bb2d8a4cc7c5bc18f4783d85370 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -868,7 +868,7 @@ static int do_perl(void *instance, REQUEST *request, char const *function_name)
                rad_state_hv = get_hv("RAD_STATE", 1);
 
                perl_store_vps(request->packet, request, &request->packet->vps, rad_request_hv, "RAD_REQUEST", "request");
-               perl_store_vps(request->reply, request, &request->reply->vps, rad_reply_hv, "RAD_REPLY", "reply");
+               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");
 
@@ -917,8 +917,8 @@ static int do_perl(void *instance, REQUEST *request, char const *function_name)
                }
 
                if ((get_hv_content(request->reply, request, rad_reply_hv, &vp, "RAD_REPLY", "reply")) == 0) {
-                       fr_pair_list_free(&request->reply->vps);
-                       request->reply->vps = vp;
+                       fr_pair_list_free(&request->reply_pairs);
+                       request->reply_pairs = vp;
                        vp = NULL;
                }
 

diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index ee41c119f17e8473ff8e491fc49e17261eda2bea..e0176564966ce7a1f4f313c74e6b45e848153e3f 100644 (file)
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -590,7 +590,7 @@ static rlm_rcode_t do_python_single(rlm_python_t const *inst, REQUEST *request,
                /* Now have the return value */
                rcode = PyLong_AsLong(p_tuple_int);
                /* Reply item tuple */
-               mod_vptuple(request->reply, inst, request, &request->reply->vps,
+               mod_vptuple(request->reply, inst, request, &request->reply_pairs,
                            PyTuple_GET_ITEM(p_ret, 1), funcname, "reply");
                /* Config item tuple */
                mod_vptuple(request, inst, request, &request->control_pairs,

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index b527490be7d17db21496bb63cc58bea55d320b6f..469293c0494e9a78063f93929d5951a8fbb13e01 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -2427,11 +2427,11 @@ static void request_demux(fr_trunk_connection_t *tconn, fr_connection_t *conn, U
                if ((u->code == FR_CODE_ACCESS_REQUEST) && (code == FR_CODE_ACCESS_CHALLENGE)) {
                        VALUE_PAIR      *vp;
 
-                       vp = fr_pair_find_by_da(request->reply->vps, attr_packet_type);
+                       vp = fr_pair_find_by_da(request->reply_pairs, attr_packet_type);
                        if (!vp) {
                                MEM(vp = fr_pair_afrom_da(request->reply, attr_packet_type));
                                vp->vp_uint32 = FR_CODE_ACCESS_CHALLENGE;
-                               fr_pair_add(&request->reply->vps, vp);
+                               fr_pair_add(&request->reply_pairs, vp);
                        }
                }
 
@@ -2454,12 +2454,12 @@ static void request_demux(fr_trunk_connection_t *tconn, fr_connection_t *conn, U
 
                        MEM(vp = fr_pair_afrom_da(request->reply, attr_message_authenticator));
                        (void) fr_pair_value_memdup(vp, (uint8_t const *) "", 1, false);
-                       fr_pair_add(&request->reply->vps, vp);
+                       fr_pair_add(&request->reply_pairs, vp);
                }
 
                treq->request->reply->code = code;
                r->rcode = radius_code_to_rcode[code];
-               fr_pair_add(&request->reply->vps, reply);
+               fr_pair_add(&request->reply_pairs, reply);
                fr_trunk_request_signal_complete(treq);
        }
 }

diff --git a/src/modules/rlm_soh/rlm_soh.c b/src/modules/rlm_soh/rlm_soh.c
index 1dd0c8586ab83ea5c4c7f22dd39b072ed554ee47..82de593b8b85fdd84da6c6ff9f67060cc9d96a0e 100644 (file)
--- a/src/modules/rlm_soh/rlm_soh.c
+++ b/src/modules/rlm_soh/rlm_soh.c
@@ -181,7 +181,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
                                        p[4] = 'N';
                                        p[3] = 'A';
                                        p[2] = 'P';
-                                       fr_pair_add(&request->reply->vps, vp);
+                                       fr_pair_add(&request->reply_pairs, vp);
 
                                } else {
                                        RDEBUG2("SoH decoding NAP from DHCP request");

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 5c2734d7c8fa472560ef06d2366348dfbc433999..1eb5cfa49977505e229f307b46732c385e96f016 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -878,7 +878,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques
                         *      process the reply rows
                         */
                        if ((rows > 0) &&
-                           (paircmp(request, request->packet->vps, check_tmp, &request->reply->vps) != 0)) {
+                           (paircmp(request, request->packet->vps, check_tmp, &request->reply_pairs) != 0)) {
                                fr_pair_list_free(&check_tmp);
                                entry = entry->next;
 
@@ -938,7 +938,7 @@ static rlm_rcode_t rlm_sql_process_groups(rlm_sql_t const *inst, REQUEST *reques
 
                        log_request_pair_list(L_DBG_LVL_2, request, reply_tmp, NULL);
 
-                       radius_pairmove(request, &request->reply->vps, reply_tmp, true);
+                       radius_pairmove(request, &request->reply_pairs, reply_tmp, true);
                        reply_tmp = NULL;
                /*
                 *      If there's no reply query configured, then we assume
@@ -1259,7 +1259,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(module_ctx_t const *mctx, REQU
                 */
                RDEBUG2("User found in radcheck table");
                user_found = true;
-               if (paircmp(request, request->packet->vps, check_tmp, &request->reply->vps) != 0) {
+               if (paircmp(request, request->packet->vps, check_tmp, &request->reply_pairs) != 0) {
                        fr_pair_list_free(&check_tmp);
                        check_tmp = NULL;
                        goto skip_reply;
@@ -1308,7 +1308,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_authorize(module_ctx_t const *mctx, REQU
 
                log_request_pair_list(L_DBG_LVL_2, request, reply_tmp, NULL);
 
-               radius_pairmove(request, &request->reply->vps, reply_tmp, true);
+               radius_pairmove(request, &request->reply_pairs, reply_tmp, true);
 
                rcode = RLM_MODULE_OK;
                reply_tmp = NULL;

diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 3345dd053144776ae60d9c3d3ae5d7e2cb5cec3b..7e3b93af2a17a7178c9b2cbe6eb9f29bd4310755 100644 (file)
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -514,7 +514,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_alloc(module_ctx_t const *mctx, REQUEST
        /*
         *      If there is a Framed-IP-Address attribute in the reply do nothing
         */
-       if (fr_pair_find_by_da(request->reply->vps, inst->framed_ip_address) != NULL) {
+       if (fr_pair_find_by_da(request->reply_pairs, inst->framed_ip_address) != NULL) {
                RDEBUG2("%s already exists", inst->framed_ip_address->name);
 
                return do_logging(inst, request, inst->log_exists, RLM_MODULE_NOOP);
@@ -643,7 +643,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_alloc(module_ctx_t const *mctx, REQUEST
        }
 
        RDEBUG2("Allocated IP %s", allocation);
-       fr_pair_add(&request->reply->vps, vp);
+       fr_pair_add(&request->reply_pairs, vp);
 
        /*
         *      UPDATE

diff --git a/src/modules/rlm_stats/rlm_stats.c b/src/modules/rlm_stats/rlm_stats.c
index 6bb620f9e4992d75aa9d423a7cc81d7e5f6bbe23..17fbfb720ff6319d7d2f1559ae9a19c2dcfcf035 100644 (file)
--- a/src/modules/rlm_stats/rlm_stats.c
+++ b/src/modules/rlm_stats/rlm_stats.c
@@ -249,7 +249,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_stats(module_ctx_t const *mctx, REQUEST
        /*
         *      Create attributes based on the statistics.
         */
-       fr_cursor_init(&cursor, &request->reply->vps);
+       fr_cursor_init(&cursor, &request->reply_pairs);
 
        MEM(pair_update_reply(&vp, attr_freeradius_stats4_type) >= 0);
        vp->vp_uint32 = stats_type;

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 45dfb4ae21f21e89a3ecccef882346dcb0dece2e..b8eabddfd714c544c45c0f509afe7336ec2f850a 100644 (file)
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -173,8 +173,8 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
        uint8_t                 mip_rk_1[EVP_MAX_MD_SIZE], mip_rk_2[EVP_MAX_MD_SIZE];
        uint8_t                 mip_rk[2 * EVP_MAX_MD_SIZE];
 
-       msk = fr_pair_find_by_da(request->reply->vps, attr_eap_msk);
-       emsk = fr_pair_find_by_da(request->reply->vps, attr_eap_emsk);
+       msk = fr_pair_find_by_da(request->reply_pairs, attr_eap_msk);
+       emsk = fr_pair_find_by_da(request->reply_pairs, attr_eap_emsk);
        if (!msk || !emsk) {
                REDEBUG2("No EAP-MSK or EAP-EMSK.  Cannot create WiMAX keys");
                return RLM_MODULE_NOOP;
@@ -249,7 +249,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
         *      Calculate mobility keys
         */
        mn_nai = fr_pair_find_by_da(request->packet->vps, attr_wimax_mn_nai);
-       if (!mn_nai) mn_nai = fr_pair_find_by_da(request->reply->vps, attr_wimax_mn_nai);
+       if (!mn_nai) mn_nai = fr_pair_find_by_da(request->reply_pairs, attr_wimax_mn_nai);
        if (!mn_nai) {
                RWDEBUG("%s was not found in the request or in the reply", attr_wimax_mn_nai->name);
                RWDEBUG("We cannot calculate MN-HA keys");
@@ -259,7 +259,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
         *      WiMAX-IP-Technology
         */
        vp = NULL;
-       if (mn_nai) vp = fr_pair_find_by_da(request->reply->vps, attr_wimax_ip_technology);
+       if (mn_nai) vp = fr_pair_find_by_da(request->reply_pairs, attr_wimax_ip_technology);
        if (!vp) {
                RWDEBUG("%s not found in reply", attr_wimax_ip_technology->name);
                RWDEBUG("Not calculating MN-HA keys");
@@ -270,7 +270,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
                /*
                 *      Look for WiMAX-hHA-IP-MIP4
                 */
-               ip = fr_pair_find_by_da(request->reply->vps, attr_wimax_hha_ip_mip4);
+               ip = fr_pair_find_by_da(request->reply_pairs, attr_wimax_hha_ip_mip4);
                if (!ip) {
                        RWDEBUG("%s not found.  Cannot calculate MN-HA-PMIP4 key", attr_wimax_hha_ip_mip4->name);
                        break;
@@ -304,7 +304,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
                /*
                 *      Look for WiMAX-hHA-IP-MIP4
                 */
-               ip = fr_pair_find_by_da(request->reply->vps, attr_wimax_hha_ip_mip4);
+               ip = fr_pair_find_by_da(request->reply_pairs, attr_wimax_hha_ip_mip4);
                if (!ip) {
                        RWDEBUG("%s not found.  Cannot calculate MN-HA-CMIP4 key", attr_wimax_hha_ip_mip4->name);
                        break;
@@ -338,7 +338,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
                /*
                 *      Look for WiMAX-hHA-IP-MIP6
                 */
-               ip = fr_pair_find_by_da(request->reply->vps, attr_wimax_hha_ip_mip6);
+               ip = fr_pair_find_by_da(request->reply_pairs, attr_wimax_hha_ip_mip6);
                if (!ip) {
                        RWDEBUG("%s not found.  Cannot calculate MN-HA-CMIP6 key", attr_wimax_hha_ip_mip6->name);
                        break;
@@ -377,7 +377,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_post_auth(module_ctx_t const *mctx, REQU
         *
         *      FA-RK= H(MIP-RK, "FA-RK")
         */
-       fa_rk = fr_pair_find_by_da(request->reply->vps, attr_wimax_fa_rk_key);
+       fa_rk = fr_pair_find_by_da(request->reply_pairs, attr_wimax_fa_rk_key);
        if (fa_rk && (fa_rk->vp_length <= 1)) {
                HMAC_Init_ex(hmac, mip_rk, rk_len, EVP_sha1(), NULL);