[nes]: ETHERNET changes ...

ethernet/ethernetUtils.c

@@ -600,6 +600,19 @@ ieee8021BridgeBasePortTable_hierUpdate (
 	return bRetCode;
 }
 
+bool
+neIeee8021BridgeBasePortAdminFlags_update (
+	ieee8021BridgeBasePortEntry_t *poEntry, uint8_t *pu8AdminFlags)
+{
+	register bool bRetCode = false;
+
+	bRetCode = true;
+
+//neIeee8021BridgeBasePortAdminFlags_update_cleanup:
+
+	return bRetCode;
+}
+
 bool
 ieee8021BridgeBasePortDependentStatus_update (
 	ieee8021BridgeBaseEntry_t *poComponent,

ethernet/ethernetUtils.h

@@ -49,6 +49,9 @@ bool
 bool
 	ieee8021BridgeBaseRowStatus_update (
 		ieee8021BridgeBaseEntry_t *poEntry, uint8_t u8RowStatus);
+bool
+	neIeee8021BridgeBasePortAdminFlags_update (
+		ieee8021BridgeBasePortEntry_t *poEntry, uint8_t *pu8AdminFlags);
 bool
 	ieee8021BridgeXPortRowStatus_halUpdate (
 		ieee8021BridgeBaseEntry_t *poComponent,

ethernet/ieee8021BridgeMib.h

@@ -313,6 +313,7 @@ ieee8021BridgeBasePortEntry_t * ieee8021BridgeBasePortTable_getByIndex (
 ieee8021BridgeBasePortEntry_t * ieee8021BridgeBasePortTable_getNextIndex (
 	uint32_t u32ComponentId,
 	uint32_t u32Port);
+#define ieee8021BridgeBasePortTable_getByNeEntry(poEntry) ((poEntry) == NULL ? NULL: xGetParentByMemberPtr ((poEntry), ieee8021BridgeBasePortEntry_t, oNe))
 void ieee8021BridgeBasePortTable_removeEntry (ieee8021BridgeBasePortEntry_t *poEntry);
 bool ieee8021BridgeBasePortTable_allocateIndex (
 	ieee8021BridgeBaseEntry_t *poComponent,

ethernet/ieee8021QBridgeMib.c

@@ -4626,13 +4626,13 @@ ieee8021QBridgeVlanCurrentTable_removeHier (
 
 bool
 ieee8021QBridgeVlanCurrentTable_vlanHandler (
-	ieee8021BridgeBaseEntry_t *pComponent,
+	ieee8021BridgeBaseEntry_t *poComponent,
 	ieee8021QBridgeVlanCurrentEntry_t *poEntry,
 	uint8_t *pu8EnabledPorts, uint8_t *pu8DisabledPorts, uint8_t *pu8UntaggedPorts)
 {
 	register bool bRetCode = false;
 
-	if (!ieee8021QBridgeVlanCurrentTable_vlanUpdate (pComponent, poEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts))
+	if (!ieee8021QBridgeVlanCurrentTable_vlanUpdate (poComponent, poEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts))
 	{
 		goto ieee8021QBridgeVlanCurrentTable_vlanHandler_cleanup;
 	}
@@ -4652,7 +4652,7 @@ ieee8021QBridgeVlanCurrentTable_vlanHandler (
 
 bool
 ieee8021QBridgeVlanCurrentRowStatus_handler (
-	ieee8021BridgeBaseEntry_t *pComponent,
+	ieee8021BridgeBaseEntry_t *poComponent,
 	ieee8021QBridgeVlanCurrentEntry_t *poEntry, uint8_t u8RowStatus)
 {
 	register bool bRetCode = false;
@@ -4673,14 +4673,14 @@ ieee8021QBridgeVlanCurrentRowStatus_handler (
 	switch (u8RealStatus)
 	{
 	case xRowStatus_active_c:
-		if (!(u8RowStatus & xRowStatus_fromParent_c) && pComponent->u8RowStatus != xRowStatus_active_c)
+		if (!(u8RowStatus & xRowStatus_fromParent_c) && poComponent->u8RowStatus != xRowStatus_active_c)
 		{
 			u8RealStatus = xRowStatus_notReady_c;
 		}
 
 		/* TODO */
 
-		if (!ieee8021QBridgeVlanCurrentRowStatus_update (pComponent, poEntry, u8RealStatus))
+		if (!ieee8021QBridgeVlanCurrentRowStatus_update (poComponent, poEntry, u8RealStatus))
 		{
 			goto ieee8021QBridgeVlanCurrentRowStatus_handler_cleanup;
 		}
@@ -4689,7 +4689,7 @@ ieee8021QBridgeVlanCurrentRowStatus_handler (
 		break;
 
 	case xRowStatus_notInService_c:
-		if (!ieee8021QBridgeVlanCurrentRowStatus_update (pComponent, poEntry, u8RealStatus))
+		if (!ieee8021QBridgeVlanCurrentRowStatus_update (poComponent, poEntry, u8RealStatus))
 		{
 			goto ieee8021QBridgeVlanCurrentRowStatus_handler_cleanup;
 		}
@@ -4707,7 +4707,7 @@ ieee8021QBridgeVlanCurrentRowStatus_handler (
 		break;
 
 	case xRowStatus_destroy_c:
-		if (!ieee8021QBridgeVlanCurrentRowStatus_update (pComponent, poEntry, u8RealStatus))
+		if (!ieee8021QBridgeVlanCurrentRowStatus_update (poComponent, poEntry, u8RealStatus))
 		{
 			goto ieee8021QBridgeVlanCurrentRowStatus_handler_cleanup;
 		}
@@ -5109,7 +5109,7 @@ ieee8021QBridgeVlanStaticTable_removeHier (
 
 bool
 ieee8021QBridgeVlanStaticTable_vlanUpdater (
-	ieee8021BridgeBaseEntry_t *pComponent,
+	ieee8021BridgeBaseEntry_t *poComponent,
 	ieee8021QBridgeVlanStaticEntry_t *poEntry,
 	uint8_t *pu8EnabledPorts, uint8_t *pu8DisabledPorts, uint8_t *pu8UntaggedPorts)
 {
@@ -5121,12 +5121,12 @@ ieee8021QBridgeVlanStaticTable_vlanUpdater (
 		goto ieee8021QBridgeVlanStaticTable_vlanUpdater_cleanup;
 	}
 
-	if (!ieee8021QBridgeVlanCurrentTable_vlanHandler (pComponent, poIeee8021QBridgeVlanCurrentEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts))
+	if (!ieee8021QBridgeVlanCurrentTable_vlanHandler (poComponent, poIeee8021QBridgeVlanCurrentEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts))
 	{
 		goto ieee8021QBridgeVlanStaticTable_vlanUpdater_cleanup;
 	}
 
-	if (!ieee8021QBridgeVlanStaticTable_vlanUpdate (pComponent, poEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts))
+	if (!ieee8021QBridgeVlanStaticTable_vlanUpdate (poComponent, poEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts))
 	{
 		goto ieee8021QBridgeVlanStaticTable_vlanUpdater_cleanup;
 	}
@@ -5140,7 +5140,7 @@ ieee8021QBridgeVlanStaticTable_vlanUpdater (
 
 bool
 ieee8021QBridgeVlanStaticTable_handler (
-	ieee8021BridgeBaseEntry_t *pComponent,
+	ieee8021BridgeBaseEntry_t *poComponent,
 	ieee8021QBridgeVlanStaticEntry_t *poEntry,
 	uint8_t *pu8EgressPorts, uint8_t *pu8ForbiddenEgressPorts, uint8_t *pu8UntaggedPorts)
 {
@@ -5184,7 +5184,7 @@ ieee8021QBridgeVlanStaticTable_handler (
 	if ((xBitmap_checkBitRange (pu8EnabledPorts, 0, xBitmap_bitLength (poEntry->u16EgressPorts_len) - 1, 1) != xBitmap_index_invalid_c ||
 		 xBitmap_checkBitRange (pu8DisabledPorts, 0, xBitmap_bitLength (poEntry->u16EgressPorts_len) - 1, 1) != xBitmap_index_invalid_c ||
 		 xBitmap_checkBitRange (pu8UntaggedPorts2, 0, xBitmap_bitLength (poEntry->u16EgressPorts_len) - 1, 1) != xBitmap_index_invalid_c) &&
-		!ieee8021QBridgeVlanStaticTable_vlanUpdater (pComponent, poEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts2))
+		!ieee8021QBridgeVlanStaticTable_vlanUpdater (poComponent, poEntry, pu8EnabledPorts, pu8DisabledPorts, pu8UntaggedPorts2))
 	{
 		goto ieee8021QBridgeVlanStaticTable_handler_cleanup;
 	}
@@ -5211,7 +5211,7 @@ ieee8021QBridgeVlanStaticTable_handler (
 
 bool
 ieee8021QBridgeVlanStaticRowStatus_handler (
-	ieee8021BridgeBaseEntry_t *pComponent,
+	ieee8021BridgeBaseEntry_t *poComponent,
 	ieee8021QBridgeVlanStaticEntry_t *poEntry, uint8_t u8RowStatus)
 {
 	register bool bRetCode = false;
@@ -5232,14 +5232,14 @@ ieee8021QBridgeVlanStaticRowStatus_handler (
 	switch (u8RealStatus)
 	{
 	case xRowStatus_active_c:
-		if (!(u8RowStatus & xRowStatus_fromParent_c) && pComponent->u8RowStatus != xRowStatus_active_c)
+		if (!(u8RowStatus & xRowStatus_fromParent_c) && poComponent->u8RowStatus != xRowStatus_active_c)
 		{
 			u8RealStatus = xRowStatus_notReady_c;
 		}
 
 		/* TODO */
 
-		if (!ieee8021QBridgeVlanStaticRowStatus_update (pComponent, poEntry, u8RealStatus))
+		if (!ieee8021QBridgeVlanStaticRowStatus_update (poComponent, poEntry, u8RealStatus))
 		{
 			goto ieee8021QBridgeVlanStaticRowStatus_handler_cleanup;
 		}
@@ -5248,7 +5248,7 @@ ieee8021QBridgeVlanStaticRowStatus_handler (
 		break;
 
 	case xRowStatus_notInService_c:
-		if (!ieee8021QBridgeVlanStaticRowStatus_update (pComponent, poEntry, u8RealStatus))
+		if (!ieee8021QBridgeVlanStaticRowStatus_update (poComponent, poEntry, u8RealStatus))
 		{
 			goto ieee8021QBridgeVlanStaticRowStatus_handler_cleanup;
 		}
@@ -5266,7 +5266,7 @@ ieee8021QBridgeVlanStaticRowStatus_handler (
 		break;
 
 	case xRowStatus_destroy_c:
-		if (!ieee8021QBridgeVlanStaticRowStatus_update (pComponent, poEntry, u8RealStatus))
+		if (!ieee8021QBridgeVlanStaticRowStatus_update (poComponent, poEntry, u8RealStatus))
 		{
 			goto ieee8021QBridgeVlanStaticRowStatus_handler_cleanup;
 		}

ethernet/neIeee8021BridgeMIB.c

@@ -24,6 +24,7 @@
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 #include "system/systemMIB.h"
+#include "ethernetUtils.h"
 #include "neIeee8021BridgeMIB.h"
 #include "ieee8021BridgeMib.h"
 
@@ -589,6 +590,34 @@ neIeee8021BridgeBasePortTable_get (
 	return true;
 }
 
+bool
+neIeee8021BridgeBasePortAdminFlags_handler (
+	neIeee8021BridgeBasePortEntry_t *poEntry, uint8_t *pu8AdminFlags, bool bForce)
+{
+	register bool bRetCode = false;
+	register ieee8021BridgeBasePortEntry_t *poPort = ieee8021BridgeBasePortTable_getByNeEntry (poEntry);
+
+	if (memcmp (poEntry->au8AdminFlags, pu8AdminFlags, sizeof (poEntry->au8AdminFlags)) == 0 && !bForce)
+	{
+		goto neIeee8021BridgeBasePortAdminFlags_handler_success;
+	}
+
+	if (!neIeee8021BridgeBasePortAdminFlags_update (poPort, pu8AdminFlags))
+	{
+		goto neIeee8021BridgeBasePortAdminFlags_handler_cleanup;
+	}
+
+	!bForce ? memcpy (poEntry->au8AdminFlags, pu8AdminFlags, sizeof (poEntry->au8AdminFlags)): false;
+
+neIeee8021BridgeBasePortAdminFlags_handler_success:
+
+	bRetCode = true;
+
+neIeee8021BridgeBasePortAdminFlags_handler_cleanup:
+
+	return bRetCode;
+}
+
 /* neIeee8021BridgeBasePortTable table mapper */
 int
 neIeee8021BridgeBasePortTable_mapper (

ethernet/neIeee8021BridgeMIB.h

@@ -155,6 +155,8 @@ neIeee8021BridgeBasePortEntry_t * neIeee8021BridgeBasePortTable_getNextIndex (
 	uint32_t u32ComponentId,
 	uint32_t u32Port);
 void neIeee8021BridgeBasePortTable_removeEntry (neIeee8021BridgeBasePortEntry_t *poEntry);
+bool neIeee8021BridgeBasePortAdminFlags_handler (
+	neIeee8021BridgeBasePortEntry_t *poEntry, uint8_t *pu8AdminFlags, bool bForce);
 #ifdef SNMP_SRC
 Netsnmp_First_Data_Point neIeee8021BridgeBasePortTable_getFirst;
 Netsnmp_Next_Data_Point neIeee8021BridgeBasePortTable_getNext;