Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move struct tcpiphdr from tcpip.h to tcp_var.h, to match UDP (udpiphdr in 

udp_var.h).

tcpip.h is now empty, and can be removed.
This commit is contained in:
maxv 2018-04-29 12:12:42 +00:00
parent c16ac9a2d9
commit 24e9c1c9d0
2 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/netinet/tcp_var.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_var.h,v 1.185 2018/03/28 14:22:16 maxv Exp $ */
/* $NetBSD: tcp_var.h,v 1.186 2018/04/29 12:12:42 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -142,7 +142,7 @@
#endif
/*
* Kernel variables for tcp.
* TCP kernel structures and variables.
*/
#include <sys/callout.h>
@ -162,6 +162,29 @@
#define TCP_SIG_SPI 0x1000
#endif /* TCP_SIGNATURE */
/*
* Tcp+ip header, after ip options removed.
*/
struct tcpiphdr {
struct ipovly ti_i; /* overlaid ip structure */
struct tcphdr ti_t; /* tcp header */
} __packed;
#define ti_x1 ti_i.ih_x1
#define ti_pr ti_i.ih_pr
#define ti_len ti_i.ih_len
#define ti_src ti_i.ih_src
#define ti_dst ti_i.ih_dst
#define ti_sport ti_t.th_sport
#define ti_dport ti_t.th_dport
#define ti_seq ti_t.th_seq
#define ti_ack ti_t.th_ack
#define ti_x2 ti_t.th_x2
#define ti_off ti_t.th_off
#define ti_flags ti_t.th_flags
#define ti_win ti_t.th_win
#define ti_sum ti_t.th_sum
#define ti_urp ti_t.th_urp
/*
* SACK option block.
*/

24
sys/netinet/tcpip.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcpip.h,v 1.11 2007/12/25 18:33:47 perry Exp $ */
/* $NetBSD: tcpip.h,v 1.12 2018/04/29 12:12:42 maxv Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@ -34,27 +34,5 @@
#ifndef _NETINET_TCPIP_H_
#define _NETINET_TCPIP_H_
/*
* Tcp+ip header, after ip options removed.
*/
struct tcpiphdr {
struct ipovly ti_i; /* overlaid ip structure */
struct tcphdr ti_t; /* tcp header */
} __packed;
#define ti_x1 ti_i.ih_x1
#define ti_pr ti_i.ih_pr
#define ti_len ti_i.ih_len
#define ti_src ti_i.ih_src
#define ti_dst ti_i.ih_dst
#define ti_sport ti_t.th_sport
#define ti_dport ti_t.th_dport
#define ti_seq ti_t.th_seq
#define ti_ack ti_t.th_ack
#define ti_x2 ti_t.th_x2
#define ti_off ti_t.th_off
#define ti_flags ti_t.th_flags
#define ti_win ti_t.th_win
#define ti_sum ti_t.th_sum
#define ti_urp ti_t.th_urp
#endif /* !_NETINET_TCPIP_H_ */