add configuration for unconnected sockets

diff --git a/src/lib/bio/fd_config.c b/src/lib/bio/fd_config.c
index b458be89378dc31cee5b7f099d6bf4db14e9242d..2786f0f76ea3fe506835d49f19d26fc0ba380221 100644 (file)
--- a/src/lib/bio/fd_config.c
+++ b/src/lib/bio/fd_config.c
@@ -129,6 +129,26 @@ static conf_parser_t const client_udp_config[] = {
 };
 
 
+static const conf_parser_t client_udp_unconnected_sub_config[] = {
+       { FR_CONF_OFFSET_TYPE_FLAGS("src_ipaddr", FR_TYPE_COMBO_IP_ADDR, 0, fr_bio_fd_config_t, src_ipaddr) },
+       { FR_CONF_OFFSET_TYPE_FLAGS("src_ipv4addr", FR_TYPE_IPV4_ADDR, 0, fr_bio_fd_config_t, src_ipaddr) },
+       { FR_CONF_OFFSET_TYPE_FLAGS("src_ipv6addr", FR_TYPE_IPV6_ADDR, 0, fr_bio_fd_config_t, src_ipaddr) },
+
+       { FR_CONF_OFFSET("interface", fr_bio_fd_config_t, interface) },
+
+       { FR_CONF_OFFSET_IS_SET("recv_buff", FR_TYPE_UINT32, 0, fr_bio_fd_config_t, recv_buff) },
+       { FR_CONF_OFFSET_IS_SET("send_buff", FR_TYPE_UINT32, 0, fr_bio_fd_config_t, send_buff) },
+
+       CONF_PARSER_TERMINATOR
+};
+
+static conf_parser_t const client_udp_unconnected_config[] = {
+       { FR_CONF_POINTER("udp", 0, CONF_FLAG_SUBSECTION, NULL), .subcs = (void const *) client_udp_unconnected_sub_config },
+
+       CONF_PARSER_TERMINATOR
+};
+
+
 static const conf_parser_t client_tcp_sub_config[] = {
        { FR_CONF_OFFSET_TYPE_FLAGS("ipaddr", FR_TYPE_COMBO_IP_ADDR, 0, fr_bio_fd_config_t, dst_ipaddr), },
        { FR_CONF_OFFSET_TYPE_FLAGS("ipv4addr", FR_TYPE_IPV4_ADDR, 0, fr_bio_fd_config_t, dst_ipaddr) },
@@ -201,6 +221,29 @@ static int client_transport_parse(TALLOC_CTX *ctx, void *out, void *parent, CONF
 {
        fr_bio_fd_config_t *fd_config = parent;
 
+       /*
+        *      Unconnected UDP sockets can only take src_ipaddr, but not port, and not dst_ipaddr.
+        */
+       if (fd_config->type == FR_BIO_FD_UNCONNECTED) {
+               char const *name = cf_pair_value(cf_item_to_pair(ci));
+               CONF_SECTION *cs = cf_item_to_section(cf_parent(ci));
+
+               if (strcmp(name, "udp") != 0) {
+                       cf_log_err(ci, "Invalid transport for unconnected UDP socket");
+                       return -1;
+               }
+
+               if (cf_section_rules_push(cs, client_udp_unconnected_config) < 0) {
+                       cf_log_perr(ci, "Failed updating parse rules");
+                       return -1;
+               }
+
+               fd_config->socket_type = SOCK_DGRAM;
+               *(char const **) out = name;
+
+               return 0;
+       }
+
        if (fd_config->type == FR_BIO_FD_INVALID) fd_config->type = FR_BIO_FD_CONNECTED;
 
        return common_transport_parse(ctx, out, parent, ci, rule,