[Xorp-cvs] SF.net SVN: xorp:[11527] trunk/xorp/pim/xrl_pim_node.cc

[bms_fbsd at users.sourceforge.net]

Revision: 11527
          http://xorp.svn.sourceforge.net/xorp/?rev=11527&view=rev
Author:   bms_fbsd
Date:     2009-09-01 11:53:35 +0000 (Tue, 01 Sep 2009)

Log Message:
-----------
In PIM's XRL target handler for incoming MLD6IGMP RPC calls,
log the VIF name for add/delete membership operations.

Submitted by:	Ben Greear (with fixups)

Modified Paths:
--------------
    trunk/xorp/pim/xrl_pim_node.cc

Modified: trunk/xorp/pim/xrl_pim_node.cc
===================================================================
--- trunk/xorp/pim/xrl_pim_node.cc	2009-08-31 13:21:20 UTC (rev 11526)
+++ trunk/xorp/pim/xrl_pim_node.cc	2009-09-01 11:53:35 UTC (rev 11527)
@@ -3567,7 +3567,7 @@
 XrlPimNode::mld6igmp_client_0_1_add_membership4(
     // Input values, 
     const string&	, // xrl_sender_name, 
-    const string&	, // vif_name, 
+    const string&	vif_name,
     const uint32_t&	vif_index, 
     const IPv4&		source, 
     const IPv4&		group)
@@ -3585,8 +3585,12 @@
 
     if (PimNode::add_membership(vif_index, IPvX(source), IPvX(group))
 	!= XORP_OK) {
-	error_msg = c_format("Failed to add membership for (%s, %s)",
-			     cstring(source), cstring(group));
+	error_msg = c_format("Failed to add membership for (%s, %s)"
+			     "on vif %s: %s",
+			     cstring(source),
+			     cstring(group),
+			     vif_name.c_str(),
+			     error_msg.c_str());
 	return XrlCmdError::COMMAND_FAILED(error_msg);
     }
     
@@ -3597,7 +3601,7 @@
 XrlPimNode::mld6igmp_client_0_1_add_membership6(
     // Input values, 
     const string&	, // xrl_sender_name, 
-    const string&	, // vif_name, 
+    const string&	vif_name,
     const uint32_t&	vif_index, 
     const IPv6&		source, 
     const IPv6&		group)
@@ -3615,8 +3619,12 @@
 
     if (PimNode::add_membership(vif_index, IPvX(source), IPvX(group))
 	!= XORP_OK) {
-	error_msg = c_format("Failed to add membership for (%s, %s)",
-			     cstring(source), cstring(group));
+	error_msg = c_format("Failed to add membership for (%s, %s)"
+			     "on vif %s: %s",
+			     cstring(source),
+			     cstring(group),
+			     vif_name.c_str(),
+			     error_msg.c_str());
 	return XrlCmdError::COMMAND_FAILED(error_msg);
     }
     
@@ -3627,7 +3635,7 @@
 XrlPimNode::mld6igmp_client_0_1_delete_membership4(
     // Input values, 
     const string&	, // xrl_sender_name, 
-    const string&	, // vif_name, 
+    const string&	vif_name,
     const uint32_t&	vif_index, 
     const IPv4&		source, 
     const IPv4&		group)
@@ -3645,8 +3653,12 @@
 
     if (PimNode::delete_membership(vif_index, IPvX(source), IPvX(group))
 	!= XORP_OK) {
-	error_msg = c_format("Failed to delete membership for (%s, %s)",
-			     cstring(source), cstring(group));
+	error_msg = c_format("Failed to delete membership for (%s, %s)"
+			     "on vif %s: %s",
+			     cstring(source),
+			     cstring(group),
+			     vif_name.c_str(),
+			     error_msg.c_str());
 	return XrlCmdError::COMMAND_FAILED(error_msg);
     }
     
@@ -3658,7 +3670,7 @@
 XrlPimNode::mld6igmp_client_0_1_delete_membership6(
     // Input values, 
     const string&	, // xrl_sender_name, 
-    const string&	, // vif_name, 
+    const string&	vif_name,
     const uint32_t&	vif_index, 
     const IPv6&		source, 
     const IPv6&		group)
@@ -3676,8 +3688,12 @@
 
     if (PimNode::delete_membership(vif_index, IPvX(source), IPvX(group))
 	!= XORP_OK) {
-	error_msg = c_format("Failed to delete membership for (%s, %s)",
-			     cstring(source), cstring(group));
+	error_msg = c_format("Failed to delete membership for (%s, %s)"
+			     "on vif %s: %s",
+			     cstring(source),
+			     cstring(group),
+			     vif_name.c_str(),
+			     error_msg.c_str());
 	return XrlCmdError::COMMAND_FAILED(error_msg);
     }
     


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.