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

Remove duplicate function getDatabaseHostname()

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-08-31 20:35:46 +02:00
parent 693aa46319
commit 9bdfee2e19
3 changed files with 22 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/network-table.c
-76
View File
@@ -1581,82 +1581,6 @@ void updateMACVendorRecords(void)
dbclose();
}
char *__attribute__((malloc)) getDatabaseHostname(const char *ipaddr)
{
// Test if this is an IPv6 address
bool IPv6 = false;
if(ipaddr != NULL && strstr(ipaddr,":") != NULL)
{
IPv6 = true;
}
// Do we want to resolve IPv4/IPv6 names at all?
if( (IPv6 && !config.resolveIPv6) ||
(!IPv6 && !config.resolveIPv4))
{
if(config.debug & DEBUG_RESOLVER)
{
logg(" ---> \"\" (configured to not resolve %s host names)",
IPv6 ? "IPv6" : "IPv4");
}
return strdup("");
}
// Open pihole-FTL.db database file if needed
const bool db_already_open = FTL_DB_avail();
if(!db_already_open && !dbopen())
{
logg("getDatabaseHostname(\"%s\") - Failed to open DB", ipaddr);
return NULL;
}
// Prepare SQLite statement
sqlite3_stmt *stmt = NULL;
const char *querystr = "SELECT name FROM network_addresses "
"WHERE name IS NOT NULL AND ip = ?;";
int rc = sqlite3_prepare_v2(FTL_db, querystr, -1, &stmt, NULL);
if( rc != SQLITE_OK ){
logg("getDatabaseHostname(\"%s\") - SQL error prepare: %s",
ipaddr, sqlite3_errstr(rc));
if(!db_already_open)
dbclose();
return strdup("");
}
// Bind ipaddr to prepared statement
if((rc = sqlite3_bind_text(stmt, 1, ipaddr, -1, SQLITE_STATIC)) != SQLITE_OK)
{
logg("getDatabaseHostname(\"%s\"): Failed to bind ip: %s",
ipaddr, sqlite3_errstr(rc));
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(!db_already_open)
dbclose();
return strdup("");
}
char *hostname = NULL;
rc = sqlite3_step(stmt);
if(rc == SQLITE_ROW)
{
// Database record found (result might be empty)
hostname = strdup((char*)sqlite3_column_text(stmt, 0));
}
else
{
// Not found or error (will be logged automatically through our SQLite3 hook)
hostname = strdup("");
}
// Finalize statement and close database handle
sqlite3_reset(stmt);
sqlite3_finalize(stmt);
if(!db_already_open)
dbclose();
return hostname;
}
// Get hardware address of device identified by IP address
char *__attribute__((malloc)) getMACfromIP(const char *ipaddr)
{
src/database/network-table.h
+3 -4
View File
@@ -16,10 +16,9 @@ bool create_network_addresses_with_names_table(void);
void parse_neighbor_cache(void);
void updateMACVendorRecords(void);
bool unify_hwaddr(void);
char* getDatabaseHostname(const char* ipaddr) __attribute__((malloc));
char* __attribute__((malloc)) getMACfromIP(const char* ipaddr);
char* __attribute__((malloc)) getNameFromIP(const char* ipaddr);
char* __attribute__((malloc)) getIfaceFromIP(const char* ipaddr);
char *getMACfromIP(const char* ipaddr) __attribute__((malloc));
char *getNameFromIP(const char* ipaddr) __attribute__((malloc));
char *getIfaceFromIP(const char* ipaddr) __attribute__((malloc));
void resolveNetworkTableNames(void);
#endif //NETWORKTABLE_H
src/resolve.c
+19 -12
View File
@@ -134,17 +134,6 @@ char *resolveHostname(const char *addr)
IPv6 = true;
}
if( (IPv6 && !config.resolveIPv6) ||
(!IPv6 && !config.resolveIPv4))
{
if(config.debug & DEBUG_RESOLVER)
{
logg(" ---> \"\" (configured to not resolve %s host names)",
IPv6 ? "IPv6" : "IPv4");
}
return strdup("");
}
// Initialize resolver subroutines if trying to resolve for the first time
// res_init() reads resolv.conf to get the default domain name and name server
// address(es). If no server is given, the local host is tried. If no domain
@@ -285,6 +274,24 @@ static size_t resolveAndAddHostname(size_t ippos, size_t oldnamepos)
char* oldname = strdup(getstr(oldnamepos));
unlock_shm();
// Test if we want to resolve an IPv6 address
bool IPv6 = false;
if(strstr(ipaddr,":") != NULL)
{
IPv6 = true;
}
if( (IPv6 && !config.resolveIPv6) ||
(!IPv6 && !config.resolveIPv4))
{
if(config.debug & DEBUG_RESOLVER)
{
logg(" ---> \"\" (configured to not resolve %s host names)",
IPv6 ? "IPv6" : "IPv4");
}
return 0;
}
// Important: Don't hold a lock while resolving as the main thread
// (dnsmasq) needs to be operable during the call to resolveHostname()
char* newname = resolveHostname(ipaddr);
@@ -294,7 +301,7 @@ static size_t resolveAndAddHostname(size_t ippos, size_t oldnamepos)
if(strlen(newname) == 0 && config.names_from_netdb)
{
free(newname);
newname = getDatabaseHostname(ipaddr);
newname = getNameFromIP(ipaddr);
}
// Only store new newname if it is valid and differs from oldname