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

Jump to bottom

Fix Crash in dns module #904

Merged
merged 8 commits into from Dec 11, 2019
Merged

Fix Crash in dns module #904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ccbca6
Prevent possible crash, seen under centos8, dont overflow system reso…
michaelortmann Nov 26, 2019
c8d51c7
Rise sizeof dns-servers for 3 ipv6 servers with port
michaelortmann Nov 26, 2019
3fbdaee
Doc and Default Settings
michaelortmann Nov 26, 2019
63744bc
Enhance Logging
michaelortmann Nov 26, 2019
576a22a
Cleanup
michaelortmann Nov 26, 2019
04d9b4c
Update wording
vanosg Dec 11, 2019
5ab3fcf
Update wording
vanosg Dec 11, 2019
580f2c0
Update wording
vanosg Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions eggdrop-basic.conf
View file
Open in desktop
Expand Up @@ -312,8 +312,10 @@ set mod-path "modules/"
## In case your bot has trouble finding dns servers or you want to use
## specific ones, you can set them here. The value is a list of dns servers.
## The order doesn't matter. You can also specify a non-standard port.
## The default is to use the system specified dns servers.
#set dns-servers "8.8.8.8 8.8.4.4"
## The default is to use the system specified dns servers. You don't need to
## modify this setting normally. Default kernel implementations limit this list
## to 3 servers.
#set dns-servers "8.8.8.8 1.1.1.1 185.222.222.222"

#### CHANNELS MODULE ####

Expand Down
5 changes: 3 additions & 2 deletions eggdrop.conf
View file
Open in desktop
Expand Up @@ -648,8 +648,9 @@ loadmodule dns
# specific ones, you can set them here. The value is a list of dns servers.
# The order doesn't matter. You can also specify a non-standard port.
# The default is to use the system specified dns servers. You don't need to
# modify this setting normally.
#set dns-servers "8.8.8.8 8.8.4.4"
# modify this setting normally. Default kernel implementations limit this list
## to 3 servers.
#set dns-servers "8.8.8.8 1.1.1.1 185.222.222.222"

# Specify how long should the DNS module cache replies at maximum. The value
# must be in seconds.
Expand Down
15 changes: 11 additions & 4 deletions src/mod/dns.mod/dns.c
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ static int dns_retrydelay = 3;
static int dns_cache = 86400;
static int dns_negcache = 600;

static char dns_servers[121] = "";
static char dns_servers[144] = "";

#include "coredns.c"

Expand Down Expand Up @@ -131,15 +131,15 @@ static tcl_ints dnsints[] = {
};

static tcl_strings dnsstrings[] = {
{"dns-servers", dns_servers, 120, 0},
{"dns-servers", dns_servers, 143, 0},
{NULL, NULL, 0, 0}
};

static char *dns_change(ClientData cdata, Tcl_Interp *irp,
EGG_CONST char *name1,
EGG_CONST char *name2, int flags)
{
char buf[121], *p;
char buf[sizeof dns_servers], *p;
unsigned short port;
int i, lc, code;
EGG_CONST char **list, *slist;
Expand All @@ -164,6 +164,11 @@ static char *dns_change(ClientData cdata, Tcl_Interp *irp,
/* reinitialize the list */
myres.nscount = 0;
for (i = 0; i < lc; i++) {
if (myres.nscount >= MAXNS) {
putlog(LOG_MISC, "*", "WARNING: %i dns-servers configured but kernel-defined"
"limit is %i, ignoring extra servers\n", lc, MAXNS);
break;
}
if ((p = strchr(list[i], ':'))) {
*p++ = 0;
/* allow non-standard ports */
Expand All @@ -176,6 +181,8 @@ static char *dns_change(ClientData cdata, Tcl_Interp *irp,
myres.nsaddr_list[myres.nscount].sin_family = AF_INET;
myres.nscount++;
}
else
putlog(LOG_MISC, "*", "WARNING: Invalid dns-server %s", list[i]);
}
Tcl_Free((char *) list);
}
Expand Down Expand Up @@ -291,7 +298,7 @@ char *dns_start(Function *global_funcs)

global = global_funcs;

module_register(MODULE_NAME, dns_table, 1, 1);
module_register(MODULE_NAME, dns_table, 1, 2);
if (!module_depend(MODULE_NAME, "eggdrop", 108, 0)) {
module_undepend(MODULE_NAME);
return "This module requires Eggdrop 1.8.0 or later.";
Expand Down