summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Provos <provos@cvs.openbsd.org>1998-11-18 21:13:07 +0000
committerNiels Provos <provos@cvs.openbsd.org>1998-11-18 21:13:07 +0000
commit4d94ca676698fe26e37a9bd35df92258a1e91daf (patch)
tree8f6cf1b9997d307ccca2cc1d04d6e836fb9dab44
parent2136f0aa1045cd8378162c3617b5108eb03b6fd9 (diff)
64-bit clean up
-rw-r--r--sys/netinet/tcp_output.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index de8eed77369..b84d7e2879c 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_output.c,v 1.12 1998/11/17 19:23:02 provos Exp $ */
+/* $OpenBSD: tcp_output.c,v 1.13 1998/11/18 21:13:06 provos Exp $ */
/* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */
/*
@@ -440,7 +440,7 @@ send:
*/
if (!tp->sack_disable && ((flags & TH_ACK) == 0 ||
(tp->t_flags & TF_SACK_PERMIT))) {
- *((u_long *) (opt + optlen)) =
+ *((u_int32_t *) (opt + optlen)) =
htonl(TCPOPT_SACK_PERMIT_HDR);
optlen += 4;
}
@@ -486,13 +486,13 @@ send:
if (!tp->sack_disable && tp->t_state == TCPS_ESTABLISHED &&
(tp->t_flags & (TF_SACK_PERMIT|TF_NOOPT)) == TF_SACK_PERMIT &&
tp->rcv_numsacks) {
- u_long *lp = (u_long *) (opt + optlen);
- u_long *olp = lp++;
+ u_int32_t *lp = (u_int32_t *)(opt + optlen);
+ u_int32_t *olp = lp++;
int count = 0; /* actual number of SACKs inserted */
int maxsack = (MAX_TCPOPTLEN - (optlen + 4))/TCPOLEN_SACK;
maxsack = min(maxsack, TCP_MAX_SACK);
- for (i=0; (i < tp->rcv_numsacks && count < maxsack); i++) {
+ for (i = 0; (i < tp->rcv_numsacks && count < maxsack); i++) {
struct sackblk sack = tp->sackblks[i];
if (sack.start == 0 && sack.end == 0)
continue;