rlm_radius: More asserts

diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index da56a9606995cca9823d1f6a863788f120f04bb6..08b959c8f44b7f834882bb0ea17c420dab2f9bbd 100644 (file)
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -1669,6 +1669,9 @@ static void request_mux(fr_event_list_t *el,
                 */
                if (!treq) break;
 
+               rad_assert((treq->state == FR_TRUNK_REQUEST_STATE_PENDING) ||
+                          (treq->state == FR_TRUNK_REQUEST_STATE_PARTIAL));
+
                request = treq->request;
                u = talloc_get_type_abort(treq->preq, udp_request_t);
 
@@ -1745,6 +1748,11 @@ static void request_mux(fr_event_list_t *el,
        queued = i;
        if (queued == 0) return;        /* No work */
 
+       /*
+        *      Verify nothing accidentally freed the connection handle
+        */
+       (void)talloc_get_type_abort(h, udp_handle_t);
+
        /*
         *      Send the coalesced datagrams
         */
@@ -1811,6 +1819,8 @@ static void request_mux(fr_event_list_t *el,
                 */
                rad_assert((size_t)h->mmsgvec[i].msg_len == h->mmsgvec[i].msg_hdr.msg_iov->iov_len);
 
+               rad_assert(treq->state == FR_TRUNK_REQUEST_STATE_SENT);
+
                request = treq->request;
                u = talloc_get_type_abort(treq->preq, udp_request_t);
 
@@ -1882,6 +1892,9 @@ static void request_mux_replicate(UNUSED fr_event_list_t *el,
                 */
                if (!treq) break;
 
+               rad_assert((treq->state == FR_TRUNK_REQUEST_STATE_PENDING) ||
+                          (treq->state == FR_TRUNK_REQUEST_STATE_PARTIAL));
+
                request = treq->request;
                u = talloc_get_type_abort(treq->preq, udp_request_t);
 
@@ -1908,6 +1921,11 @@ static void request_mux_replicate(UNUSED fr_event_list_t *el,
        queued = i;
        if (queued == 0) return;        /* No work */
 
+       /*
+        *      Verify nothing accidentally freed the connection handle
+        */
+       (void)talloc_get_type_abort(h, udp_handle_t);
+
        sent = sendmmsg(h->fd, h->mmsgvec, queued, 0);
        if (sent < 0) {         /* Error means no messages were sent */
                sent = 0;