Sun Dec 11 23:56:10 2011 UTC ()
u_int -> uint


(christos)
diff -r1.28 -r1.29 src/sys/netinet/tcp.h
cvs diff -r1.28 -r1.29 src/sys/netinet/tcp.h (expand / switch to unified diff)

--- src/sys/netinet/tcp.h 2007/12/25 18:33:47 1.28
+++ src/sys/netinet/tcp.h 2011/12/11 23:56:10 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: tcp.h,v 1.28 2007/12/25 18:33:47 perry Exp $ */ 1/* $NetBSD: tcp.h,v 1.29 2011/12/11 23:56:10 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1986, 1993 4 * Copyright (c) 1982, 1986, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -28,59 +28,59 @@ @@ -28,59 +28,59 @@
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 * 30 *
31 * @(#)tcp.h 8.1 (Berkeley) 6/10/93 31 * @(#)tcp.h 8.1 (Berkeley) 6/10/93
32 */ 32 */
33 33
34#ifndef _NETINET_TCP_H_ 34#ifndef _NETINET_TCP_H_
35#define _NETINET_TCP_H_ 35#define _NETINET_TCP_H_
36 36
37#include <sys/featuretest.h> 37#include <sys/featuretest.h>
38 38
39#if defined(_NETBSD_SOURCE) 39#if defined(_NETBSD_SOURCE)
40 40
41typedef u_int32_t tcp_seq; 41typedef uint32_t tcp_seq;
42/* 42/*
43 * TCP header. 43 * TCP header.
44 * Per RFC 793, September, 1981. 44 * Per RFC 793, September, 1981.
45 * Updated by RFC 3168, September, 2001. 45 * Updated by RFC 3168, September, 2001.
46 */ 46 */
47struct tcphdr { 47struct tcphdr {
48 u_int16_t th_sport; /* source port */ 48 uint16_t th_sport; /* source port */
49 u_int16_t th_dport; /* destination port */ 49 uint16_t th_dport; /* destination port */
50 tcp_seq th_seq; /* sequence number */ 50 tcp_seq th_seq; /* sequence number */
51 tcp_seq th_ack; /* acknowledgement number */ 51 tcp_seq th_ack; /* acknowledgement number */
52#if BYTE_ORDER == LITTLE_ENDIAN 52#if BYTE_ORDER == LITTLE_ENDIAN
53 /*LINTED non-portable bitfields*/ 53 /*LINTED non-portable bitfields*/
54 u_int8_t th_x2:4, /* (unused) */ 54 uint8_t th_x2:4, /* (unused) */
55 th_off:4; /* data offset */ 55 th_off:4; /* data offset */
56#endif 56#endif
57#if BYTE_ORDER == BIG_ENDIAN 57#if BYTE_ORDER == BIG_ENDIAN
58 /*LINTED non-portable bitfields*/ 58 /*LINTED non-portable bitfields*/
59 u_int8_t th_off:4, /* data offset */ 59 uint8_t th_off:4, /* data offset */
60 th_x2:4; /* (unused) */ 60 th_x2:4; /* (unused) */
61#endif 61#endif
62 u_int8_t th_flags; 62 uint8_t th_flags;
63#define TH_FIN 0x01 63#define TH_FIN 0x01
64#define TH_SYN 0x02 64#define TH_SYN 0x02
65#define TH_RST 0x04 65#define TH_RST 0x04
66#define TH_PUSH 0x08 66#define TH_PUSH 0x08
67#define TH_ACK 0x10 67#define TH_ACK 0x10
68#define TH_URG 0x20 68#define TH_URG 0x20
69#define TH_ECE 0x40 69#define TH_ECE 0x40
70#define TH_CWR 0x80 70#define TH_CWR 0x80
71 u_int16_t th_win; /* window */ 71 uint16_t th_win; /* window */
72 u_int16_t th_sum; /* checksum */ 72 uint16_t th_sum; /* checksum */
73 u_int16_t th_urp; /* urgent pointer */ 73 uint16_t th_urp; /* urgent pointer */
74} __packed; 74} __packed;
75 75
76#define TCPOPT_EOL 0 76#define TCPOPT_EOL 0
77#define TCPOPT_NOP 1 77#define TCPOPT_NOP 1
78#define TCPOPT_MAXSEG 2 78#define TCPOPT_MAXSEG 2
79#define TCPOLEN_MAXSEG 4 79#define TCPOLEN_MAXSEG 4
80#define TCPOPT_WINDOW 3 80#define TCPOPT_WINDOW 3
81#define TCPOLEN_WINDOW 3 81#define TCPOLEN_WINDOW 3
82#define TCPOPT_SACK_PERMITTED 4 /* Experimental */ 82#define TCPOPT_SACK_PERMITTED 4 /* Experimental */
83#define TCPOLEN_SACK_PERMITTED 2 83#define TCPOLEN_SACK_PERMITTED 2
84#define TCPOPT_SACK 5 /* Experimental */ 84#define TCPOPT_SACK 5 /* Experimental */
85#define TCPOPT_TIMESTAMP 8 85#define TCPOPT_TIMESTAMP 8
86#define TCPOLEN_TIMESTAMP 10 86#define TCPOLEN_TIMESTAMP 10