From: Alan T. DeKok Date: Fri, 31 Aug 2018 18:12:43 +0000 (-0400) Subject: is_dup is set false by network side X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdbdf69a7cdb7ccdf421e1a32dc5419fba865efb;p=thirdparty%2Ffreeradius-server.git is_dup is set false by network side and only really ever set to "true" by io/master.c --- diff --git a/src/lib/io/master.c b/src/lib/io/master.c index a715a9f5f45..434b7ddc74d 100644 --- a/src/lib/io/master.c +++ b/src/lib/io/master.c @@ -767,8 +767,6 @@ static fr_io_track_t *fr_io_track_add(fr_io_client_t *client, if (client->inst->app_io->track_duplicates) track = rbtree_finddata(client->table, &my_track); if (!track) { - *is_dup = false; - MEM(track = talloc_zero(client, fr_io_track_t)); talloc_get_type_abort(track, fr_io_track_t); @@ -932,7 +930,6 @@ static ssize_t mod_read(void *instance, void **packet_ctx, fr_time_t **recv_time get_inst(instance, &inst, &connection, &app_io_instance); - *is_dup = false; track = NULL; /* diff --git a/src/lib/io/network.c b/src/lib/io/network.c index d195feea386..f5894798a90 100644 --- a/src/lib/io/network.c +++ b/src/lib/io/network.c @@ -438,6 +438,9 @@ next_message: return; } + cd->request.is_dup = false; + cd->priority = PRIORITY_NORMAL; + /* * Read data from the network. * diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c index 6d7f8268875..7c89d224427 100644 --- a/src/modules/proto_detail/proto_detail_work.c +++ b/src/modules/proto_detail/proto_detail_work.c @@ -136,7 +136,7 @@ static fr_event_update_t resume_read[] = { { 0 } }; -static ssize_t mod_read(void *instance, void **packet_ctx, fr_time_t **recv_time, uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority, bool *is_dup) +static ssize_t mod_read(void *instance, void **packet_ctx, fr_time_t **recv_time, uint8_t *buffer, size_t buffer_len, size_t *leftover, uint32_t *priority, UNUSED bool *is_dup) { proto_detail_work_t *inst = talloc_get_type_abort(instance, proto_detail_work_t); @@ -149,7 +149,6 @@ static ssize_t mod_read(void *instance, void **packet_ctx, fr_time_t **recv_time rad_assert(*leftover < buffer_len); rad_assert(inst->fd >= 0); - *is_dup = false; /* * Process retransmissions before anything else in the