From 0ffdd07894cd552860c54a5691ab075dfd012eaa Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 24 May 2019 16:14:44 +0000
Subject: [PATCH] Use long long for prevalidated (negative ok) ports and
 unsigned int for post-validated

---
 ncat/ncat_core.h |  2 +-
 ncat/ncat_main.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ncat/ncat_core.h b/ncat/ncat_core.h
index 3a53fb1a1..804ac9475 100644
--- a/ncat/ncat_core.h
+++ b/ncat/ncat_core.h
@@ -165,7 +165,7 @@ enum exec_mode {
 #define PROXYDNS_REMOTE 2
 
 struct options {
-    u32 portno;
+    unsigned int portno;
 
     int verbose;
     int debug;
diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
index a1107e911..7ebade8b1 100644
--- a/ncat/ncat_main.c
+++ b/ncat/ncat_main.c
@@ -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;