mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
Another step assimilating IPv[46] PCB code:
normalize IN6P_* compat flags usage to their equialent INP_* counterpart. Discussed with: rwatson Reviewed by: rwatson MFC after: 4 weeks
This commit is contained in:
parent
dcdb4371ca
commit
97590249ad
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=186223
@ -441,7 +441,7 @@ void inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp,
|
||||
#define IN6P_RECVIF INP_RECVIF
|
||||
#define IN6P_MTUDISC INP_MTUDISC
|
||||
#define IN6P_FAITH INP_FAITH
|
||||
#define IN6P_CONTROLOPTS INP_CONTROLOPTS
|
||||
#define IN6P_CONTROLOPTS INP_CONTROLOPTS
|
||||
/*
|
||||
* socket AF version is {newer than,or include}
|
||||
* actual datagram AF version
|
||||
|
@ -1983,7 +1983,7 @@ icmp6_rip6_input(struct mbuf **mp, int off)
|
||||
}
|
||||
if (n != NULL ||
|
||||
(n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
|
||||
if (last->inp_flags & IN6P_CONTROLOPTS)
|
||||
if (last->inp_flags & INP_CONTROLOPTS)
|
||||
ip6_savecontrol(last, n, &opts);
|
||||
/* strip intermediate headers */
|
||||
m_adj(n, off);
|
||||
@ -2009,7 +2009,7 @@ icmp6_rip6_input(struct mbuf **mp, int off)
|
||||
}
|
||||
INP_INFO_RUNLOCK(&V_ripcbinfo);
|
||||
if (last != NULL) {
|
||||
if (last->inp_flags & IN6P_CONTROLOPTS)
|
||||
if (last->inp_flags & INP_CONTROLOPTS)
|
||||
ip6_savecontrol(last, m, &opts);
|
||||
/* strip intermediate headers */
|
||||
m_adj(m, off);
|
||||
|
@ -1558,7 +1558,7 @@ do { \
|
||||
break;
|
||||
|
||||
case IPV6_FAITH:
|
||||
OPTSET(IN6P_FAITH);
|
||||
OPTSET(INP_FAITH);
|
||||
break;
|
||||
|
||||
case IPV6_RECVPATHMTU:
|
||||
@ -1768,18 +1768,18 @@ do { \
|
||||
|
||||
switch (optval) {
|
||||
case IPV6_PORTRANGE_DEFAULT:
|
||||
in6p->inp_flags &= ~(IN6P_LOWPORT);
|
||||
in6p->inp_flags &= ~(IN6P_HIGHPORT);
|
||||
in6p->inp_flags &= ~(INP_LOWPORT);
|
||||
in6p->inp_flags &= ~(INP_HIGHPORT);
|
||||
break;
|
||||
|
||||
case IPV6_PORTRANGE_HIGH:
|
||||
in6p->inp_flags &= ~(IN6P_LOWPORT);
|
||||
in6p->inp_flags |= IN6P_HIGHPORT;
|
||||
in6p->inp_flags &= ~(INP_LOWPORT);
|
||||
in6p->inp_flags |= INP_HIGHPORT;
|
||||
break;
|
||||
|
||||
case IPV6_PORTRANGE_LOW:
|
||||
in6p->inp_flags &= ~(IN6P_HIGHPORT);
|
||||
in6p->inp_flags |= IN6P_LOWPORT;
|
||||
in6p->inp_flags &= ~(INP_HIGHPORT);
|
||||
in6p->inp_flags |= INP_LOWPORT;
|
||||
break;
|
||||
|
||||
default:
|
||||
@ -1881,7 +1881,7 @@ do { \
|
||||
break;
|
||||
|
||||
case IPV6_FAITH:
|
||||
optval = OPTBIT(IN6P_FAITH);
|
||||
optval = OPTBIT(INP_FAITH);
|
||||
break;
|
||||
|
||||
case IPV6_V6ONLY:
|
||||
@ -1892,9 +1892,9 @@ do { \
|
||||
{
|
||||
int flags;
|
||||
flags = in6p->inp_flags;
|
||||
if (flags & IN6P_HIGHPORT)
|
||||
if (flags & INP_HIGHPORT)
|
||||
optval = IPV6_PORTRANGE_HIGH;
|
||||
else if (flags & IN6P_LOWPORT)
|
||||
else if (flags & INP_LOWPORT)
|
||||
optval = IPV6_PORTRANGE_LOW;
|
||||
else
|
||||
optval = 0;
|
||||
|
@ -207,7 +207,7 @@ rip6_input(struct mbuf **mp, int *offp, int proto)
|
||||
} else
|
||||
#endif /* IPSEC */
|
||||
if (n) {
|
||||
if (last->inp_flags & IN6P_CONTROLOPTS ||
|
||||
if (last->inp_flags & INP_CONTROLOPTS ||
|
||||
last->inp_socket->so_options & SO_TIMESTAMP)
|
||||
ip6_savecontrol(last, n, &opts);
|
||||
/* strip intermediate headers */
|
||||
@ -241,7 +241,7 @@ rip6_input(struct mbuf **mp, int *offp, int proto)
|
||||
} else
|
||||
#endif /* IPSEC */
|
||||
if (last != NULL) {
|
||||
if (last->inp_flags & IN6P_CONTROLOPTS ||
|
||||
if (last->inp_flags & INP_CONTROLOPTS ||
|
||||
last->inp_socket->so_options & SO_TIMESTAMP)
|
||||
ip6_savecontrol(last, m, &opts);
|
||||
/* Strip intermediate headers. */
|
||||
|
@ -153,7 +153,7 @@ udp6_append(struct inpcb *inp, struct mbuf *n, int off,
|
||||
}
|
||||
#endif
|
||||
opts = NULL;
|
||||
if (inp->inp_flags & IN6P_CONTROLOPTS ||
|
||||
if (inp->inp_flags & INP_CONTROLOPTS ||
|
||||
inp->inp_socket->so_options & SO_TIMESTAMP)
|
||||
ip6_savecontrol(inp, n, &opts);
|
||||
m_adj(n, off + sizeof(struct udphdr));
|
||||
|
Loading…
Reference in New Issue
Block a user