f518fa1c08
Add an "/FTL-settings" shared memory block
...
It currently contains the version of shared memory that FTL is exposing.
The current version of shared memory is 1. Whenever a change is made
to structures stored in shared memory, or the layout of shared memory,
the version should be incremented (like how the database version is
incremented when the database changes).
This version number will be used by the API to verify it is using the
same version of shared memory as FTL.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-01-19 10:57:36 -08:00
4d97dd8dd4
Merge pull request #463 from pi-hole/fix/arp_free
...
Always allocate also empty strings in getMACVendor()
2019-01-12 08:43:18 -08:00
84cdf61473
Always allocate strings to prevent subsequent free() to cause a failure of the process.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-12 15:10:33 +01:00
06259b0ae9
Merge pull request #455 from pi-hole/new/network-details
...
Process ARP data for new network table
2019-01-08 19:08:38 -08:00
787cf11300
Add generated aux files to .gitignore
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-08 21:07:32 +01:00
e3e21aa4fd
Merge pull request #457 from pi-hole/release/v4.2
...
Update development with release/v4.2
2019-01-08 17:50:30 +01:00
ce7e0f9f59
Merge pull request #456 from pi-hole/fix/no_REVERSE_on_gravity
...
Gravity domains should not have REVERSE set
2019-01-07 20:49:48 -08:00
b3269b3179
Blocked domains should not have the REVERSE flag set, i.e., they should never be the answer to reverse lookups to the IPs they are assigned to (0.0.0.0, RPi's IP address, ...)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 23:32:14 +01:00
054dfce203
Check for hostname != NULL is obsolete
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 19:22:49 +01:00
427f8ad8e1
Further review comments. Always allocate vendor so we can always free this pointer. Add a callback for the update subroutine.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 18:46:57 +01:00
486e497d8a
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 02:17:22 +01:00
9e6696575c
Change code to ensure hostname is always set
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 02:10:06 +01:00
d01d660bc5
Separate error messages into two if-statements
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 02:09:10 +01:00
078b2ff26d
Free memory when breaking
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 02:08:52 +01:00
0742d4c21a
Use simple cast of sqlite3_column_text() instead of using asprintf()
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 02:04:41 +01:00
0f6c52036f
Remove obsolete dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-07 01:57:49 +01:00
262fd8e440
Improve python aux script
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-06 20:36:20 +01:00
7714b8559f
Merge branch 'development' into new/network-details
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
Conflicts:
Makefile
routines.h
2019-01-06 20:18:29 +01:00
b07b12012a
Merge pull request #453 from pi-hole/new/capabilities_check
...
Add check for required Linux capabilities
2019-01-04 15:21:53 -05:00
3726fd7a33
Merge pull request #454 from pi-hole/tweak/shm_unlink_error_handling
...
SHM tweaks
2019-01-04 15:06:08 -05:00
0547a7e0fc
Add error reporting for shm_unlink(). Also, we move shm_unlink() into create_shm() to reduce code duplication.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-04 19:34:08 +01:00
f8db82cbd2
Move -m32 flag from CI config to docker container
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-01-03 15:35:45 -05:00
31df63488f
Fix arm library search path
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-01-03 15:16:15 -05:00
b0e5e17cd0
Use architecture-specific libcap-dev packages
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-01-03 12:25:40 -05:00
f6be502464
Merge pull request #452 from pi-hole/fix/new_NULL_memorysize
...
Bugfix for new, more efficient NULL blocking mode
2019-01-03 11:47:01 -05:00
ea6b4162ad
Add libcap-dev to Dockerfiles
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-03 10:31:48 +01:00
e4f9dbe030
Merge pull request #451 from pi-hole/tweak/debug_hooks_file_line
...
Show file:line in hook calls (debug mode only)
2019-01-02 15:04:44 -05:00
724ab54aa3
Just complain loudly instead of failing badly if capabilities are not available
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-02 18:07:05 +01:00
070feb630a
Add check for required Linux capabilities.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-02 17:56:12 +01:00
5a2d636120
Pass larger memory size to add_hosts_entry() if we create an entry that is valid for both, A and AAAA requests
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-01 15:49:36 +01:00
a3410a78f6
Add dnsmasq_interface.h as dependency of the dnsmasq objects. This forces a rebuild whenever interface definitions are changed.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-01 14:27:08 +01:00
9151a876dd
Always pass line of command execution from dnsmasq codebase to FTL hooks for debugging (no functional change)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-01 14:23:28 +01:00
8ad22b283d
Mac vendor database generator: Remove quotation marks as these might interfere with later INSERT / UPDATE commands
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-01-01 10:36:45 +01:00
01aeeada8a
Merge branch 'development' into new/network-details
2019-01-01 10:26:59 +01:00
3b244ec8b5
Merge pull request #450 from pi-hole/fix/shm-add-empty-string
...
Reuse the empty string at position 0 in string shared memory
2019-01-01 00:37:37 +01:00
9c8f0704c1
Reuse the empty string at position 0 in string shared memory
...
If an empty string is being added, reuse the one at position zero. This
makes sure all empty strings used elsewhere in shared memory have a
position of zero.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-12-31 17:44:14 -05:00
85e954f433
Optimize database after creation (reduces filesize by about 10%) + don't fail if there was no previous database present
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-31 11:48:05 +01:00
bd749f4a4c
Added python3 script to automatically generate the macvendor database used by FTL
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-31 10:34:00 +01:00
a2b7a241e2
Add routine to update all existing network table entries using the latest mac->vendor database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-31 00:18:50 +01:00
92d819899e
Add MAC->Vendor database support. We will provide the database as an optional auxiliary file.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-30 23:35:15 +01:00
f2f543c8d6
Do not count in findClient() if search is triggered from parse_arp_cache()
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-28 20:39:03 +01:00
62a4de63bb
Merge pull request #449 from pi-hole/fix/shm_lock_resolve
...
Fix: Deadlock situation in resolving subroutines
2018-12-28 09:49:39 -05:00
d8fdf76ceb
Store number of queries per client in the database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-28 12:18:35 +01:00
ac6ee9e1ef
Add config option to disable ARP cache parsing
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-26 11:29:28 +01:00
54253bd7d5
Added more comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-26 11:25:41 +01:00
3a8c87907a
Initialize new devices with lastQuery property if available
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-26 11:14:25 +01:00
465a4900ec
Use one big transaction for changes to be written to the network table and skip incomplete entires when parsing the ARP cache
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-26 01:21:31 +01:00
68a584ad8b
Reduce code duplication
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-26 01:21:00 +01:00
95d3c02c5f
Store lastQuery property for known clients
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-25 22:35:16 +01:00
82b43c332b
Parse ARP cache after storing queries into long-term database(usen the dedicated database thread)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-12-25 17:56:44 +01:00
Mcat12
Mark Drobnak
DL6ER
DL6ER