Pi-Hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2025-12-24 21:35:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review comments

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-04-27 15:45:13 +02:00
parent b2e19ff469
commit 23c92d45de
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dnsmasq_interface.c
View File

@@ -1328,10 +1328,10 @@ static void block_single_domain_regex(const char *domain)
if(config.debug & DEBUG_QUERIES) logg("Added %s to cache", domain); if(config.debug & DEBUG_QUERIES) logg("Added %s to cache", domain);
} }
// Import a specified table form the gravity database and // Import a specified table from the gravity database and
// add the read domains to the cache using the currently // add the read domains to the cache using the currently
// selected blocking mode. This function is used to import // selected blocking mode. This function is used to import
// both, the blacklist as well as the gravity blocking domains // both the blacklist and the gravity blocking domains
static int FTL_table_import(const char *tablename, const unsigned char list, const unsigned int index, static int FTL_table_import(const char *tablename, const unsigned char list, const unsigned int index,
struct all_addr addr4, struct all_addr addr6, bool has_IPv4, bool has_IPv6, struct all_addr addr4, struct all_addr addr6, bool has_IPv4, bool has_IPv6,
int cache_size, struct crec **rhash, int hashsz) int cache_size, struct crec **rhash, int hashsz)

16
gravity.c
View File

@@ -50,18 +50,12 @@ static bool gravityDB_open(void)
return true; return true;
} }
// Close gravity database handle
static void gravityDB_close(void)
{
sqlite3_close(gravitydb);
}
// Prepare a SQLite3 statement which can be used by // Prepare a SQLite3 statement which can be used by
// gravityDB_getDomain() to get blocking domains from // gravityDB_getDomain() to get blocking domains from
// a table which is specified when calling this function // a table which is specified when calling this function
bool gravityDB_getTable(const unsigned char list) bool gravityDB_getTable(const unsigned char list)
{ {
// Open gravity database, fail is not possible // Open gravity database
// Note: This might fail when the database has // Note: This might fail when the database has
// not yet been created by gravity // not yet been created by gravity
if(!gravityDB_open()) if(!gravityDB_open())
@@ -125,8 +119,7 @@ inline const char* gravityDB_getDomain(void)
if(rc != SQLITE_DONE) if(rc != SQLITE_DONE)
{ {
logg("gravityDB_getDomain() - SQL error step (%i): %s", rc, sqlite3_errmsg(gravitydb)); logg("gravityDB_getDomain() - SQL error step (%i): %s", rc, sqlite3_errmsg(gravitydb));
sqlite3_finalize(stmt); gravityDB_finalizeTable();
sqlite3_close(gravitydb);
return NULL; return NULL;
} }
@@ -142,7 +135,7 @@ void gravityDB_finalizeTable(void)
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
// Close database handle // Close database handle
gravityDB_close(); sqlite3_close(gravitydb);
} }
// Get number of domains in a specified table of the gravity database // Get number of domains in a specified table of the gravity database
@@ -197,8 +190,7 @@ int gravityDB_count(const unsigned char list)
const int result = sqlite3_column_int(stmt, 0); const int result = sqlite3_column_int(stmt, 0);
// Finalize statement and close database handle // Finalize statement and close database handle
sqlite3_finalize(stmt); gravityDB_finalizeTable();
gravityDB_close();
return result; return result;
} }