From: Alan T. DeKok <aland@freeradius.org>
Date: Sat, 26 Aug 2023 19:41:24 +0000 (-0400)
Subject: Packet-Type is now always a real attribute
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b17bd09d06a926b57c7e98a78fb1201886b24a71;p=thirdparty%2Ffreeradius-server.git

Packet-Type is now always a real attribute

which means that we don't need a virtual attribute callback for it.
---

diff --git a/src/lib/server/paircmp.c b/src/lib/server/paircmp.c
index 8acc8abc9b5..00a4694b47a 100644
--- a/src/lib/server/paircmp.c
+++ b/src/lib/server/paircmp.c
@@ -67,7 +67,6 @@ static fr_dict_attr_t const *attr_packet_dst_port;
 static fr_dict_attr_t const *attr_packet_src_ip_address;
 static fr_dict_attr_t const *attr_packet_src_ipv6_address;
 static fr_dict_attr_t const *attr_packet_src_port;
-static fr_dict_attr_t const *attr_packet_type;
 static fr_dict_attr_t const *attr_request_processing_stage;
 static fr_dict_attr_t const *attr_strip_user_name;
 static fr_dict_attr_t const *attr_stripped_user_name;
@@ -89,7 +88,6 @@ fr_dict_attr_autoload_t paircmp_dict_attr[] = {
 	{ .out = &attr_stripped_user_name, .name = "Stripped-User-Name", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 	{ .out = &attr_virtual_server, .name = "Virtual-Server", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
 
-	{ .out = &attr_packet_type, .name = "Packet-Type", .type = FR_TYPE_UINT32, .dict = &dict_radius },
 	{ .out = &attr_user_name, .name = "User-Name", .type = FR_TYPE_STRING, .dict = &dict_radius },
 	{ .out = &attr_user_password, .name = "User-Password", .type = FR_TYPE_STRING, .dict = &dict_radius },
 	{ NULL }
@@ -97,18 +95,6 @@ fr_dict_attr_autoload_t paircmp_dict_attr[] = {
 
 static paircmp_t *cmp = NULL;
 
-/*
- *	Compare the request packet type.
- */
-static int packet_cmp(request_t *request, fr_pair_t const *check_item)
-{
-	PAIR_VERIFY(check_item);
-
-	if (request->packet->code == check_item->vp_uint32) return 0;
-
-	return 1;
-}
-
 /*
  *	Generic comparisons, via xlat.
  */
@@ -679,8 +665,6 @@ int paircmp_init(void)
 		return -1;
 	}
 
-	paircmp_register(attr_packet_type, packet_cmp);
-
 	paircmp_register(attr_packet_src_ip_address, generic_cmp);
 	paircmp_register(attr_packet_dst_ip_address, generic_cmp);
 	paircmp_register(attr_packet_src_port, generic_cmp);
@@ -696,8 +680,6 @@ int paircmp_init(void)
 
 void paircmp_free(void)
 {
-	paircmp_unregister(attr_packet_type, packet_cmp);
-
 	paircmp_unregister(attr_packet_src_ip_address, generic_cmp);
 	paircmp_unregister(attr_packet_dst_ip_address, generic_cmp);
 	paircmp_unregister(attr_packet_src_port, generic_cmp);