cleanup: move max port number to be a define in net.h

diff --git a/mtr.c b/mtr.c
index 83b57bcd4910500f018bc9d08c288ec9935dbb35..fd254baae9944c99e1ed41d63f20101893bf4496 100644 (file)
--- a/mtr.c
+++ b/mtr.c
@@ -597,13 +597,13 @@ void parse_arg (int argc, char **argv)
       break;
     case 'P':
       remoteport = strtoint_or_err(optarg, "invalid argument");
-      if (remoteport > 65535 || remoteport < 1) {
+      if (remoteport < 1 || MaxPort < remoteport) {
         error(EXIT_FAILURE, 0, "Illegal port number: %d", remoteport);
       }
       break;
     case 'L':
       localport = strtoint_or_err(optarg, "invalid argument");
-      if (localport > 65535 || localport < MinPort) {
+      if (localport < MinPort || MaxPort < localport) {
         error(EXIT_FAILURE, 0, "Illegal port number: %d", localport);
       }
       break;

diff --git a/net.h b/net.h
index 0350a4a7d317c1c5d063d80c0f0a6638bb704b25..e8daa9d4fe5f92803c07e3a378585818f6488e6e 100644 (file)
--- a/net.h
+++ b/net.h
@@ -86,6 +86,7 @@ void net_process_fds(fd_set *writefd);
 #define MinSequence 33000
 #define MaxSequence 65536
 #define MinPort 1024
+#define MaxPort 65535
 
 #define MAXPACKET 4470         /* largest test packet size */
 #define MINPACKET 28           /* 20 bytes IP header and 8 bytes ICMP or UDP */