From 67f830d29dcc65091bc6d4a3a378a99df702a397 Mon Sep 17 00:00:00 2001 From: Emeric Brun Date: Wed, 23 Dec 2020 15:55:03 +0100 Subject: [PATCH] BUG/MINOR: resolvers: fix attribute packed struct for dns This patch adds the attribute packed on struct dns_question because it is directly memcpy to network building a response. This patch also removes the commented line: // struct list options; /* list of option records */ because it is also used directly using memcpy to build a request and must not contain host data. --- include/haproxy/dns-t.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/haproxy/dns-t.h b/include/haproxy/dns-t.h index c9199045c..b1656b6a2 100644 --- a/include/haproxy/dns-t.h +++ b/include/haproxy/dns-t.h @@ -110,7 +110,7 @@ struct dns_header { struct dns_question { unsigned short qtype; /* question type */ unsigned short qclass; /* query class */ -}; +} __attribute__ ((packed)); /* NOTE: big endian structure */ struct dns_query_item { @@ -131,7 +131,6 @@ struct dns_additional_record { * placeholder here for this purpose. We may need to define a dns_option_record * structure which itself should point to different type of data, based on the * extension set (client subnet, tcp keepalive, etc...)*/ -// struct list options; /* list of option records */ } __attribute__ ((packed)); /* NOTE: big endian structure */