Clean up some #endif comments removing from short sections. Add #endif
comments to longer, also refining strange ones. Properly use #ifdef rather than #if defined() where possible. Four #if defined(PCBGROUP) occurances (netinet and netinet6) were ignored to avoid conflicts with eventually upcoming changes for RSS. Reported by: bde (most) Reviewed by: bde MFC after: 3 days
This commit is contained in:
Bjoern A. Zeeb
parent
c2b396f294
commit
83e521ec73
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=230442
@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <netinet/in_var.h>
|
||||
#include <net/if_llatbl.h>
|
||||
#include <netinet/if_ether.h>
|
||||
#if defined(INET)
|
||||
#ifdef INET
|
||||
#include <netinet/ip_carp.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -196,7 +196,7 @@ SYSCTL_VNET_INT(_net_inet_ip_portrange, OID_AUTO, randomtime, CTLFLAG_RW,
|
||||
&VNET_NAME(ipport_randomtime), 0,
|
||||
"Minimum time to keep sequental port "
|
||||
"allocation before switching to a random one");
|
||||
#endif
|
||||
#endif /* INET */
|
||||
|
||||
/*
|
||||
* in_pcb.c: manage the Protocol Control Blocks.
|
||||
@ -1038,7 +1038,7 @@ in_pcbdisconnect(struct inpcb *inp)
|
||||
inp->inp_fport = 0;
|
||||
in_pcbrehash(inp);
|
||||
}
|
||||
#endif
|
||||
#endif /* INET */
|
||||
|
||||
/*
|
||||
* in_pcbdetach() is responsibe for disassociating a socket from an inpcb.
|
||||
@ -1169,7 +1169,7 @@ in_pcbfree(struct inpcb *inp)
|
||||
#ifdef IPSEC
|
||||
if (inp->inp_sp != NULL)
|
||||
ipsec_delete_pcbpolicy(inp);
|
||||
#endif /* IPSEC */
|
||||
#endif
|
||||
inp->inp_gencnt = ++pcbinfo->ipi_gencnt;
|
||||
in_pcbremlists(inp);
|
||||
#ifdef INET6
|
||||
@ -1586,7 +1586,7 @@ in_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
|
||||
if (inp->inp_vflag & INP_IPV6PROTO)
|
||||
local_wild_mapped = inp;
|
||||
else
|
||||
#endif /* INET6 */
|
||||
#endif
|
||||
if (injail)
|
||||
jail_wild = inp;
|
||||
else
|
||||
@ -1601,7 +1601,7 @@ in_pcblookup_group(struct inpcbinfo *pcbinfo, struct inpcbgroup *pcbgroup,
|
||||
#ifdef INET6
|
||||
if (inp == NULL)
|
||||
inp = local_wild_mapped;
|
||||
#endif /* defined(INET6) */
|
||||
#endif
|
||||
if (inp != NULL)
|
||||
goto found;
|
||||
} /* if (lookupflags & INPLOOKUP_WILDCARD) */
|
||||
@ -1731,7 +1731,7 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr,
|
||||
if (inp->inp_vflag & INP_IPV6PROTO)
|
||||
local_wild_mapped = inp;
|
||||
else
|
||||
#endif /* INET6 */
|
||||
#endif
|
||||
if (injail)
|
||||
jail_wild = inp;
|
||||
else
|
||||
@ -1747,7 +1747,7 @@ in_pcblookup_hash_locked(struct inpcbinfo *pcbinfo, struct in_addr faddr,
|
||||
#ifdef INET6
|
||||
if (local_wild_mapped != NULL)
|
||||
return (local_wild_mapped);
|
||||
#endif /* defined(INET6) */
|
||||
#endif
|
||||
} /* if ((lookupflags & INPLOOKUP_WILDCARD) != 0) */
|
||||
|
||||
return (NULL);
|
||||
@ -1871,7 +1871,7 @@ in_pcbinshash_internal(struct inpcb *inp, int do_pcbgroup_update)
|
||||
if (inp->inp_vflag & INP_IPV6)
|
||||
hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
|
||||
else
|
||||
#endif /* INET6 */
|
||||
#endif
|
||||
hashkey_faddr = inp->inp_faddr.s_addr;
|
||||
|
||||
pcbhash = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
|
||||
@ -1958,7 +1958,7 @@ in_pcbrehash_mbuf(struct inpcb *inp, struct mbuf *m)
|
||||
if (inp->inp_vflag & INP_IPV6)
|
||||
hashkey_faddr = inp->in6p_faddr.s6_addr32[3] /* XXX */;
|
||||
else
|
||||
#endif /* INET6 */
|
||||
#endif
|
||||
hashkey_faddr = inp->inp_faddr.s_addr;
|
||||
|
||||
head = &pcbinfo->ipi_hashbase[INP_PCBHASH(hashkey_faddr,
|
||||
@ -2226,14 +2226,13 @@ db_print_inconninfo(struct in_conninfo *inc, const char *name, int indent)
|
||||
/* IPv6. */
|
||||
ip6_sprintf(laddr_str, &inc->inc6_laddr);
|
||||
ip6_sprintf(faddr_str, &inc->inc6_faddr);
|
||||
} else {
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
/* IPv4. */
|
||||
inet_ntoa_r(inc->inc_laddr, laddr_str);
|
||||
inet_ntoa_r(inc->inc_faddr, faddr_str);
|
||||
#ifdef INET6
|
||||
}
|
||||
#endif
|
||||
db_print_indent(indent);
|
||||
db_printf("inc_laddr %s inc_lport %u\n", laddr_str,
|
||||
ntohs(inc->inc_lport));
|
||||
@ -2446,4 +2445,4 @@ DB_SHOW_COMMAND(inpcb, db_show_inpcb)
|
||||
|
||||
db_print_inpcb(inp, "inpcb", 0);
|
||||
}
|
||||
#endif
|
||||
#endif /* DDB */
|
||||
|
||||
@ -92,7 +92,7 @@ SYSCTL_VNET_INT(_net_inet_ipsec, OID_AUTO, filtertunnel,
|
||||
int
|
||||
ip_ipsec_filtertunnel(struct mbuf *m)
|
||||
{
|
||||
#if defined(IPSEC)
|
||||
#ifdef IPSEC
|
||||
|
||||
/*
|
||||
* Bypass packet filtering for packets previously handled by IPsec.
|
||||
|
||||
@ -103,7 +103,7 @@ SYSCTL_VNET_INT(_net_inet6_ipsec6, OID_AUTO,
|
||||
int
|
||||
ip6_ipsec_filtertunnel(struct mbuf *m)
|
||||
{
|
||||
#if defined(IPSEC)
|
||||
#ifdef IPSEC
|
||||
|
||||
/*
|
||||
* Bypass packet filtering for packets previously handled by IPsec.
|
||||
|
||||
@ -687,7 +687,7 @@ static struct ip6protosw ipe6_protosw = {
|
||||
};
|
||||
#endif /* INET6 && INET */
|
||||
|
||||
#if defined(INET)
|
||||
#ifdef INET
|
||||
/*
|
||||
* Check the encapsulated packet to see if we want it
|
||||
*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user