s/request_io_ctx/rctx/

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index fedf4bf3026e1d7db804ebd888e2dab45be357d4..ca3163e0b791ffb463439810a83601aa7d9d926a 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -1566,8 +1566,8 @@ drain:
                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 @@ drain:
        } 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 2b891bec9c85225819049647eae5bc19a0bdb8c6..35ef49380ec4ca437677ae703c62c930a0d4c388 100644 (file)
--- 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 @@ retry:
 
 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 7b26b730477cd0796980709d2c841556944e2ae0..6b62a91820aecc760fa1531de1b56ce673a69eed 100644 (file)
--- 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);