Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[linux-2.6-block.git] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 77fc4d3fdf6129aa90ddf794c8fffa32ed56b548..14666449dc1c2f140da8b64162d2dcfa789d3a78 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1482,29 +1482,13 @@ dont_forward:
        return 0;
 }
 
-#ifdef CONFIG_IP_PIMSM_V1
-/*
- * Handle IGMP messages of PIMv1
- */
-
-int pim_rcv_v1(struct sk_buff * skb)
+#ifdef CONFIG_IP_PIMSM
+static int __pim_rcv(struct sk_buff *skb, unsigned int pimlen)
 {
-       struct igmphdr *pim;
-       struct iphdr   *encap;
-       struct net_device  *reg_dev = NULL;
-
-       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(*encap)))
-               goto drop;
+       struct net_device *reg_dev = NULL;
+       struct iphdr *encap;
 
-       pim = igmp_hdr(skb);
-
-       if (!mroute_do_pim ||
-           skb->len < sizeof(*pim) + sizeof(*encap) ||
-           pim->group != PIM_V1_VERSION || pim->code != PIM_V1_REGISTER)
-               goto drop;
-
-       encap = (struct iphdr *)(skb_transport_header(skb) +
-                                sizeof(struct igmphdr));
+       encap = (struct iphdr *)(skb_transport_header(skb) + pimlen);
        /*
           Check that:
           a. packet is really destinted to a multicast group
@@ -1513,8 +1497,8 @@ int pim_rcv_v1(struct sk_buff * skb)
         */
        if (!ipv4_is_multicast(encap->daddr) ||
            encap->tot_len == 0 ||
-           ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
-               goto drop;
+           ntohs(encap->tot_len) + pimlen > skb->len)
+               return 1;
 
        read_lock(&mrt_lock);
        if (reg_vif_num >= 0)
@@ -1524,7 +1508,7 @@ int pim_rcv_v1(struct sk_buff * skb)
        read_unlock(&mrt_lock);
 
        if (reg_dev == NULL)
-               goto drop;
+               return 1;
 
        skb->mac_header = skb->network_header;
        skb_pull(skb, (u8*)encap - skb->data);
@@ -1540,9 +1524,33 @@ int pim_rcv_v1(struct sk_buff * skb)
        nf_reset(skb);
        netif_rx(skb);
        dev_put(reg_dev);
+
        return 0;
- drop:
-       kfree_skb(skb);
+}
+#endif
+
+#ifdef CONFIG_IP_PIMSM_V1
+/*
+ * Handle IGMP messages of PIMv1
+ */
+
+int pim_rcv_v1(struct sk_buff * skb)
+{
+       struct igmphdr *pim;
+
+       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(struct iphdr)))
+               goto drop;
+
+       pim = igmp_hdr(skb);
+
+       if (!mroute_do_pim ||
+           pim->group != PIM_V1_VERSION || pim->code != PIM_V1_REGISTER)
+               goto drop;
+
+       if (__pim_rcv(skb, sizeof(*pim))) {
+drop:
+               kfree_skb(skb);
+       }
        return 0;
 }
 #endif
@@ -1551,10 +1559,8 @@ int pim_rcv_v1(struct sk_buff * skb)
 static int pim_rcv(struct sk_buff * skb)
 {
        struct pimreghdr *pim;
-       struct iphdr   *encap;
-       struct net_device  *reg_dev = NULL;
 
-       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(*encap)))
+       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(struct iphdr)))
                goto drop;
 
        pim = (struct pimreghdr *)skb_transport_header(skb);
@@ -1564,41 +1570,10 @@ static int pim_rcv(struct sk_buff * skb)
             csum_fold(skb_checksum(skb, 0, skb->len, 0))))
                goto drop;
 
-       /* check if the inner packet is destined to mcast group */
-       encap = (struct iphdr *)(skb_transport_header(skb) +
-                                sizeof(struct pimreghdr));
-       if (!ipv4_is_multicast(encap->daddr) ||
-           encap->tot_len == 0 ||
-           ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
-               goto drop;
-
-       read_lock(&mrt_lock);
-       if (reg_vif_num >= 0)
-               reg_dev = vif_table[reg_vif_num].dev;
-       if (reg_dev)
-               dev_hold(reg_dev);
-       read_unlock(&mrt_lock);
-
-       if (reg_dev == NULL)
-               goto drop;
-
-       skb->mac_header = skb->network_header;
-       skb_pull(skb, (u8*)encap - skb->data);
-       skb_reset_network_header(skb);
-       skb->dev = reg_dev;
-       skb->protocol = htons(ETH_P_IP);
-       skb->ip_summed = 0;
-       skb->pkt_type = PACKET_HOST;
-       dst_release(skb->dst);
-       reg_dev->stats.rx_bytes += skb->len;
-       reg_dev->stats.rx_packets++;
-       skb->dst = NULL;
-       nf_reset(skb);
-       netif_rx(skb);
-       dev_put(reg_dev);
-       return 0;
- drop:
-       kfree_skb(skb);
+       if (__pim_rcv(skb, sizeof(*pim))) {
+drop:
+               kfree_skb(skb);
+       }
        return 0;
 }
 #endif
@@ -1879,15 +1854,16 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
                const struct mfc_cache *mfc = v;
                const struct ipmr_mfc_iter *it = seq->private;
 
-               seq_printf(seq, "%08lX %08lX %-3d %8ld %8ld %8ld",
+               seq_printf(seq, "%08lX %08lX %-3hd",
                           (unsigned long) mfc->mfc_mcastgrp,
                           (unsigned long) mfc->mfc_origin,
-                          mfc->mfc_parent,
-                          mfc->mfc_un.res.pkt,
-                          mfc->mfc_un.res.bytes,
-                          mfc->mfc_un.res.wrong_if);
+                          mfc->mfc_parent);
 
                if (it->cache != &mfc_unres_queue) {
+                       seq_printf(seq, " %8lu %8lu %8lu",
+                                  mfc->mfc_un.res.pkt,
+                                  mfc->mfc_un.res.bytes,
+                                  mfc->mfc_un.res.wrong_if);
                        for (n = mfc->mfc_un.res.minvif;
                             n < mfc->mfc_un.res.maxvif; n++ ) {
                                if (VIF_EXISTS(n)
@@ -1896,6 +1872,11 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
                                           " %2d:%-3d",
                                           n, mfc->mfc_un.res.ttls[n]);
                        }
+               } else {
+                       /* unresolved mfc_caches don't contain
+                        * pkt, bytes and wrong_if values
+                        */
+                       seq_printf(seq, " %8lu %8lu %8lu", 0ul, 0ul, 0ul);
                }
                seq_putc(seq, '\n');
        }