allow sending packets directly to the worker

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index e363810d0035deccd099f86861c600e049808cd0..c83da6c35dce67c62a6f12fd6fe18d35d965546e 100644 (file)
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -656,6 +656,48 @@ retry:
        return 0;
 }
 
+
+/** Send a packet to the worker.
+ *
+ *  MUST only be called from the network thread.
+ *
+ * @param nr the network
+ * @param parent the parent listener
+ * @param li the listener that the packet was "read" from.  Can be "parent"
+ * @param buffer the packet to send
+ * @param buflen size of the packet to send
+ * @param recv_time of the packet
+ * @param packet_ctx for the packet
+ * @return
+ *     - <0 on error
+ *     - 0 on success
+ */
+int fr_network_listen_send_packet(fr_network_t *nr, fr_listen_t *parent, fr_listen_t *li,
+                                 const uint8_t *buffer, size_t buflen, fr_time_t recv_time, void *packet_ctx)
+{
+       fr_channel_data_t *cd;
+       fr_network_socket_t *s;
+
+       (void) talloc_get_type_abort(nr, fr_network_t);
+       (void) talloc_get_type_abort_const(li, fr_listen_t);
+
+       s = fr_rb_find(nr->sockets, &(fr_network_socket_t){ .listen = parent });
+       if (!s) return -1;
+
+       cd = (fr_channel_data_t *) fr_message_alloc(s->ms, NULL, buflen);
+       if (!cd) return -1;
+
+       cd->request.is_dup = false;
+       cd->priority = PRIORITY_NORMAL;
+       cd->packet_ctx = packet_ctx;
+       cd->request.recv_time = recv_time;
+       memcpy(cd->m.data, buffer, buflen);
+       cd->m.when = fr_time();
+
+       return fr_network_send_request(nr, cd);
+}
+
+
 /*
  *     Mark it as dead, but DON'T free it until all of the replies
  *     have come in.

diff --git a/src/lib/io/network.h b/src/lib/io/network.h
index bc91a969b8f93767c70e7b959caecdc7c693622c..4e4d358a9c516038debea2f7b2d3033d5db45bd8 100644 (file)
--- a/src/lib/io/network.h
+++ b/src/lib/io/network.h
@@ -61,6 +61,9 @@ void          fr_network_listen_write(fr_network_t *nr, fr_listen_t *li, uint8_t const *
 
 int            fr_network_listen_inject(fr_network_t *nr, fr_listen_t *li, uint8_t const *packet, size_t packet_len, fr_time_t recv_time);
 
+int            fr_network_listen_send_packet(fr_network_t *nr, fr_listen_t *parent, fr_listen_t *li,
+                                             const uint8_t *buffer, size_t buflen, fr_time_t recv_time, void *packet_ctx) CC_HINT(nonnull(1,2,3,4));
+
 fr_network_t   *fr_network_create(TALLOC_CTX *ctx, fr_event_list_t *el,
                                   char const *nr, fr_log_t const *logger, fr_log_lvl_t lvl,
                                   fr_network_config_t const *config) CC_HINT(nonnull(2,4));