ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

chg: nil: Cleanup dns_opcode_t

Browse Source 
Refactor to cleanup the `dns_opcode_t` enum.

Merge branch 'alessio/cleanup-dns_opcode_t' into 'main'

See merge request isc-projects/bind9!10165
This commit is contained in:
Alessio Podda
2025-03-04 18:30:48 +00:00
parent 22b5442722 87776a51ae
commit d388063466
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dns/include/dns/stats.h
View File

@@ -399,7 +399,7 @@ dns_opcodestats_increment(dns_stats_t *stats, dns_opcode_t code);
*/
void
dns_rcodestats_increment(dns_stats_t *stats, dns_opcode_t code);
dns_rcodestats_increment(dns_stats_t *stats, dns_rcode_t code);
/*%<
* Increment the statistics counter for 'code'.
*

16
lib/dns/include/dns/types.h
View File

@@ -124,7 +124,7 @@ typedef struct dns_nametree dns_nametree_t;
typedef ISC_LIST(dns_name_t) dns_namelist_t;
typedef struct dns_ntatable dns_ntatable_t;
typedef struct dns_ntnode dns_ntnode_t;
typedef uint16_t dns_opcode_t;
typedef enum dns_opcode dns_opcode_t;
typedef struct dns_order dns_order_t;
typedef struct dns_peer dns_peer_t;
typedef struct dns_peerlist dns_peerlist_t;
@@ -308,20 +308,18 @@ enum {
/*%
* Opcodes.
*/
enum {
enum dns_opcode {
dns_opcode_query = 0,
#define dns_opcode_query ((dns_opcode_t)dns_opcode_query)
dns_opcode_iquery = 1,
#define dns_opcode_iquery ((dns_opcode_t)dns_opcode_iquery)
dns_opcode_status = 2,
#define dns_opcode_status ((dns_opcode_t)dns_opcode_status)
dns_opcode_notify = 4,
#define dns_opcode_notify ((dns_opcode_t)dns_opcode_notify)
dns_opcode_update = 5, /* dynamic update */
#define dns_opcode_update ((dns_opcode_t)dns_opcode_update)
dns_opcode_max = 6,
#define dns_opcode_max ((dns_opcode_t)dns_opcode_max)
};
dns__opcode_expand = UINT16_MAX,
} __attribute__((__packed__));
/* Absent attribute packed, the enum will be sized as an int */
STATIC_ASSERT(sizeof(uint16_t) == sizeof(dns_opcode_t),
"sizeof(dns_opecode)t) is not 16-bit");
/*%
* Trust levels. Must be kept in sync with trustnames[] in masterdump.c.