Changeset 1587

Timestamp:

01/14/06 15:00:17 (3 years ago)

Author:

hsantos

Message:

mld: added statistics. one may check statistics via 'show interface <name> mld stats' or the global ones via 'show mld stats'

Files:

• mrd6/trunk/include/mrd/node.h (modified) (1 diff)
• mrd6/trunk/include/mrdpriv/mld/router.h (modified) (3 diffs)
• mrd6/trunk/include/mrdpriv/pim/interface.h (modified) (1 diff)
• mrd6/trunk/src/mld/mld_router.cpp (modified) (16 diffs)
• mrd6/trunk/src/mrd.cpp (modified) (1 diff)
• mrd6/trunk/src/node.cpp (modified) (1 diff)
• mrd6/trunk/src/parser.cpp (modified) (1 diff)
• mrd6/trunk/src/pim/pim_interface.cpp (modified) (1 diff)

mrd6/trunk/include/mrd/node.h

@@ -464 +464 @@
-};
-
+class statistics_node : public node {
+public:
+        typedef uint64_t counter_type;
+
+        statistics_node(node *parent, int count, const char **descriptions);
+        ~statistics_node();
+
+        bool check_startup();
+
+        /* calls check_startup and adds itself to parent */
+        bool setup();
+
+        counter_type &counter(int index) const;
+
+        bool output_info(base_stream &, const std::vector<std::string> &) const;
+
+private:
+        int m_count;
+        counter_type *m_counters;
+        const char **m_descriptions;
+};
+
-struct propval_integer : propval {
-        propval_integer(const int32_t *);

mrd6/trunk/include/mrdpriv/mld/router.h

@@ -134 +134 @@
-        bool send_mldv2_query(const in6_addr &);
-
+        void message_available(const in6_addr &, const in6_addr &, icmp6_hdr *, int);
-        void icmp_message_available(const in6_addr &, const in6_addr &, icmp6_hdr *, int);
-
-*
-*
-*
-*
+&
+&
+&
+&
-
-        void handle_mode_change_for_group(int ver, const inet6_addr &reqsrc,
@@ -161 +162 @@
-        intf_timer mif_query_timer_id, mif_other_querier_present_timer_id;
-
-
-
+
-
-        void address_added_or_removed(bool, const inet6_addr &);
-
-        void added_or_removed_address(bool, const inet6_addr &);
-};
-
@@ -303 +301 @@
-        bool call_method(int, base_stream &, const std::vector<std::string> &);
-
+        statistics_node &stats() { return m_stats; }
+
-private:
-        virtual mld_group *allocate_group();
+
+        statistics_node m_stats;
-};
-

mrd6/trunk/include/mrdpriv/pim/interface.h

@@ -170 +170 @@
-        void address_added_or_removed(bool, const inet6_addr &);
-
-        void added_or_removed_address(bool, const inet6_addr &);
-
-        friend class pim_neighbour;
-};

mrd6/trunk/src/mld/mld_router.cpp

@@ -57 +57 @@
-};
-
+enum {
+        SentQueryCount = 0,
+        FailedSendQueryCount,
+        ReceivedMembershipQueryCount,
+        ReceivedMembershipReductionCount,
+        ReceivedMembershipReportCount,
+        ReceivedMembershipReportV2Count,
+        BadMembershipReportV2Count,
+        MLDStatsCount
+};
+
+const char *stats_descriptions[] = {
+        "Sent Queries",
+        "Failed Sent Queries",
+        "Received Queries",
+        "Received Membership Reductions",
+        "Received Membership Reports",
+        "Received Membership Reports (V2)",
+        "Bad Membership Reports (V2)",
+};
+
-mld_interface::mld_interface()
-        : interface_node(mld),
@@ -62 +83 @@
-                std::mem_fun(&mld_interface::handle_send_query_timeout)),
-          mif_other_querier_present_timer_id("other mld querier present", this,
-
+
+
-
-        mif_isquerier = true;
@@ -101 +123 @@
-
-bool mld_interface::check_startup() {
+        if (!m_stats.setup())
+                return false;
-        return interface_node::check_startup();
-}
@@ -131 +155 @@
-
-void mld_interface::address_added_or_removed(bool added, const inet6_addr &addr) {
-        added_or_removed_address(added, addr);
-}
-
-void mld_interface::added_or_removed_address(bool added, const inet6_addr &addr) {
-        if (added) {
-                if (addr.is_linklocal()) {
@@ -205 +225 @@
-}
-
+void mld_interface::message_available(const in6_addr &from, const in6_addr &to,
+                                      icmp6_hdr *icmphdr, int len) {
+        loginfo(MESSAGE_SIG) << "Received a "
+                             << _mld_message_name(icmphdr->icmp6_type)
+                             << " from " << from << " to " << to << endl;
+
+        switch (icmphdr->icmp6_type) {
+        case ICMP6_MEMBERSHIP_REPORT:
+                handle_mldv1_membership_report(from, (mldv1 *)icmphdr);
+                break;
+        case ICMP6_MEMBERSHIP_REDUCTION:
+                handle_mldv1_membership_reduction(from, (mldv1 *)icmphdr);
+                break;
+        case ICMP6_MEMBERSHIP_QUERY:
+                handle_membership_query(from);
+                break;
+        case ICMP6_V2_MEMBERSHIP_REPORT:
+        case ICMP6_V2_MEMBERSHIP_REPORT_206:
+                handle_mldv2_membership_report(from, (mldv2_report *)icmphdr, len);
+                break;
+        }
+}
+
-void mld_interface::icmp_message_available(const in6_addr &from, const in6_addr &to,
-
+
+
+
+
+
-        if (conf()->has_property("proxy_to")) {
-                const char *newintfname = conf()->get_property_string("proxy_to");
@@ -222 +269 @@
-                                        fatal = false;
-                                } else {
-icmp_
+
-                                        return;
-                                }
@@ -236 +283 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
@@ -267 +294 @@
-        }
-
+        bool res;
+
-        if (mif_mld_version >= 2) {
-turn
+s =
-        } else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -304 +343 @@
-                }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -386 +431 @@
-}
-
-
-
+
+
+
+
+
-        if (!IN6_IS_ADDR_MULTICAST(&mldhdr->mcaddr)
-                || IN6_IS_ADDR_MC_NODELOCAL(&mldhdr->mcaddr)
@@ -393 +441 @@
-                return;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        mldv2_mrec *mrec = mldhdr->mrecs();
-        int clen = 0;
@@ -414 +466 @@
-        if (clen > len) {
-                loginfo(MESSAGE_ERR) << "dropped badly formed MLDv2 Membership"
-*
+
-                       << " > " << len << ")" << endl;
+
+                m_stats.counter(BadMembershipReportV2Count)++;
+                mld->stats().counter(BadMembershipReportV2Count)++;
-                return;
-        }
@@ -433 +488 @@
-                }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        if (!IN6_IS_ADDR_MULTICAST(&mldhdr->mcaddr)
-                || IN6_IS_ADDR_MC_NODELOCAL(&mldhdr->mcaddr)
@@ -444 +502 @@
-                return;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        // there should only be a MLD querier in a subnet network
-        // so, if we are currently a querier, let's check if we have priority
-        if (mif_isquerier) {
-*
+
-                        change_is_querier(false);
-
-*
+
-                        loginfo(NORMAL) << "No longer the MLD querier in this interface."
-
+       
-                }
-        } else {
-*
-*
+
+
-                        loginfo(NORMAL) << "Querier is now at " << mif_querier_addr << endl;
-                }
@@ -1082 +1143 @@
-
-mld_router::mld_router()
-
+
+
+
-        in6addr_linkscope_allnodes = inet6_addr("ff02::1").address();
-}
@@ -1094 +1157 @@
-
-bool mld_router::check_startup() {
+        if (!m_stats.setup())
+                return false;
+
-        if (!router::check_startup())
-                return false;

mrd6/trunk/src/mrd.cpp

@@ -1625 +1625 @@
-                                        accept && i != m_create_group_acl.end(); ++i) {
-                        accept = i->second->request_group(0, ctx->requester,
-
+  
-                }
-

mrd6/trunk/src/node.cpp

@@ -1127 +1127 @@
-}
-
+statistics_node::statistics_node(node *parent, int count,
+                                 const char **descriptions)
+        : node(parent, "stats"), m_count(count), m_descriptions(descriptions) {
+        m_counters = new counter_type[count];
+}
+
+statistics_node::~statistics_node() {
+        delete [] m_counters;
+        m_counters = 0;
+}
+
+bool statistics_node::check_startup() {
+        if (m_counters) {
+                for (int i = 0; i < m_count; i++) {
+                        m_counters[i] = 0;
+                }
+        } else {
+                return false;
+        }
+
+        return true;
+}
+
+bool statistics_node::setup() {
+        if (!check_startup())
+                return false;
+        return m_parent->add_child(this) == this;
+}
+
+statistics_node::counter_type &statistics_node::counter(int index) const {
+        return m_counters[index];
+}
+
+bool statistics_node::output_info(base_stream &out,
+                                  const std::vector<std::string> &args) const {
+        if (!args.empty())
+                return false;
+
+        for (int i = 0; i < m_count; i++) {
+                out << m_descriptions[i] << ": " << m_counters[i] << endl;
+        }
+
+        return true;
+}
+

mrd6/trunk/src/parser.cpp

@@ -256 +256 @@
-
-static inline bool is_token_char(char c) {
-
+ || c == '.'
-}
-

mrd6/trunk/src/pim/pim_interface.cpp

@@ -147 +147 @@
-
-void pim_interface::address_added_or_removed(bool added, const inet6_addr &addr) {
-        added_or_removed_address(added, addr);
-}
-
-void pim_interface::added_or_removed_address(bool added, const inet6_addr &addr) {
-        if (added) {
-                if (addr.is_linklocal()) {