mirror of
https://github.com/nmap/nmap.git
synced 2025-12-06 12:41:29 +00:00
Avoid passing empty string to nsock_pool_set_device
Nsock checks for NULL, but not for empty string. Rather than making Nsock decide, each app will decide whether to call nsock_pool_set_device, with all currently skipping the call if device is an empty string.
This commit is contained in:
@@ -139,6 +139,7 @@ void FPNetworkControl::init(const char *ifname, devtype iftype) {
|
|||||||
nmap_set_nsock_logger();
|
nmap_set_nsock_logger();
|
||||||
nmap_adjust_loglevel(o.packetTrace());
|
nmap_adjust_loglevel(o.packetTrace());
|
||||||
|
|
||||||
|
if (*o.device)
|
||||||
nsock_pool_set_device(nsp, o.device);
|
nsock_pool_set_device(nsp, o.device);
|
||||||
|
|
||||||
if (o.proxy_chain)
|
if (o.proxy_chain)
|
||||||
|
|||||||
@@ -1381,6 +1381,7 @@ static void nmap_mass_dns_core(DNS::Request *requests, int num_requests) {
|
|||||||
nmap_set_nsock_logger();
|
nmap_set_nsock_logger();
|
||||||
nmap_adjust_loglevel(o.packetTrace());
|
nmap_adjust_loglevel(o.packetTrace());
|
||||||
|
|
||||||
|
if (*o.device)
|
||||||
nsock_pool_set_device(dnspool, o.device);
|
nsock_pool_set_device(dnspool, o.device);
|
||||||
|
|
||||||
if (o.proxy_chain)
|
if (o.proxy_chain)
|
||||||
|
|||||||
@@ -97,7 +97,9 @@ int ProbeMode::init_nsock(){
|
|||||||
/* Create a new nsock pool */
|
/* Create a new nsock pool */
|
||||||
if ((nsp = nsock_pool_new(NULL)) == NULL)
|
if ((nsp = nsock_pool_new(NULL)) == NULL)
|
||||||
nping_fatal(QT_3, "Failed to create new pool. QUITTING.\n");
|
nping_fatal(QT_3, "Failed to create new pool. QUITTING.\n");
|
||||||
nsock_pool_set_device(nsp, o.getDevice());
|
const char *device = o.getDevice();
|
||||||
|
if (*device)
|
||||||
|
nsock_pool_set_device(nsp, device);
|
||||||
|
|
||||||
/* Allow broadcast addresses */
|
/* Allow broadcast addresses */
|
||||||
nsock_pool_set_broadcast(nsp, 1);
|
nsock_pool_set_broadcast(nsp, 1);
|
||||||
|
|||||||
@@ -86,6 +86,7 @@ static nsock_pool new_pool (lua_State *L)
|
|||||||
nmap_set_nsock_logger();
|
nmap_set_nsock_logger();
|
||||||
nmap_adjust_loglevel(o.scriptTrace());
|
nmap_adjust_loglevel(o.scriptTrace());
|
||||||
|
|
||||||
|
if (*o.device)
|
||||||
nsock_pool_set_device(nsp, o.device);
|
nsock_pool_set_device(nsp, o.device);
|
||||||
|
|
||||||
if (o.proxy_chain)
|
if (o.proxy_chain)
|
||||||
|
|||||||
@@ -2817,6 +2817,7 @@ int service_scan(std::vector<Target *> &Targets) {
|
|||||||
nmap_set_nsock_logger();
|
nmap_set_nsock_logger();
|
||||||
nmap_adjust_loglevel(o.versionTrace());
|
nmap_adjust_loglevel(o.versionTrace());
|
||||||
|
|
||||||
|
if (*o.device)
|
||||||
nsock_pool_set_device(nsp, o.device);
|
nsock_pool_set_device(nsp, o.device);
|
||||||
|
|
||||||
if (o.proxy_chain) {
|
if (o.proxy_chain) {
|
||||||
|
|||||||
Reference in New Issue
Block a user