d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't need to check if SO_OOBINLINE is defined.

Browse Source 
Don't need to protect isipv6 conditional with INET6.
Fix leading indentation in 2 lines.
This commit is contained in:
hsu 2002-10-30 08:32:19 +00:00
parent c839dff369
commit fa157d4b9a
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/netinet/tcp_input.c
View File

@ -525,8 +525,8 @@ tcp_input(m, off0)
/*
* Locate pcb for segment.
*/
INP_INFO_WLOCK(&tcbinfo);
headlocked = 1;
INP_INFO_WLOCK(&tcbinfo);
headlocked = 1;
findpcb:
/* IPFIREWALL_FORWARD section */
if (next_hop != NULL && isipv6 == 0) { /* IPv6 support is not yet */
@ -574,14 +574,11 @@ tcp_input(m, off0)
}
#endif
#ifdef FAST_IPSEC
#ifdef INET6
if (isipv6) {
if (inp != NULL && ipsec6_in_reject(m, inp)) {
goto drop;
}
} else
#endif /* INET6 */
if (inp != NULL && ipsec4_in_reject(m, inp)) {
} else if (inp != NULL && ipsec4_in_reject(m, inp)) {
goto drop;
}
#endif /*FAST_IPSEC*/
@ -2053,13 +2050,11 @@ tcp_input(m, off0)
* but if two URG's are pending at once, some out-of-band
* data may creep in... ick.
*/
if (th->th_urp <= (u_long)tlen
#ifdef SO_OOBINLINE
&& (so->so_options & SO_OOBINLINE) == 0
#endif
)
tcp_pulloutofband(so, th, m,
drop_hdrlen); /* hdr drop is delayed */
if (th->th_urp <= (u_long)tlen &&
!(so->so_options & SO_OOBINLINE)) {
/* hdr drop is delayed */
tcp_pulloutofband(so, th, m, drop_hdrlen);
}
} else {
/*
* If no out of band data is expected,

21
sys/netinet/tcp_reass.c
View File

@ -525,8 +525,8 @@ tcp_input(m, off0)
/*
* Locate pcb for segment.
*/
INP_INFO_WLOCK(&tcbinfo);
headlocked = 1;
INP_INFO_WLOCK(&tcbinfo);
headlocked = 1;
findpcb:
/* IPFIREWALL_FORWARD section */
if (next_hop != NULL && isipv6 == 0) { /* IPv6 support is not yet */
@ -574,14 +574,11 @@ tcp_input(m, off0)
}
#endif
#ifdef FAST_IPSEC
#ifdef INET6
if (isipv6) {
if (inp != NULL && ipsec6_in_reject(m, inp)) {
goto drop;
}
} else
#endif /* INET6 */
if (inp != NULL && ipsec4_in_reject(m, inp)) {
} else if (inp != NULL && ipsec4_in_reject(m, inp)) {
goto drop;
}
#endif /*FAST_IPSEC*/
@ -2053,13 +2050,11 @@ tcp_input(m, off0)
* but if two URG's are pending at once, some out-of-band
* data may creep in... ick.
*/
if (th->th_urp <= (u_long)tlen
#ifdef SO_OOBINLINE
&& (so->so_options & SO_OOBINLINE) == 0
#endif
)
tcp_pulloutofband(so, th, m,
drop_hdrlen); /* hdr drop is delayed */
if (th->th_urp <= (u_long)tlen &&
!(so->so_options & SO_OOBINLINE)) {
/* hdr drop is delayed */
tcp_pulloutofband(so, th, m, drop_hdrlen);
}
} else {
/*
* If no out of band data is expected,