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

fix -O0 compilation without INET6.

Browse Source 
Pointed out by:	ru
This commit is contained in:
Hajimu UMEMOTO 2004-03-01 19:10:31 +00:00
parent 949112b2e5
commit 04d3a45241
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126456
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netinet/tcp_input.c
View File

@ -459,6 +459,7 @@ tcp_input(m, off0)
tcpstat.tcps_rcvtotal++;
if (isipv6) {
#ifdef INET6
/* IP6_EXTHDR_CHECK() is already done at tcp6_input() */
ip6 = mtod(m, struct ip6_hdr *);
tlen = sizeof(*ip6) + ntohs(ip6->ip6_plen) - off0;
@ -480,6 +481,9 @@ tcp_input(m, off0)
/* XXX stat */
goto drop;
}
#else
th = NULL; /* XXX: avoid compiler warning */
#endif
} else {
/*
* Get IP and TCP header together in first mbuf.
@ -546,9 +550,11 @@ tcp_input(m, off0)
tlen -= off; /* tlen is used instead of ti->ti_len */
if (off > sizeof (struct tcphdr)) {
if (isipv6) {
#ifdef INET6
IP6_EXTHDR_CHECK(m, off0, off, );
ip6 = mtod(m, struct ip6_hdr *);
th = (struct tcphdr *)((caddr_t)ip6 + off0);
#endif
} else {
if (m->m_len < sizeof(struct ip) + off) {
if ((m = m_pullup(m, sizeof (struct ip) + off))
@ -624,12 +630,14 @@ tcp_input(m, off0)
1, m->m_pkthdr.rcvif);
}
} else {
if (isipv6)
if (isipv6) {
#ifdef INET6
inp = in6_pcblookup_hash(&tcbinfo,
&ip6->ip6_src, th->th_sport,
&ip6->ip6_dst, th->th_dport,
1, m->m_pkthdr.rcvif);
else
#endif
} else
inp = in_pcblookup_hash(&tcbinfo,
ip->ip_src, th->th_sport,
ip->ip_dst, th->th_dport,
@ -667,12 +675,14 @@ tcp_input(m, off0)
#endif
if (isipv6) {
#ifdef INET6
strcpy(dbuf, "[");
strcpy(sbuf, "[");
strcat(dbuf, ip6_sprintf(&ip6->ip6_dst));
strcat(sbuf, ip6_sprintf(&ip6->ip6_src));
strcat(dbuf, "]");
strcat(sbuf, "]");
#endif
} else {
strcpy(dbuf, inet_ntoa(ip->ip_dst));
strcpy(sbuf, inet_ntoa(ip->ip_src));

14
sys/netinet/tcp_reass.c
View File

@ -459,6 +459,7 @@ tcp_input(m, off0)
tcpstat.tcps_rcvtotal++;
if (isipv6) {
#ifdef INET6
/* IP6_EXTHDR_CHECK() is already done at tcp6_input() */
ip6 = mtod(m, struct ip6_hdr *);
tlen = sizeof(*ip6) + ntohs(ip6->ip6_plen) - off0;
@ -480,6 +481,9 @@ tcp_input(m, off0)
/* XXX stat */
goto drop;
}
#else
th = NULL; /* XXX: avoid compiler warning */
#endif
} else {
/*
* Get IP and TCP header together in first mbuf.
@ -546,9 +550,11 @@ tcp_input(m, off0)
tlen -= off; /* tlen is used instead of ti->ti_len */
if (off > sizeof (struct tcphdr)) {
if (isipv6) {
#ifdef INET6
IP6_EXTHDR_CHECK(m, off0, off, );
ip6 = mtod(m, struct ip6_hdr *);
th = (struct tcphdr *)((caddr_t)ip6 + off0);
#endif
} else {
if (m->m_len < sizeof(struct ip) + off) {
if ((m = m_pullup(m, sizeof (struct ip) + off))
@ -624,12 +630,14 @@ tcp_input(m, off0)
1, m->m_pkthdr.rcvif);
}
} else {
if (isipv6)
if (isipv6) {
#ifdef INET6
inp = in6_pcblookup_hash(&tcbinfo,
&ip6->ip6_src, th->th_sport,
&ip6->ip6_dst, th->th_dport,
1, m->m_pkthdr.rcvif);
else
#endif
} else
inp = in_pcblookup_hash(&tcbinfo,
ip->ip_src, th->th_sport,
ip->ip_dst, th->th_dport,
@ -667,12 +675,14 @@ tcp_input(m, off0)
#endif
if (isipv6) {
#ifdef INET6
strcpy(dbuf, "[");
strcpy(sbuf, "[");
strcat(dbuf, ip6_sprintf(&ip6->ip6_dst));
strcat(sbuf, ip6_sprintf(&ip6->ip6_src));
strcat(dbuf, "]");
strcat(sbuf, "]");
#endif
} else {
strcpy(dbuf, inet_ntoa(ip->ip_dst));
strcpy(sbuf, inet_ntoa(ip->ip_src));