Fix bit-rotted data handling code for LUA scripts.

This commit is contained in:
Simon Kelley committed 2022-07-31 11:33:05 +01:00
1 parent 6578acd668
commit 05e6728e98
3 files changed
+14 -15

No files matched your search

+6 -6
View File
@@ -450,8 +450,10 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
buf = grab_extradata_lua(buf, end, "circuit_id");
buf = grab_extradata_lua(buf, end, "subscriber_id");
buf = grab_extradata_lua(buf, end, "remote_id");
buf = grab_extradata_lua(buf, end, "requested_options");
}
buf = grab_extradata_lua(buf, end, "mud_url");
buf = grab_extradata_lua(buf, end, "tags");
if (is6)
@@ -633,16 +635,14 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
buf = grab_extradata(buf, end, "DNSMASQ_CIRCUIT_ID", &err);
buf = grab_extradata(buf, end, "DNSMASQ_SUBSCRIBER_ID", &err);
buf = grab_extradata(buf, end, "DNSMASQ_REMOTE_ID", &err);
buf = grab_extradata(buf, end, "DNSMASQ_MUD_URL", &err);
buf = grab_extradata(buf, end, "DNSMASQ_REQUESTED_OPTIONS", &err);
}
buf = grab_extradata(buf, end, "DNSMASQ_MUD_URL", &err);
buf = grab_extradata(buf, end, "DNSMASQ_TAGS", &err);
if (is6) {
buf = grab_extradata(buf, end, "DNSMASQ_RELAY_ADDRESS", &err);
buf = grab_extradata(buf, end, "DNSMASQ_MUD_URL", &err);
}
if (is6)
buf = grab_extradata(buf, end, "DNSMASQ_RELAY_ADDRESS", &err);
else
{
const char *giaddr = NULL;