1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-08 05:31:31 +00:00

Move init_socket from nmap.cc to scan_engine.cc, because it is only used

in the latter file.
This commit is contained in:
david
2010-08-11 14:34:54 +00:00
parent 6bce039909
commit c78dcce4d3
3 changed files with 29 additions and 33 deletions

30
nmap.cc
View File

@@ -2088,36 +2088,6 @@ int gather_logfile_resumption_state(char *fname, int *myargc, char ***myargv) {
return 0;
}
/* We set the socket lingering so we will RST connection instead of wasting
bandwidth with the four step close */
void init_socket(int sd) {
struct linger l;
int res;
static int bind_failed=0;
struct sockaddr_storage ss;
size_t sslen;
l.l_onoff = 1;
l.l_linger = 0;
if (setsockopt(sd, SOL_SOCKET, SO_LINGER, (const char *) &l, sizeof(struct linger)))
{
error("Problem setting socket SO_LINGER, errno: %d", socket_errno());
perror("setsockopt");
}
if (o.spoofsource && !bind_failed)
{
o.SourceSockAddr(&ss, &sslen);
res=bind(sd, (struct sockaddr*)&ss, sslen);
if (res<0)
{
error("%s: Problem binding source address (%s), errno: %d", __func__, inet_socktop(&ss), socket_errno());
perror("bind");
bind_failed=1;
}
}
}
/* Convert a string like "-100,n*tp,200-1024,3000-4000,[60000-]" into an array

3
nmap.h
View File

@@ -425,9 +425,6 @@ void getpts_simple(const char *origexpr, int range_type,
unsigned short **list, int *count);
void free_scan_lists(struct scan_lists *ports);
/* socket manipulation functions */
void init_socket(int sd);
/* Renamed main so that interactive mode could preprocess when necessary */
int nmap_main(int argc, char *argv[]);

View File

@@ -2951,6 +2951,35 @@ static void ultrascan_port_probe_update(UltraScanInfo *USI, HostScanStats *hss,
/* We set the socket lingering so we will RST connection instead of wasting
bandwidth with the four step close */
static void init_socket(int sd) {
struct linger l;
int res;
static int bind_failed=0;
struct sockaddr_storage ss;
size_t sslen;
l.l_onoff = 1;
l.l_linger = 0;
if (setsockopt(sd, SOL_SOCKET, SO_LINGER, (const char *) &l, sizeof(struct linger)))
{
error("Problem setting socket SO_LINGER, errno: %d", socket_errno());
perror("setsockopt");
}
if (o.spoofsource && !bind_failed)
{
o.SourceSockAddr(&ss, &sslen);
res=bind(sd, (struct sockaddr*)&ss, sslen);
if (res<0)
{
error("%s: Problem binding source address (%s), errno: %d", __func__, inet_socktop(&ss), socket_errno());
perror("bind");
bind_failed=1;
}
}
}
/* If this is NOT a ping probe, set pingseq to 0. Otherwise it will be the
ping sequence number (they start at 1). The probe sent is returned. */