pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v4.2' into update/devel_v4.2

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	database.c
	docker/arm/Dockerfile
This commit is contained in:
DL6ER
2019-01-24 10:17:25 +01:00
parent f057a37a9e ae1d09b065
commit 72d91e8288
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
database.c
+2
View File
@@ -780,6 +780,8 @@ void read_data_from_DB(void)
queries[queryIndex].complete = true; // Mark as all information is available
queries[queryIndex].response = 0;
queries[queryIndex].AD = false;
queries[queryIndex].dnssec = DNSSEC_UNKNOWN;
queries[queryIndex].reply = REPLY_UNKNOWN;
// Set lastQuery timer and add one query for network table
clients[clientID].lastQuery = queryTimeStamp;
dnsmasq_interface.c
+2 -2
View File
@@ -233,9 +233,9 @@ static int findQueryID(int id)
// Validate access only once for the maximum index (all lower will work)
validate_access("queries", counters->queries-1, false, __LINE__, __FUNCTION__, __FILE__);
int until = MAX(0, counters->queries-MAXITER);
int i;
int start = MAX(0, counters->queries-1);
// Check UUIDs of queries
for(i = counters->queries-1; i >= until; i--)
for(int i = start; i >= until; i--)
if(queries[i].id == id)
return i;
docker/arm/Dockerfile
+4 -18
View File
@@ -1,22 +1,8 @@
FROM debian:stretch
RUN dpkg --add-architecture armhf && \
RUN dpkg --add-architecture armel && \
apt-get update && \
apt-get install -y --no-install-recommends nettle-dev:armhf \
make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:armhf
apt-get install -y --no-install-recommends nettle-dev:armel gcc-arm-linux-gnueabi libc6-dev-armel-cross \
make file wget netcat-traditional sqlite3 git ca-certificates ssh libcap-dev:armel
# Use Raspbian's GCC
# This command was taken from https://github.com/dockcross/dockcross/blob/master/linux-armv6/Dockerfile
# Slightly modified from the original
RUN mkdir rpi_tools && cd rpi_tools && git init && git remote add origin https://github.com/raspberrypi/tools && \
git config core.sparseCheckout true && \
echo "arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64" >> .git/info/sparse-checkout && \
git pull --depth=1 origin master && \
cp -a arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/* /usr/ && rm -rf ../rpi_tools
RUN wget ftl.pi-hole.net/libraries/libgmp.a -O /usr/local/lib/libgmp.a && \
wget ftl.pi-hole.net/libraries/libnettle.a -O /usr/local/lib/libnettle.a && \
wget ftl.pi-hole.net/libraries/libhogweed.a -O /usr/local/lib/libhogweed.a
# Allow libnettle to be used, because this GCC doesn't have all the right header and library directories
ENV CC "arm-linux-gnueabihf-gcc -I/usr/include -I/usr/include/arm-linux-gnueabihf -L/usr/lib/arm-linux-gnueabihf"
ENV CC arm-linux-gnueabi-gcc