Move MAX_IPOPTLEN and struct ipoption back into ip_var.h as

userland programs depend on it.

Pointed out by:	le
Sponsored by:	TCP/IP Optimization Fundraise 2005
This commit is contained in:
Andre Oppermann 2005-11-19 14:01:32 +00:00
parent addbe0bc06
commit c444cdded2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=152608
2 changed files with 13 additions and 13 deletions

View File

@ -34,14 +34,6 @@
#ifndef _NETINET_IP_OPTIONS_H_
#define _NETINET_IP_OPTIONS_H_
/*
* Structure stored in mbuf in inpcb.ip_options
* and passed to ip_output when ip options are in use.
* The actual length of the options (including ipopt_dst)
* is in m_len.
*/
#define MAX_IPOPTLEN 40
struct ipoptrt {
struct in_addr dst; /* final destination */
char nop; /* one NOP to align */
@ -55,11 +47,6 @@ struct ipopt_tag {
struct ipoptrt ip_srcrt;
};
struct ipoption {
struct in_addr ipopt_dst; /* first-hop dst if source routed */
char ipopt_list[MAX_IPOPTLEN]; /* options proper */
};
extern int ip_doopts; /* process or ignore IP options */
int ip_dooptions(struct mbuf *, int);

View File

@ -65,6 +65,19 @@ struct ipq {
};
#endif /* _KERNEL */
/*
* Structure stored in mbuf in inpcb.ip_options
* and passed to ip_output when ip options are in use.
* The actual length of the options (including ipopt_dst)
* is in m_len.
*/
#define MAX_IPOPTLEN 40
struct ipoption {
struct in_addr ipopt_dst; /* first-hop dst if source routed */
char ipopt_list[MAX_IPOPTLEN]; /* options proper */
};
/*
* Structure attached to inpcb.ip_moptions and
* passed to ip_output when IP multicast options are in use.