From: Nick Porter Date: Wed, 25 Oct 2023 09:23:08 +0000 (+0100) Subject: Use fr_pair_list_append to move temporary lists X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5058c856bb6d9a8307bb364de8e6b092b0102f58;p=thirdparty%2Ffreeradius-server.git Use fr_pair_list_append to move temporary lists --- diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c index 10ebca80616..1232a42a786 100644 --- a/src/bin/radsniff.c +++ b/src/bin/radsniff.c @@ -1534,7 +1534,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt * The delay is so we can detect retransmissions. */ original->linked = talloc_steal(original, packet); - fr_pair_list_move_op(&original->link_vps, &decoded, T_OP_ADD_EQ); /* Move the vps over */ + fr_pair_list_append(&original->link_vps, &decoded); /* Move the vps over */ rs_tv_add_ms(&header->ts, conf->stats.timeout, &original->when); if (fr_event_timer_at(NULL, event->list, &original->event, fr_time_from_timeval(&original->when), _rs_event, original) < 0) { @@ -1727,7 +1727,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt fr_pair_list_free(&original->packet_vps); fr_radius_packet_free(&original->packet); original->packet = talloc_steal(original, packet); - fr_pair_list_move_op(&original->packet_vps, &decoded, T_OP_ADD_EQ); + fr_pair_list_append(&original->packet_vps, &decoded); /* Request may need to be reinserted as the 5 tuple of the response may of changed */ if (rs_packet_cmp(original, &search) != 0) { @@ -1738,7 +1738,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt fr_pair_list_free(&original->expect_vps); fr_radius_packet_free(&original->expect); original->expect = talloc_steal(original, search.expect); - fr_pair_list_move_op(&original->expect_vps, &search.expect_vps, T_OP_ADD_EQ); + fr_pair_list_append(&original->expect_vps, &search.expect_vps); /* Disarm the timer for the cleanup event for the original request */ fr_event_timer_delete(&original->event); @@ -1755,10 +1755,10 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt original->capture_p = original->capture; original->packet = talloc_steal(original, packet); - fr_pair_list_move_op(&original->packet_vps, &decoded, T_OP_ADD_EQ); + fr_pair_list_append(&original->packet_vps, &decoded); original->expect = talloc_steal(original, search.expect); - fr_pair_list_move_op(&original->expect_vps, &search.expect_vps, T_OP_ADD_EQ); + fr_pair_list_append(&original->expect_vps, &search.expect_vps); if (!fr_pair_list_empty(&search.link_vps)) { bool ret; @@ -1769,7 +1769,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt vp = fr_pair_list_next(&search.link_vps, vp)) { fr_pair_steal(original, vp); } - fr_pair_list_move_op(&original->link_vps, &search.link_vps, T_OP_ADD_EQ); + fr_pair_list_append(&original->link_vps, &search.link_vps); /* We should never have conflicts */ ret = fr_rb_insert(link_tree, original);