From 7c6300313e256ff4bbf58a47b4c7f65d38cc23ab Mon Sep 17 00:00:00 2001 From: Arran Cudbard-Bell Date: Sun, 23 Feb 2020 17:54:52 -0500 Subject: [PATCH] s/request_io_ctx/rctx/ --- src/modules/rlm_radius/rlm_radius_udp.c | 6 +++--- src/modules/rlm_radius/track.c | 6 +++--- src/modules/rlm_radius/track.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c index fedf4bf3026e..ca3163e0b791 100644 --- a/src/modules/rlm_radius/rlm_radius_udp.c +++ b/src/modules/rlm_radius/rlm_radius_udp.c @@ -1566,8 +1566,8 @@ static fr_trunk_request_t *read_packet(udp_handle_t *h, udp_connection_t *c) return NULL; } - if (rr->request_io_ctx != h->status_u) { - treq = talloc_get_type_abort(rr->request_io_ctx, fr_trunk_request_t); + if (rr->rctx != h->status_u) { + treq = talloc_get_type_abort(rr->rctx, fr_trunk_request_t); request = treq->request; rad_assert(request != NULL); u = talloc_get_type_abort(treq->preq, udp_request_t); @@ -1576,7 +1576,7 @@ static fr_trunk_request_t *read_packet(udp_handle_t *h, udp_connection_t *c) } else { treq = NULL; request = NULL; - u = talloc_get_type_abort(rr->request_io_ctx, udp_request_t); + u = talloc_get_type_abort(rr->rctx, udp_request_t); r = NULL; rad_assert(u == h->status_u); } diff --git a/src/modules/rlm_radius/track.c b/src/modules/rlm_radius/track.c index 2b891bec9c85..35ef49380ec4 100644 --- a/src/modules/rlm_radius/track.c +++ b/src/modules/rlm_radius/track.c @@ -77,13 +77,13 @@ static int rr_cmp(void const *one, void const *two) * @param[in] id The rlm_radius_id_t tracking table. * @param[in] request The request which will send the proxied packet. * @param[in] code Of the outbound request. - * @param request_io_ctx The context to associate with the request + * @param rctx The context to associate with the request * @return * - NULL on error * - rlm_radius_request_t on success */ rlm_radius_request_t *rr_track_alloc(rlm_radius_id_t *id, REQUEST *request, int code, - void *request_io_ctx) + void *rctx) { rlm_radius_request_t *rr; @@ -144,7 +144,7 @@ rlm_radius_request_t *rr_track_alloc(rlm_radius_id_t *id, REQUEST *request, int done: rr->request = request; - rr->request_io_ctx = request_io_ctx; + rr->rctx = rctx; rr->code = code; diff --git a/src/modules/rlm_radius/track.h b/src/modules/rlm_radius/track.h index 7b26b730477c..6b62a91820ae 100644 --- a/src/modules/rlm_radius/track.h +++ b/src/modules/rlm_radius/track.h @@ -32,7 +32,7 @@ */ typedef struct { REQUEST *request; //!< as always... - void *request_io_ctx; + void *rctx; int code; //!< packet code (sigh) int id; //!< our ID @@ -59,7 +59,7 @@ typedef struct { rlm_radius_id_t *rr_track_create(TALLOC_CTX *ctx); rlm_radius_request_t *rr_track_alloc(rlm_radius_id_t *id, REQUEST *request, int code, - void *request_io_ctx) CC_HINT(nonnull); + void *rctx) CC_HINT(nonnull); int rr_track_update(rlm_radius_id_t *id, rlm_radius_request_t *rr, uint8_t *vector) CC_HINT(nonnull); rlm_radius_request_t *rr_track_find(rlm_radius_id_t *id, int packet_id, uint8_t *vector) CC_HINT(nonnull(1)); int rr_track_delete(rlm_radius_id_t *id, rlm_radius_request_t *rr) CC_HINT(nonnull);