From: Nick Porter Date: Tue, 19 Jan 2021 17:24:55 +0000 (+0000) Subject: Replace cusror functions with pair_list functions in rlm_sigtran/client.c X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f53e93ec1cb33093af50132afcb9c585efbd1a07;p=thirdparty%2Ffreeradius-server.git Replace cusror functions with pair_list functions in rlm_sigtran/client.c --- diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c index 47b91f2f094..261f54f8f52 100644 --- a/src/modules/rlm_sigtran/client.c +++ b/src/modules/rlm_sigtran/client.c @@ -297,12 +297,10 @@ static unlang_action_t sigtran_client_map_resume(rlm_rcode_t *p_result, UNUSED m case SIGTRAN_RESPONSE_OK: { unsigned int i = 0; - fr_cursor_t cursor; fr_pair_t *vp; sigtran_vector_t *vec; sigtran_map_send_auth_info_res_t *res = talloc_get_type_abort(txn->response.data, sigtran_map_send_auth_info_res_t); - fr_cursor_init(&cursor, &request->control_pairs); for (vec = res->vector; vec; vec = vec->next) { switch (vec->type) { @@ -317,19 +315,19 @@ static unlang_action_t sigtran_client_map_resume(rlm_rcode_t *p_result, UNUSED m MEM(fr_pair_value_memdup_buffer(vp, vec->sim.rand, true) == 0); TALLOC_FREE(vec->sim.rand); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_sres)); MEM(fr_pair_value_memdup_buffer(vp, vec->sim.sres, true) == 0); TALLOC_FREE(vec->sim.sres); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_kc)); MEM(fr_pair_value_memdup_buffer(vp, vec->sim.kc, true) == 0); TALLOC_FREE(vec->sim.kc); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); REXDENT(); i++; @@ -348,31 +346,31 @@ static unlang_action_t sigtran_client_map_resume(rlm_rcode_t *p_result, UNUSED m MEM(fr_pair_value_memdup_buffer(vp, vec->umts.rand, true) == 0); TALLOC_FREE(vec->umts.rand); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_xres)); MEM(fr_pair_value_memdup_buffer(vp, vec->umts.xres, true) == 0); TALLOC_FREE(vec->umts.xres); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_ck)); MEM(fr_pair_value_memdup_buffer(vp, vec->umts.ck, true) == 0); TALLOC_FREE(vec->umts.ck); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_ik)); MEM(fr_pair_value_memdup_buffer(vp, vec->umts.ik, true) == 0); TALLOC_FREE(vec->umts.ik); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); MEM(vp = fr_pair_afrom_da(request->control_ctx, attr_eap_aka_sim_autn)); MEM(fr_pair_value_memdup_buffer(vp, vec->umts.authn, true) == 0); TALLOC_FREE(vec->umts.authn); RDEBUG2("&control.%pP", vp); - fr_cursor_append(&cursor, vp); + fr_pair_add(&request->control_pairs, vp); REXDENT(); i++;