remove server/protocol.h, server/listen.h, and server/protocol.c

nothing in them is used, so we are removing them, and all references
to them.

This is (hopefully) the last vestiges of v3

diff --git a/src/lib/server/auth.c b/src/lib/server/auth.c
index b22f90b641cb0a6e0e3ff60659fa7e0acb54bf4f..604370e3dfe1b111d0ca0907f3aa812475d781f9 100644 (file)
--- a/src/lib/server/auth.c
+++ b/src/lib/server/auth.c
@@ -26,10 +26,8 @@
  */
 RCSID("$Id$")
 
-#include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/auth.h>
 #include <freeradius-devel/server/module.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/state.h>
 #include <freeradius-devel/unlang/call.h>
 
@@ -190,46 +188,3 @@ unlang_action_t rad_virtual_server(unlang_result_t *p_result, request_t *request
        RETURN_UNLANG_OK;
 #endif
 }
-
-/*
- *     Debug the packet if requested.
- */
-void common_packet_debug(request_t *request, fr_packet_t *packet, fr_pair_list_t *pairs, bool received)
-{
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-       char if_name[IFNAMSIZ];
-#endif
-
-       if (!packet) return;
-       if (!RDEBUG_ENABLED) return;
-
-
-       log_request(L_DBG, L_DBG_LVL_1, request, __FILE__, __LINE__, "%s code %u Id %i from %s%pV%s:%i to %s%pV%s:%i "
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-                      "%s%s%s"
-#endif
-                      "length %zu",
-                      received ? "Received" : "Sent",
-                      packet->code,
-                      packet->id,
-                      packet->socket.inet.src_ipaddr.af == AF_INET6 ? "[" : "",
-                      fr_box_ipaddr(packet->socket.inet.src_ipaddr),
-                      packet->socket.inet.src_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->socket.inet.src_port,
-                      packet->socket.inet.dst_ipaddr.af == AF_INET6 ? "[" : "",
-                      fr_box_ipaddr(packet->socket.inet.dst_ipaddr),
-                      packet->socket.inet.dst_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->socket.inet.dst_port,
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-                      packet->socket.inet.ifindex ? "via " : "",
-                      packet->socket.inet.ifindex ? fr_ifname_from_ifindex(if_name, packet->socket.inet.ifindex) : "",
-                      packet->socket.inet.ifindex ? " " : "",
-#endif
-                      packet->data_len);
-
-       if (received) {
-               log_request_pair_list(L_DBG_LVL_1, request, NULL, pairs, NULL);
-       } else {
-               log_request_proto_pair_list(L_DBG_LVL_1, request, NULL, pairs, NULL);
-       }
-}

diff --git a/src/lib/server/base.h b/src/lib/server/base.h
index 10a4d1184cc0e65aa030c6917e0da9b6b88ae6ab..2df392452ab22948bc534038cd822ebe779cecc9 100644 (file)
--- a/src/lib/server/base.h
+++ b/src/lib/server/base.h
@@ -38,7 +38,6 @@ RCSIDH(base_h, "$Id$")
 #include <freeradius-devel/server/exec.h>
 #include <freeradius-devel/server/exfile.h>
 #include <freeradius-devel/server/global_lib.h>
-#include <freeradius-devel/server/listen.h>
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/main_loop.h>
@@ -52,7 +51,6 @@ RCSIDH(base_h, "$Id$")
 #include <freeradius-devel/server/pairmove.h>
 #include <freeradius-devel/server/password.h>
 #include <freeradius-devel/server/pool.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/regex.h>
 #include <freeradius-devel/server/rcode.h>
 #include <freeradius-devel/server/request_data.h>

diff --git a/src/lib/server/listen.h b/src/lib/server/listen.h
deleted file mode 100644 (file)
index c3f60b1..0000000
--- a/src/lib/server/listen.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/**
- * $Id$
- *
- * @file lib/server/listen.h
- * @brief Listener API.  Binds sockets to protocol encoders/decoders.
- *
- * @copyright 2015 The FreeRADIUS server project
- */
-RCSIDH(listen_h, "$Id$")
-
-#include <freeradius-devel/server/client.h>
-#include <freeradius-devel/server/socket.h>
-#include <freeradius-devel/server/stats.h>
-#include <freeradius-devel/util/event.h>
-#include <freeradius-devel/util/packet.h>
-#include <freeradius-devel/util/pcap.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- *     Types of listeners.
- *
- *     Ordered by priority!
- */
-typedef enum RAD_LISTEN_TYPE {
-       RAD_LISTEN_NONE = 0,
-       RAD_LISTEN_PROXY,
-       RAD_LISTEN_AUTH,
-       RAD_LISTEN_ACCT,
-       RAD_LISTEN_DETAIL,
-       RAD_LISTEN_VQP,
-       RAD_LISTEN_DHCP,
-       RAD_LISTEN_COMMAND,
-       RAD_LISTEN_COA,
-       RAD_LISTEN_MAX
-} RAD_LISTEN_TYPE;
-
-typedef enum RAD_LISTEN_STATUS {
-       RAD_LISTEN_STATUS_INIT = 0,
-       RAD_LISTEN_STATUS_KNOWN,
-       RAD_LISTEN_STATUS_FROZEN,
-       RAD_LISTEN_STATUS_EOL,
-       RAD_LISTEN_STATUS_REMOVE_NOW
-} RAD_LISTEN_STATUS;
-
-typedef struct rad_protocol_s rad_protocol_t;
-typedef struct rad_listen rad_listen_t;
-
-typedef int (*rad_listen_recv_t)(rad_listen_t *);
-typedef int (*rad_listen_send_t)(rad_listen_t *, request_t *);
-typedef int (*rad_listen_error_t)(rad_listen_t *, int);
-typedef int (*rad_listen_print_t)(rad_listen_t const *, char *, size_t);
-typedef void (*rad_listen_debug_t)(request_t *, fr_packet_t *, fr_pair_list_t *, bool received);
-typedef int (*rad_listen_encode_t)(rad_listen_t *, request_t *);
-typedef int (*rad_listen_decode_t)(rad_listen_t *, request_t *);
-
-struct rad_listen {
-       rad_listen_t            *next; /* should be rbtree stuff */
-       rad_protocol_t const    *proto;
-
-       /*
-        *      For normal sockets.
-        */
-       RAD_LISTEN_TYPE         type;
-       int                     fd;
-       char const              *server;        //!< Name of the virtual server that the listener is associated with
-       CONF_SECTION            *server_cs;     //!< Virtual server that the listener is associated with
-       RAD_LISTEN_STATUS       status;
-       bool                    old_style;
-
-       int                     count;
-       bool                    dual;
-       fr_rb_tree_t            *children;
-       rad_listen_t            *parent;
-       bool                    nodup;
-
-       rad_listen_recv_t       recv;
-       rad_listen_send_t       send;
-       rad_listen_error_t      error;
-       rad_listen_encode_t     encode;
-       rad_listen_decode_t     decode;
-       rad_listen_debug_t      debug;
-       rad_listen_print_t      print;
-
-       CONF_SECTION const      *cs;
-       void                    *data;
-};
-#ifdef __cplusplus
-}
-#endif

diff --git a/src/lib/server/main_loop.h b/src/lib/server/main_loop.h
index b353c0381b2b6c2cec3e097fdc26b47469adb842..b770e3c0d6d8b17f88e9b66af140788d0490972c 100644 (file)
--- a/src/lib/server/main_loop.h
+++ b/src/lib/server/main_loop.h
@@ -40,7 +40,6 @@ typedef enum {
 } radius_signal_t;
 
 #include <freeradius-devel/server/client.h>
-#include <freeradius-devel/server/listen.h>
 #include <freeradius-devel/server/signal.h>
 
 fr_event_list_t                *main_loop_event_list(void);

diff --git a/src/lib/server/protocol.c b/src/lib/server/protocol.c
deleted file mode 100644 (file)
index 3fd4b0b..0000000
--- a/src/lib/server/protocol.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#pragma once
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/**
- * $Id$
- *
- * @file lib/server/protocol.c
- * @brief Protocol module API.
- *
- * @copyright 2013 Alan DeKok
- */
-RCSIDH(protocol_h, "$Id$")
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <freeradius-devel/io/base.h>
-
-#include <freeradius-devel/server/dl_module.h>
-#include <freeradius-devel/server/listen.h>
-
-/*
- *     Debug the packet if requested.
- */
-void common_packet_debug(request_t *request, fr_packet_t *packet, fr_pair_list_t *pairs, bool received)
-{
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-       char if_name[IFNAMSIZ];
-#endif
-
-       if (!packet) return;
-       if (!RDEBUG_ENABLED) return;
-
-
-       log_request(L_DBG, L_DBG_LVL_1, request, __FILE__, __LINE__, "%s code %u Id %i from %s%pV%s:%i to %s%pV%s:%i "
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-                      "%s%s%s"
-#endif
-                      "length %zu",
-                      received ? "Received" : "Sent",
-                      packet->code,
-                      packet->id,
-                      packet->src_ipaddr.af == AF_INET6 ? "[" : "",
-                      fr_box_ipaddr(packet->src_ipaddr),
-                      packet->src_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->src_port,
-                      packet->dst_ipaddr.af == AF_INET6 ? "[" : "",
-                      fr_box_ipaddr(packet->dst_ipaddr),
-                      packet->dst_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->dst_port,
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-                      packet->ifindex ? "via " : "",
-                      packet->ifindex ? fr_ifname_from_ifindex(if_name, packet->ifindex) : "",
-                      packet->ifindex ? " " : "",
-#endif
-                      packet->data_len);
-
-       if (received || request->parent) {
-               log_request_pair_list(L_DBG_LVL_1, request, NULL, pairs, NULL);
-       } else {
-               log_request_proto_pair_list(L_DBG_LVL_1, request, NULL, pairs, NULL);
-       }
-}

diff --git a/src/lib/server/protocol.h b/src/lib/server/protocol.h
deleted file mode 100644 (file)
index 6550c11..0000000
--- a/src/lib/server/protocol.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#pragma once
-/*
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/**
- * $Id$
- *
- * @file lib/server/protocol.h
- * @brief Protocol module API.
- *
- * @copyright 2013 Alan DeKok
- */
-RCSIDH(protocol_h, "$Id$")
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <freeradius-devel/io/base.h>
-
-#include <freeradius-devel/server/dl_module.h>
-#include <freeradius-devel/server/listen.h>
-
-/*
- *     We'll use this below.
- */
-typedef int (*rad_listen_parse_t)(CONF_SECTION *, rad_listen_t *);
-typedef int (*rad_listen_unlang_t)(CONF_SECTION *, CONF_SECTION *);
-typedef void (*rad_listen_free_t)(rad_listen_t *);
-
-/*
- *     @todo: fix for later
- */
-int common_socket_parse(CONF_SECTION *cs, rad_listen_t *this);
-int common_socket_open(CONF_SECTION *cs, rad_listen_t *this);
-int common_socket_print(rad_listen_t const *this, char *buffer, size_t bufsize);
-void common_packet_debug(request_t *request, fr_packet_t *packet, fr_pair_list_t *pairs, bool received);
-
-/** Struct exported by a proto_* module
- *
- * Used to pass information common to proto_* modules to the server core,
- * and to register callbacks that get executed when processing packets of this
- * protocol type.
- */
-typedef struct rad_protocol_s {
-       DL_MODULE_COMMON;                               //!< Common fields to all loadable modules.
-
-       uint32_t                        transports;     //!< What can transport this protocol.
-       bool                            tls;            //!< Whether protocol can be wrapped in TLS.
-
-       rad_listen_unlang_t             bootstrap;      //!< Phase1 - Basic validation checks of virtual server.
-       rad_listen_unlang_t             compile;        //!< Phase2 - Compile unlang sections in the virtual
-                                                       //!< server that map to packet types used by the protocol.
-
-       rad_listen_parse_t              parse;          //!< Perform extra processing of the configuration data
-                                                       //!< specified by config.
-
-       rad_listen_parse_t              open;           //!< Open a descriptor.
-
-       rad_listen_recv_t               recv;           //!< Read an incoming packet from the descriptor.
-       rad_listen_send_t               send;           //!< Write an outgoing packet to the descriptor.
-       rad_listen_error_t              error;          //!< Handle error/eol on the descriptor.
-
-       rad_listen_print_t              print;          //!< Print a line describing the packet being sent or the
-                                                       //!< packet that was received.
-       rad_listen_debug_t              debug;          //!< Print an attribute list for debugging.
-
-       rad_listen_encode_t             encode;         //!< Encode an outgoing packet.
-       rad_listen_decode_t             decode;         //!< Decode an incoming packet.
-} rad_protocol_t;
-
-#define TRANSPORT_NONE 0
-#define TRANSPORT_TCP (1 << IPPROTO_TCP)
-#define TRANSPORT_UDP (1 << IPPROTO_UDP)
-#define TRANSPORT_DUAL (TRANSPORT_UDP | TRANSPORT_TCP)
-
-#ifdef __cplusplus
-}
-#endif

diff --git a/src/listen/bfd/proto_bfd_udp.c b/src/listen/bfd/proto_bfd_udp.c
index 1fe473557c874c1566daa87d7e76298f01af02c9..171cdda8c9551f1ccf5fd429d996a7a3947a37ea 100644 (file)
--- a/src/listen/bfd/proto_bfd_udp.c
+++ b/src/listen/bfd/proto_bfd_udp.c
@@ -22,7 +22,6 @@
  * @copyright 2023 Network RADIUS SAS (legal@networkradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/bfd/bfd.h>

diff --git a/src/listen/control/proto_control_unix.c b/src/listen/control/proto_control_unix.c
index 1e3e56b3b96c225db2715bd9d3ed393dd3645932..d877815580abc745303d5f62f22f1a887f2fccf9 100644 (file)
--- a/src/listen/control/proto_control_unix.c
+++ b/src/listen/control/proto_control_unix.c
@@ -27,7 +27,6 @@
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/perm.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/util/file.h>

diff --git a/src/listen/cron/proto_cron_crontab.c b/src/listen/cron/proto_cron_crontab.c
index 4d1bfabfee1fe8f1fda1165f6636deb8f6b9488b..685437b6f842bff4fd76579364207da534a9b9a2 100644 (file)
--- a/src/listen/cron/proto_cron_crontab.c
+++ b/src/listen/cron/proto_cron_crontab.c
@@ -23,7 +23,6 @@
  */
 #include <netdb.h>
 #include <fcntl.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/io/schedule.h>

diff --git a/src/listen/detail/proto_detail_file.c b/src/listen/detail/proto_detail_file.c
index de853b9393cc7bc0bf45ac4b6e46ceb3b8ca495c..4e5d0a1c0092bd392e9d3ec651e47d7094b7ac3a 100644 (file)
--- a/src/listen/detail/proto_detail_file.c
+++ b/src/listen/detail/proto_detail_file.c
@@ -28,7 +28,6 @@
 #include <freeradius-devel/io/schedule.h>
 
 #include <freeradius-devel/server/main_config.h>
-#include <freeradius-devel/server/protocol.h>
 
 #include <freeradius-devel/util/syserror.h>
 #include <freeradius-devel/util/misc.h>

diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c
index 028b390c03fe132ea9e5baf19479779904266813..7f7b02f5f5460e2968fa9eb66b3a0bf96890cf9d 100644 (file)
--- a/src/listen/detail/proto_detail_work.c
+++ b/src/listen/detail/proto_detail_work.c
@@ -23,7 +23,6 @@
  * @copyright 2017 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/server/main_loop.h>
 #include <freeradius-devel/io/application.h>

diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index c9f72f7375170e3ab71f67a8492027aa847a43de..a559d167714850f04c52e208a3cdd48cdccb798c 100644 (file)
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -26,7 +26,6 @@
 
 #include <netdb.h>
 #include <freeradius-devel/arp/arp.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/application.h>

diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 330a3cc501f68048b216c861c3a8830dc66a57d6..32cc198586d7ed6212c17418c4270c41ab5813a6 100644 (file)
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dhcpv6_udp"
 
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/application.h>

diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index b5471fbf428e9e725b2f8f65bdc5feb266e21427..aeb785b2dc2876baa5ff824ea5a374e940c75191 100644 (file)
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -23,7 +23,6 @@
  */
 #define LOG_PREFIX "proto_dns_udp"
 
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/cf_util.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>

diff --git a/src/listen/ldap_sync/proto_ldap_sync_ldap.c b/src/listen/ldap_sync/proto_ldap_sync_ldap.c
index 2859d501e51f2f647ed840cd23f8a35ff0a09ebc..9d20de821b803186f447daecbedc00717ee4ee64 100644 (file)
--- a/src/listen/ldap_sync/proto_ldap_sync_ldap.c
+++ b/src/listen/ldap_sync/proto_ldap_sync_ldap.c
@@ -27,7 +27,6 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/protocol/freeradius/freeradius.internal.h>
 #include <freeradius-devel/internal/internal.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/request.h>
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/unlang/call.h>

diff --git a/src/listen/load/proto_load_step.c b/src/listen/load/proto_load_step.c
index 60f8f613668d0aef08e1f67c83b0072a6423e504..32bef60a0c50d10324754f97724b45e5060eae75 100644 (file)
--- a/src/listen/load/proto_load_step.c
+++ b/src/listen/load/proto_load_step.c
@@ -24,7 +24,6 @@
  */
 #include <netdb.h>
 #include <fcntl.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/main_loop.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>

diff --git a/src/listen/radius/proto_radius_tcp.c b/src/listen/radius/proto_radius_tcp.c
index bed8c726563e95948b4e153c5ebc1869bc03fa30..cc08931fc449f8b4c7fe4e3b64e9a8c878f8f89c 100644 (file)
--- a/src/listen/radius/proto_radius_tcp.c
+++ b/src/listen/radius/proto_radius_tcp.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/radius/tcp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>

diff --git a/src/listen/radius/proto_radius_udp.c b/src/listen/radius/proto_radius_udp.c
index 3726fca6f9afa43e3af5572b13d5838209013278..7d0e62151adfcc13495fb8e45ac263383e74d010 100644 (file)
--- a/src/listen/radius/proto_radius_udp.c
+++ b/src/listen/radius/proto_radius_udp.c
@@ -23,7 +23,6 @@
  * @copyright 2016 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/radius/radius.h>

diff --git a/src/listen/tacacs/proto_tacacs_tcp.c b/src/listen/tacacs/proto_tacacs_tcp.c
index 62343efbf064dad180d9786207cc1a618885bf9a..54e3d94021690bcffb59a049687e02965d86ec2a 100644 (file)
--- a/src/listen/tacacs/proto_tacacs_tcp.c
+++ b/src/listen/tacacs/proto_tacacs_tcp.c
@@ -25,7 +25,6 @@
  */
 
 #include <netdb.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/io/listen.h>

diff --git a/src/listen/vmps/proto_vmps_udp.c b/src/listen/vmps/proto_vmps_udp.c
index 8a3d1402044b713b5c04aaa7be9b9298ab24bb1d..0eed46826ce616a3636b9e49f370de66ef4fb51f 100644 (file)
--- a/src/listen/vmps/proto_vmps_udp.c
+++ b/src/listen/vmps/proto_vmps_udp.c
@@ -23,7 +23,6 @@
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
 #include <netdb.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
 #include <freeradius-devel/util/trie.h>
 #include <freeradius-devel/io/application.h>

diff --git a/src/process/arp/base.c b/src/process/arp/base.c
index 826bd49a3b2d308b41d82dbce0ce132b7847a5a3..d160942217c6e653b9372fd06c43969998891e66 100644 (file)
--- a/src/process/arp/base.c
+++ b/src/process/arp/base.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2020 Network RADIUS SAS (legal@networkradius.com)
  */
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/arp/arp.h>
 #include <freeradius-devel/unlang/interpret.h>

diff --git a/src/process/bfd/base.c b/src/process/bfd/base.c
index 8e29d1ad5820e138073fda4e0387d567fb3509c9..95a5923414c28fc35b2e2fd0d46a59396cf2b2a9 100644 (file)
--- a/src/process/bfd/base.c
+++ b/src/process/bfd/base.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2023 Network RADIUS SAS (legal@networkradius.com)
  */
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/bfd/bfd.h>
 #include "bfd/session.h"

diff --git a/src/process/control/base.c b/src/process/control/base.c
index 12d2d0480c5222e60fde8b2b238cee65dbab9ac5..cde0f01b2dc95481ac185148a074b2e78a4b6ca6 100644 (file)
--- a/src/process/control/base.c
+++ b/src/process/control/base.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2020 Network RADIUS SAS (legal@networkradius.com)
  */
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/process_types.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/process/crl/base.c b/src/process/crl/base.c
index 081f116cfa4b120119cebb92965e2bb273684649..6d2a52c3a52b4a87fe92def7bfd56094e17cdffd 100644 (file)
--- a/src/process/crl/base.c
+++ b/src/process/crl/base.c
@@ -25,7 +25,6 @@
 #include <freeradius-devel/crl/crl.h>
 #include <freeradius-devel/io/coord_pair.h>
 #include <freeradius-devel/server/main_config.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/tls/strerror.h>
 #include <freeradius-devel/tls/utils.h>
 #include <freeradius-devel/unlang/interpret.h>

diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index d915b385aa744af67efdd6fc6710a211fa790325..023d9448e1e86ef999dfb6db2ded834369458722 100644 (file)
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -25,7 +25,6 @@
 #define LOG_PREFIX "process_dhcpv4"
 
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/module_method.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index a43fccbb085e0e822904dafc68d916c3b0b23fca..4a9625bc355f8044bc963a9fe299895134fccc54 100644 (file)
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -29,7 +29,6 @@
 #define LOG_PREFIX "process_dhcpv6 - "
 
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/util/dict.h>

diff --git a/src/process/dns/base.c b/src/process/dns/base.c
index 4d027f5176003dd24e073362174421ef54caba13..4a0f53d29ae4365a8ce2a96c50f463c723746c20 100644 (file)
--- a/src/process/dns/base.c
+++ b/src/process/dns/base.c
@@ -22,7 +22,6 @@
  * @copyright 2024 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2020 Network RADIUS SAS (legal@networkradius.com)
  */
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/server/rcode.h>
 #include <freeradius-devel/util/debug.h>

diff --git a/src/process/eap_psk/base.c b/src/process/eap_psk/base.c
index 78c65f2ea65775a0b4eebf009165cd1a2836360b..bd2be0bbb223bb43ed266af63f4607f6da588b2a 100644 (file)
--- a/src/process/eap_psk/base.c
+++ b/src/process/eap_psk/base.c
@@ -46,7 +46,6 @@
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/eap/types.h>
 #include <freeradius-devel/server/process_types.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/virtual_servers.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/unlang/module.h>

diff --git a/src/process/ldap_sync/base.c b/src/process/ldap_sync/base.c
index 8c2713d23fe3d6ee0d099fc8b4f1d0f4d93a3b0a..74a60e2791a34e7eef1e72b63b543c2a8b841d33 100644 (file)
--- a/src/process/ldap_sync/base.c
+++ b/src/process/ldap_sync/base.c
@@ -24,7 +24,6 @@
 #define LOG_PREFIX "process_ldap_sync"
 
 #include <freeradius-devel/unlang/interpret.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/ldap/sync.h>
 

diff --git a/src/process/radius/base.c b/src/process/radius/base.c
index 8d8f9bf512795f71fa5e43549a0da73a169071a0..c8144d98bc9839a229fd915f42094296010f4a6a 100644 (file)
--- a/src/process/radius/base.c
+++ b/src/process/radius/base.c
@@ -29,7 +29,6 @@
 #include <freeradius-devel/server/main_config.h>
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/pair.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/server/state.h>
 
 #include <freeradius-devel/unlang/module.h>
@@ -167,48 +166,6 @@ static const conf_parser_t config[] = {
        CONF_PARSER_TERMINATOR
 };
 
-/*
- *     Debug the packet if requested.
- */
-static void radius_packet_debug(request_t *request, fr_packet_t *packet, fr_pair_list_t *list, bool received)
-{
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-       char if_name[IFNAMSIZ];
-#endif
-
-       if (!packet) return;
-       if (!RDEBUG_ENABLED) return;
-
-       log_request(L_DBG, L_DBG_LVL_1, request, __FILE__, __LINE__, "%s %s ID %d from %s%pV%s:%i to %s%pV%s:%i "
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-                      "%s%s%s"
-#endif
-                      "",
-                      received ? "Received" : "Sending",
-                      fr_radius_packet_name[packet->code],
-                      packet->id,
-                      packet->socket.inet.src_ipaddr.af == AF_INET6 ? "[" : "",
-                      fr_box_ipaddr(packet->socket.inet.src_ipaddr),
-                      packet->socket.inet.src_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->socket.inet.src_port,
-                      packet->socket.inet.dst_ipaddr.af == AF_INET6 ? "[" : "",
-                      fr_box_ipaddr(packet->socket.inet.dst_ipaddr),
-                      packet->socket.inet.dst_ipaddr.af == AF_INET6 ? "]" : "",
-                      packet->socket.inet.dst_port
-#ifdef WITH_IFINDEX_NAME_RESOLUTION
-                      , packet->socket.inet.ifindex ? "via " : "",
-                      packet->socket.inet.ifindex ? fr_ifname_from_ifindex(if_name, packet->socket.inet.ifindex) : "",
-                      packet->socket.inet.ifindex ? " " : ""
-#endif
-                      );
-
-       if (received || request->parent) {
-               log_request_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
-       } else {
-               log_request_proto_pair_list(L_DBG_LVL_1, request, NULL, list, NULL);
-       }
-}
-
 /** Keep a copy of some attributes to keep them from being tampered with
  *
  */
@@ -761,7 +718,7 @@ static unlang_action_t mod_process(unlang_result_t *p_result, module_ctx_t const
                RETURN_UNLANG_FAIL;
        }
 
-       radius_packet_debug(request, request->packet, &request->request_pairs, true);
+       LOG_PACKET_DEBUG(request, request->packet, &request->request_pairs, fr_radius_packet_name, true, (request->packet->id >= 0));
 
        if (unlikely(request_is_dynamic_client(request))) {
                return new_client(p_result, mctx, request);

diff --git a/src/process/test/base.c b/src/process/test/base.c
index 7716038f2a67c5dd68f5de013213204b114a2221..585736f916fc6ddc20bc7460260fc86e5fb38717 100644 (file)
--- a/src/process/test/base.c
+++ b/src/process/test/base.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2020 Network RADIUS SAS (legal@networkradius.com)
  */
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/util/debug.h>
 

diff --git a/src/process/tls/base.c b/src/process/tls/base.c
index 0760e3351faf53be59676ac9b599af14ff7fd601..7e01277270779e135187ce7725a51c43e8471009 100644 (file)
--- a/src/process/tls/base.c
+++ b/src/process/tls/base.c
@@ -21,7 +21,6 @@
  *
  * @copyright 2021 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/protocol/tls/freeradius.h>

diff --git a/src/process/vmps/base.c b/src/process/vmps/base.c
index 86db218768e2d87a9e77a697e1c7bb5c0fc952d3..8cb7e9b5d22cd9180d869405c01c209c85d72aa0 100644 (file)
--- a/src/process/vmps/base.c
+++ b/src/process/vmps/base.c
@@ -23,7 +23,6 @@
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
 #include <freeradius-devel/io/application.h>
-#include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/dict.h>
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/vmps/vmps.h>