: Save a level of indentation in icmp_reply_translation
PATCH 3/18 : Save a level of indentation in icmp_reply_translation
Trivial cleanup: Save a level of indentation inicmp_reply_translation.
# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2004/12/05 22:14:19+01:00 [email protected]
# [NETFILTER]: Save a level of indentation in icmp_reply_translation
#
# Signed-off-by: Patrick McHardy <[email protected]>
#
# net/ipv4/netfilter/ip_nat_core.c # 2004/12/05 22:14:16+01:00 [email protected] +23 -28 # [NETFILTER]: Save a level of indentation in icmp_reply_translation # # Signed-off-by: Patrick McHardy <[email protected]> # diff -Nru a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c --- a/net/ipv4/netfilter/ip_nat_core.c 2004-12-20 06:59:21 +01:00 +++ b/net/ipv4/netfilter/ip_nat_core.c 2004-12-20 06:59:21 +01:00 @@ -915,35 +915,30 @@ if (info->manips[i].direction != dir) continue;
- /* Mapping the inner packet is just like a normal
- packet, except it was never src/dst reversed, so
- where we would normally apply a dst manip, we apply
- a src, and vice versa. */
- if (info->manips[i].hooknum == hooknum) {
- DEBUGP("icmp_reply: inner %s -> %u.%u.%u.%u %u\n",
- info->manips[i].maniptype == IP_NAT_MANIP_SRC
- ? "DST" : "SRC",
- NIPQUAD(info->manips[i].manip.ip),
- ntohs(info->manips[i].manip.u.udp.port));
- manip_pkt(inner->protocol, inner,
- skb->len - ((void *)inner - (void *)iph),
- &info->manips[i].manip,
- !info->manips[i].maniptype,
- &skb->nfcache);- /* Outer packet needs to have IP header NATed like
- it's a reply. */
+ /* Mapping the inner packet is just like a normal packet, except
+ * it was never src/dst reversed, so where we would normally
+ * apply a dst manip, we apply a src, and vice versa. */
+ if (info->manips[i].hooknum != hooknum)
+ continue;
- /* Use mapping to map outer packet: 0 give no
- per-proto mapping */
- DEBUGP("icmp_reply: outer %s -> %u.%u.%u.%u\n",
- info->manips[i].maniptype == IP_NAT_MANIP_SRC
- ? "SRC" : "DST",
- NIPQUAD(info->manips[i].manip.ip));
- manip_pkt(0, iph, skb->len,
- &info->manips[i].manip,
- info->manips[i].maniptype,
- &skb->nfcache);
- }
+ DEBUGP("icmp_reply: inner %s -> %u.%u.%u.%u %u\n",
+ info->manips[i].maniptype == IP_NAT_MANIP_SRC
+ ? "DST" : "SRC", NIPQUAD(info->manips[i].manip.ip),
+ ntohs(info->manips[i].manip.u.udp.port));
+ manip_pkt(inner->protocol, inner,
+ skb->len - ((void *)inner - (void *)iph),
+ &info->manips[i].manip, !info->manips[i].maniptype,
+ &skb->nfcache);+ /* Outer packet needs to have IP header NATed like
+ it's a reply. */
+
+ /* Use mapping to map outer packet: 0 give no
+ per-proto mapping */
+ DEBUGP("icmp_reply: outer %s -> %u.%u.%u.%u\n",
+ info->manips[i].maniptype == IP_NAT_MANIP_SRC
+ ? "SRC" : "DST", NIPQUAD(info->manips[i].manip.ip));
+ manip_pkt(0, iph, skb->len, &info->manips[i].manip,
+ info->manips[i].maniptype, &skb->nfcache);
}
READ_UNLOCK(&ip_nat_lock);