Use pair list abstraction macros in more places

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 4b5838f10938efe3a7131cfe48ecc386a2a7026e..55ae4281ffe1b873e16303cd96dfe41382a90f56 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -295,13 +295,13 @@ static request_t *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *
 }
 
 
-static void print_packet(FILE *fp, fr_radius_packet_t *packet)
+static void print_packet(FILE *fp, fr_radius_packet_t *packet, fr_pair_list_t *list)
 {
        fr_pair_t *vp;
        fr_cursor_t cursor;
        fr_dict_enum_t *dv;
 
-       if (!packet) {
+       if (!*list) {
                fprintf(fp, "\n");
                return;
        }
@@ -309,7 +309,7 @@ static void print_packet(FILE *fp, fr_radius_packet_t *packet)
        dv = fr_dict_enum_by_value(attr_packet_type, fr_box_uint32(packet->code));
        if (dv) fprintf(fp, "%s\n", dv->name);
 
-       for (vp = fr_cursor_init(&cursor, &packet->vps);
+       for (vp = fr_cursor_init(&cursor, list);
             vp;
             vp = fr_cursor_next(&cursor)) {
                /*
@@ -550,7 +550,7 @@ static request_t *request_clone(request_t *old)
        if (!request->reply) request->reply = fr_radius_alloc(request, false);
 
        memcpy(request->packet, old->packet, sizeof(*request->packet));
-       (void) fr_pair_list_copy(request->packet, &request->request_pairs, &old->packet->vps);
+       (void) fr_pair_list_copy(request->packet, &request->request_pairs, &old->request_pairs);
        request->packet->timestamp = fr_time();
        request->number = old->number++;
 
@@ -981,7 +981,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       print_packet(fp, request->reply);
+       print_packet(fp, request->reply, &request->reply_pairs);
 
        if (output_file) fclose(fp);
 

diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c
index a0448dc70384e40f32d4d298992e68e7d282eb9d..8b3f4b78844debc02ddf071aeb73f47a4469acc0 100644 (file)
--- a/src/lib/server/pair_server_tests.c
+++ b/src/lib/server/pair_server_tests.c
@@ -293,7 +293,7 @@ static void test_pair_add_session_state(void)
        TEST_CHECK(pair_add_session_state(&local_pairs, attr_test_integer) == 0);
 
        TEST_CASE("Validating VP_VERIFY()");
-       TEST_CHECK((vp = fr_cursor_init(&cursor, &request->state)) != NULL);
+       TEST_CHECK((vp = fr_cursor_init(&cursor, &request->state_pairs)) != NULL);
        VP_VERIFY(vp);
 
        TEST_MSG("Set vp = 12345");

diff --git a/src/lib/server/tmpl_eval.c b/src/lib/server/tmpl_eval.c
index 802901912e0cc5d12f2491d952b379addbba47da..be65f5633f825795e9e1696ba0c42ba75a0b0f3c 100644 (file)
--- a/src/lib/server/tmpl_eval.c
+++ b/src/lib/server/tmpl_eval.c
@@ -66,7 +66,7 @@ fr_pair_list_t *tmpl_list_head(request_t *request, tmpl_pair_list_t list)
                return &request->control_pairs;
 
        case PAIR_LIST_STATE:
-               return &request->state;
+               return &request->state_pairs;
        }
 
        RWDEBUG2("List \"%s\" is not available",

diff --git a/src/lib/unlang/parallel.c b/src/lib/unlang/parallel.c
index 3d71c4d23953f8725a7c19e697df06ff399a20ea..9845bfaf52a60f0fbf01bbd8de44562409ad8062 100644 (file)
--- a/src/lib/unlang/parallel.c
+++ b/src/lib/unlang/parallel.c
@@ -118,7 +118,7 @@ static unlang_action_t unlang_parallel_process(rlm_rcode_t *p_result, request_t
                                                       &child->reply_pairs,
                                                       &request->reply_pairs) < 0) ||
                                    (fr_pair_list_copy(child,
-                                                      &child->control,
+                                                      &child->control_pairs,
                                                       &request->control_pairs) < 0)) {
                                        REDEBUG("failed copying lists to clone");
                                        for (i = 0; i < state->num_children; i++) TALLOC_FREE(state->children[i].child);

diff --git a/src/modules/rlm_mruby/rlm_mruby.c b/src/modules/rlm_mruby/rlm_mruby.c
index 322b4dd7495d037c8f91181787c91fa3bde69e20..d89819fca2f77810fdca693c4c4e73d95a72afcc 100644 (file)
--- a/src/modules/rlm_mruby/rlm_mruby.c
+++ b/src/modules/rlm_mruby/rlm_mruby.c
@@ -408,7 +408,7 @@ static unlang_action_t CC_HINT(nonnull) do_mruby(rlm_rcode_t *p_result, request_
        mruby_set_vps(request, mrb, mruby_request, "@request", &request->request_pairs);
        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);
+       mruby_set_vps(request, mrb, mruby_request, "@session_state", &request->state_pairs);
 
 DIAG_OFF(class-varargs)
        mruby_result = mrb_funcall(mrb, mrb_obj_value(inst->mruby_module), function_name, 1, mruby_request);

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index b57874e1c1ada3cbde0dd3a437b63069b43496fa..6b5b94a1d1a506eaa86e9ca07b104a177ed855f6 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -930,7 +930,7 @@ static unlang_action_t do_perl(rlm_rcode_t *p_result, void *instance, request_t
                }
 
                if ((get_hv_content(request->state_ctx, request, rad_state_hv, &vp, "RAD_STATE", "session-state")) == 0) {
-                       fr_pair_list_free(&request->state);
+                       fr_pair_list_free(&request->state_pairs);
                        request->state_pairs = vp;
                        vp = NULL;
                }

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 002731274bdf346841cbfd1e4823f06cd8f2fbf2..592e34d6d134aceb627ccee67f15896d33b5049f 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -675,7 +675,7 @@ int sql_set_user(rlm_sql_t const *inst, request_t *request, char const *username
 /*
  *     Do a set/unset user, so it's a bit clearer what's going on.
  */
-#define sql_unset_user(_i, _r) fr_pair_delete_by_da(&_r->packet->vps, _i->sql_user)
+#define sql_unset_user(_i, _r) fr_pair_delete_by_da(&_r->request_pairs, _i->sql_user)
 
 static int sql_get_grouplist(rlm_sql_t const *inst, rlm_sql_handle_t **handle, request_t *request,
                             rlm_sql_grouplist_t **phead)