From: Sam Leffler <sam@ucbvax.Berkeley.EDU>
Date: Sun, 26 Dec 1982 13:19:47 +0000 (-0800)
Subject: port numbers now byte swapped
X-Git-Tag: BSD-4_1c_2-Snapshot-Development~1312
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/5eba30a373bdfd60a7e284da0cacf9f5cbe047fe

port numbers now byte swapped

SCCS-vsn: libexec/rshd/rshd.c 4.6
SCCS-vsn: usr.bin/telnet/telnet.c 4.14
SCCS-vsn: libexec/telnetd/telnetd.c 4.13
---

diff --git a/usr/src/libexec/rshd/rshd.c b/usr/src/libexec/rshd/rshd.c
index 1b7d24fdb3..9c207f8871 100644
--- a/usr/src/libexec/rshd/rshd.c
+++ b/usr/src/libexec/rshd/rshd.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)rshd.c	4.5 82/11/15";
+static char sccsid[] = "@(#)rshd.c	4.6 82/12/25";
 #endif
 
 #include <sys/ioctl.h>
@@ -58,7 +58,7 @@ main(argc, argv)
 	  }
 	}
 #endif
-	sin.sin_port = htons(sp->s_port);
+	sin.sin_port = sp->s_port;
 	argc--, argv++;
 	if (argc > 0 && !strcmp(argv[0], "-d")) {
 		int port = atoi(argv[0]);
@@ -67,7 +67,7 @@ main(argc, argv)
 			fprintf(stderr, "%s: bad port #\n", argv[0]);
 			exit(1);
 		}
-		sin.sin_port = htons(port);
+		sin.sin_port = htons((u_short)port);
 		argc--, argv++;
 	}
 	f = socket(AF_INET, SOCK_STREAM, 0, 0);
diff --git a/usr/src/libexec/telnetd/telnetd.c b/usr/src/libexec/telnetd/telnetd.c
index 192068ecc2..cf707df2bf 100644
--- a/usr/src/libexec/telnetd/telnetd.c
+++ b/usr/src/libexec/telnetd/telnetd.c
@@ -1,5 +1,5 @@
 #ifndef lint
-static char sccsid[] = "@(#)telnetd.c	4.12 82/11/17";
+static char sccsid[] = "@(#)telnetd.c	4.13 82/12/25";
 #endif
 
 /*
@@ -65,8 +65,8 @@ main(argc, argv)
 			fprintf(stderr, "telnetd: %s: bad port #\n", *argv);
 			exit(1);
 		}
+		sin.sin_port = htons((u_short)sin.sin_port);
 	}
-	sin.sin_port = htons((u_short)sin.sin_port);
 #ifndef DEBUG
 	if (fork())
 		exit(0);
diff --git a/usr/src/usr.bin/telnet/telnet.c b/usr/src/usr.bin/telnet/telnet.c
index 6e00730388..d99021c7e4 100644
--- a/usr/src/usr.bin/telnet/telnet.c
+++ b/usr/src/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-static char sccsid[] = "@(#)telnet.c	4.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)telnet.c	4.14 (Berkeley) %G%";
 /*
  * User telnet program.
  */
@@ -166,8 +166,8 @@ tn(argc, argv)
 			printf("%s: bad port number\n", argv[2]);
 			return;
 		}
+		sin.sin_port = htons(sin.sin_port);
 	}
-	sin.sin_port = htons(sin.sin_port);
 	net = socket(AF_INET, SOCK_STREAM, 0, 0);
 	if (net < 0) {
 		perror("telnet: socket");