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.

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

Modularize FTL modules/headers #605

Merged
merged 45 commits into from Jul 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
7a100ae
Modularize header files
DL6ER Jun 29, 2019
602bd07
Only include smaller header files in the source code files. Remove ro…
DL6ER Jun 29, 2019
c212c26
Mover timer functions in separate C file
DL6ER Jun 29, 2019
b02c69f
Combine shmem.h and shmem_r.h
DL6ER Jul 1, 2019
ff12c1b
Add overTime.h header
DL6ER Jul 1, 2019
55ed61f
Move global variable declarations into the suitable header files as f…
DL6ER Jul 1, 2019
1d0dc1d
Ignore any database files that might be present in the repository.
DL6ER Jul 1, 2019
2115cdc
Move database modules into common subdirectory
DL6ER Jul 1, 2019
57116ae
Rename database/database.c => database/common.c
DL6ER Jul 1, 2019
4db159d
Move query table related routines into a new module database/query-ta…
DL6ER Jul 1, 2019
67e684b
Rename query reading/saving routines for consistency.
DL6ER Jul 1, 2019
b6d4e5e
Simplify get_number_of_queries_in_DB().
DL6ER Jul 1, 2019
49a009c
Rename database/{gravity.* => gravity-db.*}
DL6ER Jul 1, 2019
5eaf184
gravity.c has been renamed to gravity-db.c
DL6ER Jul 1, 2019
54547b9
Use local sqlite3.h
DL6ER Jul 1, 2019
4556b97
Readd version.h as explicit dependency in order to have it created on…
DL6ER Jul 1, 2019
5a41241
Remove dependency of api.c on the huge header database/sqlite3.h and …
DL6ER Jul 1, 2019
6b08566
Rename object dir for dnsmasq files in Makefile.
DL6ER Jul 1, 2019
0003124
Fix wrong standard filename for FTL\'s database.
DL6ER Jul 1, 2019
e365364
Move all source files into new subdirectory "src". Put compiled objec…
DL6ER Jul 1, 2019
a2961d1
Merge branch 'development' into new/modularize_headers
DL6ER Jul 4, 2019
6b2f22f
Move API modules (api, request, socket, msgpack) into their own subdi…
DL6ER Jul 4, 2019
104ea1b
Move database thread into dedicated module.
DL6ER Jul 4, 2019
ad27f6f
Merge branch 'development' into new/modularize_headers
DL6ER Jul 5, 2019
5699252
Make variables in Makefile more readable by inserting underscores.
DL6ER Jul 5, 2019
8280f45
Change type of get_FTL_db_filesize() from double to long int.
DL6ER Jul 5, 2019
ee671a1
Also enforce recompilation on change of headers in the subdirectories.
DL6ER Jul 5, 2019
29dd190
Move definition of config struct into src/config.h.
DL6ER Jul 5, 2019
40a75c2
Remove extra space.
DL6ER Jul 5, 2019
25161c1
Move blocking status detection from files.c to setupVars.c
DL6ER Jul 5, 2019
3ce04f0
Define timers in timers.h.
DL6ER Jul 5, 2019
a4e50c3
The macvendor script has moved into subdirectory tools.
DL6ER Jul 5, 2019
e13e39a
Union FTLFileNamesStruct and logFileNamesStruct and define them in co…
DL6ER Jul 5, 2019
9f127e9
Fix incorrect INSERT statement in gravity.db test data.
DL6ER Jul 5, 2019
8baf8e6
Improve error handling and logging in database/common.c
DL6ER Jul 6, 2019
799e3b4
Reduce three-fold logging of SQL errors to logging them only once. We…
DL6ER Jul 6, 2019
444255b
Do not assume the database is not available before we actually hit an…
DL6ER Jul 6, 2019
71d9caa
No need to use heap space for a constant expression.
DL6ER Jul 6, 2019
4a9503c
Move checking of database parameter MAXDBDAYS into db_init() to ensur…
DL6ER Jul 7, 2019
812743c
The boolean database should not be set to true at the end of delete_o…
DL6ER Jul 7, 2019
5c75fc3
Move even more definitions from FTL.h into the respective headers.
DL6ER Jul 7, 2019
e30df58
Remove obsolete comment.
DL6ER Jul 7, 2019
867e466
Added more comments to dnsmasq-interface.c. Now almost every line is …
DL6ER Jul 7, 2019
ac1018a
Merge pull request #610 from pi-hole/tweak/database_error_checking
AzureMarker Jul 7, 2019
b3ad13f
Simplify logic in detect_blocked_IP(), remove extra return statements…
DL6ER Jul 8, 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: 3 additions & 3 deletions .gitignore
Expand Up @@ -17,9 +17,9 @@ version*
# Test-generated files
/pihole.log
/pihole-FTL.conf
/pihole-FTL.db
/*.db
/pihole-FTL.log

# MAC->Vendor database files
DL6ER marked this conversation as resolved.
Show resolved Hide resolved
macvendor/manuf.data
macvendor/macvendor.db
tools/manuf.data
tools/macvendor.db
326 changes: 0 additions & 326 deletions FTL.h

This file was deleted.