Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update embedded dnsmasq to v2.91rc6 #2374

Merged
merged 3 commits into from
Mar 15, 2025
+6 −8
Merged

Update embedded dnsmasq to v2.91rc6 #2374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e2c3d5
Fix bogus compiler warnings.
simonkelley Mar 12, 2025
b762e2a
Fix crash when no upstream servers defined.
tisj Mar 14, 2025
e0f5aba
Update dnsmasq tag to 2.91rc6
DL6ER Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ set(CMAKE_C_STANDARD 17)

project(PIHOLE_FTL C)

set(DNSMASQ_VERSION pi-hole-v2.91rc5+2)
set(DNSMASQ_VERSION pi-hole-v2.91rc6)

add_subdirectory(src)
6 changes: 3 additions & 3 deletions src/dnsmasq/forward.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,8 +365,6 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
flags = 0;
}

master = daemon->serverarray[first];

/* don't forward A or AAAA queries for simple names, except the empty name */
if (!flags &&
option_bool(OPT_NODOTS_LOCAL) &&
Expand All @@ -378,7 +376,9 @@ static void forward_query(int udpfd, union mysockaddr *udpaddr,
/* Configured answer. */
if (flags || ede == EDE_NOT_READY)
goto reply;


master = daemon->serverarray[first];

if (!(forward = get_new_frec(now, master, 0)))
goto reply;
/* table full - flags == 0, return REFUSED */
Expand Down
6 changes: 2 additions & 4 deletions src/dnsmasq/rfc1035.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
{
unsigned char *cp = (unsigned char *)name, *p = *pp, *p1 = NULL;
unsigned int j, l, namelen = 0, hops = 0;
unsigned int bigmap_counter = 0, bigmap_posn = 0, bigmap_size, bitmap;
unsigned int bigmap_counter = 0, bigmap_posn = 0, bigmap_size = parm, bitmap = 0;
int retvalue = 1, case_insens = 1, isExtract = 0, flip = 0, extrabytes = (int)parm;
unsigned int *bigmap;
unsigned int *bigmap = (unsigned int *)name;

if (func == EXTR_NAME_EXTRACT)
isExtract = 1, *cp = 0;
Expand All @@ -47,9 +47,7 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp,
else if (func == EXTR_NAME_FLIP)
{
flip = 1, extrabytes = 0;
bigmap = (unsigned int *)name;
name = NULL;
bigmap_size = parm;
}

while (1)
Expand Down
Loading