Because we're not allocating radiuses

diff --git a/src/bin/radclient.c b/src/bin/radclient.c
index e82ffd05b7bc4a512d1dfc788adb041007d3d1b0..d8f968c6404e1091379ae3af41e59341e1d8a65b 100644 (file)
--- a/src/bin/radclient.c
+++ b/src/bin/radclient.c
@@ -370,7 +370,7 @@ static int radclient_init(TALLOC_CTX *ctx, rc_file_pair_t *files)
                        goto error;
                }
 
-               request->packet = fr_radius_alloc(request, true);
+               request->packet = fr_radius_packet_alloc(request, true);
                if (!request->packet) {
                        ERROR("Out of memory");
                        goto error;

diff --git a/src/bin/radsniff.c b/src/bin/radsniff.c
index 3e6fd89dc59a568bee19f0235dce0e04df7398a3..2b40c23fcc808d1a6bb230bd51ec75cad7ee9222 100644 (file)
--- a/src/bin/radsniff.c
+++ b/src/bin/radsniff.c
@@ -1329,7 +1329,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt
         *      recover once some requests timeout, so make an effort to deal
         *      with allocation failures gracefully.
         */
-       packet = fr_radius_alloc(conf, false);
+       packet = fr_radius_packet_alloc(conf, false);
        if (!packet) {
                REDEBUG("Failed allocating memory to hold decoded packet");
                rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);
@@ -1579,7 +1579,7 @@ static void rs_packet_process(uint64_t count, rs_event_t *event, struct pcap_pkt
                /*
                 *      Save the request for later matching
                 */
-               search.expect = fr_radius_alloc_reply(packet, packet);
+               search.expect = fr_radius_packet_alloc_reply(packet, packet);
                if (!search.expect) {
                        REDEBUG("Failed allocating memory to hold expected reply");
                        rs_tv_add_ms(&header->ts, conf->stats.timeout, &stats->quiet);

diff --git a/src/bin/radsnmp.c b/src/bin/radsnmp.c
index 1c089244bcf7b426f8a04bb16a61156916e19744..c2b628449cb482754c71ea82853ddeed06b06da0 100644 (file)
--- a/src/bin/radsnmp.c
+++ b/src/bin/radsnmp.c
@@ -165,7 +165,7 @@ static fr_radius_packet_t *radsnmp_alloc(radsnmp_conf_t *conf, int fd)
 {
        fr_radius_packet_t *packet;
 
-       packet = fr_radius_alloc(conf, true);
+       packet = fr_radius_packet_alloc(conf, true);
 
        packet->code = conf->code;
 

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 55ae4281ffe1b873e16303cd96dfe41382a90f56..e13586fe7faf20664bc866fbc88efa187f285eaf 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -164,7 +164,7 @@ static request_t *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *
                return NULL;
        }
 
-       request->packet = fr_radius_alloc(request, false);
+       request->packet = fr_radius_packet_alloc(request, false);
        if (!request->packet) {
                ERROR("No memory");
                talloc_free(request);
@@ -172,7 +172,7 @@ static request_t *request_from_file(TALLOC_CTX *ctx, FILE *fp, fr_event_list_t *
        }
        request->packet->timestamp = fr_time();
 
-       request->reply = fr_radius_alloc(request, false);
+       request->reply = fr_radius_packet_alloc(request, false);
        if (!request->reply) {
                ERROR("No memory");
                talloc_free(request);
@@ -546,8 +546,8 @@ static request_t *request_clone(request_t *old)
        request = request_alloc(NULL);
        if (!request) return NULL;
 
-       if (!request->packet) request->packet = fr_radius_alloc(request, false);
-       if (!request->reply) request->reply = fr_radius_alloc(request, false);
+       if (!request->packet) request->packet = fr_radius_packet_alloc(request, false);
+       if (!request->reply) request->reply = fr_radius_packet_alloc(request, false);
 
        memcpy(request->packet, old->packet, sizeof(*request->packet));
        (void) fr_pair_list_copy(request->packet, &request->request_pairs, &old->request_pairs);

diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 62893d5baf1860fb00ca0d92a2240aacc2545eb9..7c150f3b52b6b9a4a9e3d91fe154effeae001062 100644 (file)
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -654,10 +654,10 @@ static void worker_request_init(fr_worker_t *worker, request_t *request, fr_time
 {
        request->el = worker->el;
        request->backlog = worker->runnable;
-       MEM(request->packet = fr_radius_alloc(request, false));
+       MEM(request->packet = fr_radius_packet_alloc(request, false));
        request->packet->timestamp = now;
 
-       request->reply = fr_radius_alloc(request, false);
+       request->reply = fr_radius_packet_alloc(request, false);
        fr_assert(request->reply != NULL);
 
        request->number = atomic_fetch_add_explicit(&request_number, 1, memory_order_seq_cst);

diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c
index 8b3f4b78844debc02ddf071aeb73f47a4469acc0..4e841704ece7395a7ed71714483b456558193939 100644 (file)
--- a/src/lib/server/pair_server_tests.c
+++ b/src/lib/server/pair_server_tests.c
@@ -193,10 +193,10 @@ static request_t *request_fake_alloc(void)
         */
        request = request_local_alloc(autofree);
 
-       request->packet = fr_radius_alloc(request, false);
+       request->packet = fr_radius_packet_alloc(request, false);
        TEST_CHECK(request->packet != NULL);
 
-       request->reply = fr_radius_alloc(request, false);
+       request->reply = fr_radius_packet_alloc(request, false);
        TEST_CHECK(request->reply != NULL);
 
        return request;

diff --git a/src/lib/server/request.c b/src/lib/server/request.c
index f97a849b48472e3b239f8e078979d33ca75ad632..604e10893ec31c31460cfd42c1c7052ae116a1c5 100644 (file)
--- a/src/lib/server/request.c
+++ b/src/lib/server/request.c
@@ -342,13 +342,13 @@ static request_t *request_init_fake(char const *file, int line, request_t *reque
         */
        fake->server_cs = request->server_cs;
 
-       fake->packet = fr_radius_alloc(fake, true);
+       fake->packet = fr_radius_packet_alloc(fake, true);
        if (!fake->packet) {
                talloc_free(fake);
                return NULL;
        }
 
-       fake->reply = fr_radius_alloc(fake, false);
+       fake->reply = fr_radius_packet_alloc(fake, false);
        if (!fake->reply) {
                talloc_free(fake);
                return NULL;

diff --git a/src/lib/util/packet.c b/src/lib/util/packet.c
index 3689938960e6b0503c3a086ab9b0c7e6eba216d1..ab66954bbcbeafd2ce23461097c5c442bfcd698e 100644 (file)
--- a/src/lib/util/packet.c
+++ b/src/lib/util/packet.c
@@ -38,7 +38,7 @@ RCSID("$Id$")
  *     - New fr_radius_packet_t.
  *     - NULL on error.
  */
-fr_radius_packet_t *fr_radius_alloc(TALLOC_CTX *ctx, bool new_vector)
+fr_radius_packet_t *fr_radius_packet_alloc(TALLOC_CTX *ctx, bool new_vector)
 {
        fr_radius_packet_t      *rp;
 
@@ -63,13 +63,13 @@ fr_radius_packet_t *fr_radius_alloc(TALLOC_CTX *ctx, bool new_vector)
  *     - New fr_radius_packet_t.
  *     - NULL on error.
  */
-fr_radius_packet_t *fr_radius_alloc_reply(TALLOC_CTX *ctx, fr_radius_packet_t *packet)
+fr_radius_packet_t *fr_radius_packet_alloc_reply(TALLOC_CTX *ctx, fr_radius_packet_t *packet)
 {
        fr_radius_packet_t *reply;
 
        if (!packet) return NULL;
 
-       reply = fr_radius_alloc(ctx, false);
+       reply = fr_radius_packet_alloc(ctx, false);
        if (!reply) return NULL;
 
        /*

diff --git a/src/lib/util/packet.h b/src/lib/util/packet.h
index 8e435977891b718350d8dae9a3cc2f98bee3c893..f4cc49128439ea596a58ecff3dd3022f52a464d0 100644 (file)
--- a/src/lib/util/packet.h
+++ b/src/lib/util/packet.h
@@ -71,8 +71,8 @@ typedef struct {
        size_t                  partial;
 } fr_radius_packet_t;
 
-fr_radius_packet_t     *fr_radius_alloc(TALLOC_CTX *ctx, bool new_vector);
-fr_radius_packet_t     *fr_radius_alloc_reply(TALLOC_CTX *ctx, fr_radius_packet_t *);
+fr_radius_packet_t     *fr_radius_packet_alloc(TALLOC_CTX *ctx, bool new_vector);
+fr_radius_packet_t     *fr_radius_packet_alloc_reply(TALLOC_CTX *ctx, fr_radius_packet_t *);
 void           fr_radius_packet_free(fr_radius_packet_t **);
 
 #ifdef __cplusplus

diff --git a/src/modules/proto_bfd/proto_bfd.c b/src/modules/proto_bfd/proto_bfd.c
index 69dbca5a9cecbaa3c549f9528350d46c1f090a23..c46d3c738890c717925fabb8b55323332f4365e3 100644 (file)
--- a/src/modules/proto_bfd/proto_bfd.c
+++ b/src/modules/proto_bfd/proto_bfd.c
@@ -1349,8 +1349,8 @@ static int bfd_process(bfd_state_t *session, bfd_packet_t *bfd)
                fr_radius_packet_t *packet, *reply;
 
                request = request_alloc(session);
-               packet = fr_radius_alloc(request, 0);
-               reply = fr_radius_alloc(request, 0);
+               packet = fr_radius_packet_alloc(request, 0);
+               reply = fr_radius_packet_alloc(request, 0);
 
                bfd_request(session, request, packet);
 

diff --git a/src/modules/proto_dhcpv4/dhcpclient.c b/src/modules/proto_dhcpv4/dhcpclient.c
index 1f20d551908a79cb16e72c9f16327ac73935e6eb..5065faf687a82bff97dba76f142b871bf6c31ee0 100644 (file)
--- a/src/modules/proto_dhcpv4/dhcpclient.c
+++ b/src/modules/proto_dhcpv4/dhcpclient.c
@@ -162,7 +162,7 @@ static int request_init(fr_radius_packet_t **out, fr_pair_list_t *packet_vps, ch
                fp = stdin;
        }
 
-       packet = fr_radius_alloc(NULL, false);
+       packet = fr_radius_packet_alloc(NULL, false);
 
        /*
         *      Read the VP's.

diff --git a/src/modules/proto_ldap_sync/proto_ldap_sync.c b/src/modules/proto_ldap_sync/proto_ldap_sync.c
index e8cd863e2fbd7bc12908ae8212d56b65dc788d18..7a693c2a7b1247efbde7fbb2f85d8fbe40136096 100644 (file)
--- a/src/modules/proto_ldap_sync/proto_ldap_sync.c
+++ b/src/modules/proto_ldap_sync/proto_ldap_sync.c
@@ -502,7 +502,7 @@ static request_t *proto_ldap_request_setup(rad_listen_t *listen, proto_ldap_inst
        if (!ctx) return NULL;
        talloc_set_name_const(ctx, "ldap_inst_pool");
 
-       packet = fr_radius_alloc(ctx, false);
+       packet = fr_radius_packet_alloc(ctx, false);
        packet->socket.fd = listen->fd;
        packet->id = sync_id;
        packet->socket.inet.src_ipaddr = inst->dst_ipaddr;

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 094c9c4313f23cf7238ac34e1763b4321340a290..28480aeca6497b2381f70c530e491934e73189b4 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -365,8 +365,8 @@ static void CC_HINT(nonnull) status_check_alloc(fr_event_list_t *el, udp_handle_
        request->name = talloc_strdup(request, h->module_name);
 
        request->el = el;
-       request->packet = fr_radius_alloc(request, false);
-       request->reply = fr_radius_alloc(request, false);
+       request->packet = fr_radius_packet_alloc(request, false);
+       request->reply = fr_radius_packet_alloc(request, false);
 
        /*
         *      Create the VPs, and ignore any errors

diff --git a/src/protocols/dhcpv4/packet.c b/src/protocols/dhcpv4/packet.c
index 4eb50cc46e0584b71238d994e76ea8ca4e563c48..3bed0455b3d85c29b02ac3a46656dbe26870cb47 100644 (file)
--- a/src/protocols/dhcpv4/packet.c
+++ b/src/protocols/dhcpv4/packet.c
@@ -431,7 +431,7 @@ fr_radius_packet_t *fr_dhcpv4_packet_alloc(uint8_t const *data, ssize_t data_len
        if (data_len < MIN_PACKET_SIZE) return NULL;
 
        /* Now that checks are done, allocate packet */
-       packet = fr_radius_alloc(NULL, false);
+       packet = fr_radius_packet_alloc(NULL, false);
        if (!packet) {
                fr_strerror_const("Failed allocating packet");
                return NULL;

diff --git a/src/protocols/dhcpv4/raw.c b/src/protocols/dhcpv4/raw.c
index 18ad8602363fda711a983f7415701bfee1f78856..a47b39aeef97d3b8cec3d7c56de8772c3c102efb 100644 (file)
--- a/src/protocols/dhcpv4/raw.c
+++ b/src/protocols/dhcpv4/raw.c
@@ -192,7 +192,7 @@ fr_radius_packet_t *fr_dhcv4_raw_packet_recv(int sockfd, struct sockaddr_ll *lin
        size_t                  dhcp_data_len;
        socklen_t               sock_len;
 
-       packet = fr_radius_alloc(NULL, false);
+       packet = fr_radius_packet_alloc(NULL, false);
        if (!packet) {
                fr_strerror_const("Failed allocating packet");
                return NULL;

diff --git a/src/protocols/radius/packet.c b/src/protocols/radius/packet.c
index 9b9af5197ad727c3785ab60e9bdd57b597855685..94ab1d85a98fdf9a84af24e0d1b8b2c549580ca4 100644 (file)
--- a/src/protocols/radius/packet.c
+++ b/src/protocols/radius/packet.c
@@ -381,7 +381,7 @@ fr_radius_packet_t *fr_radius_packet_recv(TALLOC_CTX *ctx, int fd, int flags, ui
        /*
         *      Allocate the new request data structure
         */
-       packet = fr_radius_alloc(ctx, false);
+       packet = fr_radius_packet_alloc(ctx, false);
        if (!packet) {
                fr_strerror_const("out of memory");
                return NULL;

diff --git a/src/protocols/radius/tcp.c b/src/protocols/radius/tcp.c
index d3d70936eb942942cf1b7a34597d186e4c811ac8..f3a36e2f68f9083496a29f9a393958c0094da615 100644 (file)
--- a/src/protocols/radius/tcp.c
+++ b/src/protocols/radius/tcp.c
@@ -30,7 +30,7 @@ RCSID("$Id$")
 
 fr_radius_packet_t *fr_tcp_recv(int sockfd, int flags)
 {
-       fr_radius_packet_t *packet = fr_radius_alloc(NULL, false);
+       fr_radius_packet_t *packet = fr_radius_packet_alloc(NULL, false);
 
        if (!packet) return NULL;