PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-20 13:19:01 +00:00
Code Issues Projects Releases Wiki Activity

Use long long for prevalidated (negative ok) ports and unsigned int for post-validated

Browse Source
This commit is contained in:
dmiller
2019-05-24 16:14:44 +00:00
parent 168cbfde8e
commit 0ffdd07894
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ncat/ncat_core.h
View File

@@ -165,7 +165,7 @@ enum exec_mode {
#define PROXYDNS_REMOTE 2
struct options {
u32 portno;
unsigned int portno;
int verbose;
int debug;

16
ncat/ncat_main.c
View File

@@ -288,8 +288,8 @@ int main(int argc, char *argv[])
unsigned short proxyport;
/* vsock ports are 32 bits, so port variables must be at least that wide. */
u32 max_port = 65535;
s64 srcport = -1;
unsigned int max_port = 65535;
long long int srcport = -1;
char *source = NULL;
struct option long_options[] = {
@@ -457,7 +457,7 @@ int main(int argc, char *argv[])
errno = 0;
srcport = strtoul(optarg, NULL, 10);
if (errno != 0 || srcport < 0)
bye("Invalid source port %ld.", srcport);
bye("Invalid source port %lld.", srcport);
break;
case 'i':
o.idletimeout = parse_timespec(optarg, "-i timeout");
@@ -713,7 +713,7 @@ int main(int argc, char *argv[])
#endif
if (srcport > max_port)
bye("Invalid source port %ld.", srcport);
bye("Invalid source port %lld.", srcport);
#ifndef HAVE_OPENSSL
if (o.ssl)
@@ -953,20 +953,20 @@ int main(int argc, char *argv[])
if (optind + 1 < argc || (o.listen && srcport != -1 && optind + 1 == argc)) {
loguser("Got more than one port specification:");
if (o.listen && srcport != -1)
loguser_noprefix(" %ld", srcport);
loguser_noprefix(" %lld", srcport);
for (; optind < argc; optind++)
loguser_noprefix(" %s", argv[optind]);
loguser_noprefix(". QUITTING.\n");
exit(2);
} else if (optind + 1 == argc) {
u64 long_port;
unsigned long long_port;
errno = 0;
long_port = strtoul(argv[optind], NULL, 10);
if (errno != 0 || long_port > max_port)
bye("Invalid port number \"%s\".", argv[optind]);
o.portno = (u32) long_port;
o.portno = (unsigned int) long_port;
}
if (o.proxytype && !o.listen)
@@ -1002,7 +1002,7 @@ int main(int argc, char *argv[])
if (o.listen) {
/* Treat "ncat -l -p <port>" the same as "ncat -l <port>" for nc
compatibility. */
o.portno = (u32) srcport;
o.portno = (unsigned int) srcport;
} else {
if (srcaddr.storage.ss_family == AF_UNSPEC) {
/* We have a source port but not an explicit source address;