[nes]: GMPLS changes ...

mpls/mplsTeStdMIB.c

@@ -5395,43 +5395,21 @@ gmplsTunnelARHopTable_init (void)
 	/* Initialise the contents of the table here */
 }
 
-static int8_t
-gmplsTunnelARHopTable_BTreeNodeCmp (
-	xBTree_Node_t *pNode1, xBTree_Node_t *pNode2, xBTree_t *pBTree)
-{
-	register gmplsTunnelARHopEntry_t *pEntry1 = xBTree_entry (pNode1, gmplsTunnelARHopEntry_t, oBTreeNode);
-	register gmplsTunnelARHopEntry_t *pEntry2 = xBTree_entry (pNode2, gmplsTunnelARHopEntry_t, oBTreeNode);
-
-	return
-		(pEntry1->u32ListIndex < pEntry2->u32ListIndex) ||
-		(pEntry1->u32ListIndex == pEntry2->u32ListIndex && pEntry1->u32Index < pEntry2->u32Index) ? -1:
-		(pEntry1->u32ListIndex == pEntry2->u32ListIndex && pEntry1->u32Index == pEntry2->u32Index) ? 0: 1;
-}
-
-xBTree_t oGmplsTunnelARHopTable_BTree = xBTree_initInline (&gmplsTunnelARHopTable_BTreeNodeCmp);
-
 /* create a new row in the table */
 gmplsTunnelARHopEntry_t *
 gmplsTunnelARHopTable_createEntry (
 	uint32_t u32ListIndex,
 	uint32_t u32Index)
 {
 	register gmplsTunnelARHopEntry_t *poEntry = NULL;
+	register mplsTunnelARHopEntry_t *poTunnelARHop = NULL;
 
-	if ((poEntry = xBuffer_cAlloc (sizeof (*poEntry))) == NULL)
-	{
-		return NULL;
-	}
-
-	poEntry->u32ListIndex = u32ListIndex;
-	poEntry->u32Index = u32Index;
-	if (xBTree_nodeFind (&poEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree) != NULL)
+	if ((poTunnelARHop = mplsTunnelARHopTable_getByIndex (u32ListIndex, u32Index)) == NULL)
 	{
-		xBuffer_free (poEntry);
 		return NULL;
 	}
+	poEntry = &poTunnelARHop->oG;
 
-	xBTree_nodeAdd (&poEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree);
 	return poEntry;
 }
 
@@ -5440,63 +5418,35 @@ gmplsTunnelARHopTable_getByIndex (
 	uint32_t u32ListIndex,
 	uint32_t u32Index)
 {
-	register gmplsTunnelARHopEntry_t *poTmpEntry = NULL;
-	register xBTree_Node_t *poNode = NULL;
-
-	if ((poTmpEntry = xBuffer_cAlloc (sizeof (*poTmpEntry))) == NULL)
-	{
-		return NULL;
-	}
+	register mplsTunnelARHopEntry_t *poTunnelARHop = NULL;
 
-	poTmpEntry->u32ListIndex = u32ListIndex;
-	poTmpEntry->u32Index = u32Index;
-	if ((poNode = xBTree_nodeFind (&poTmpEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree)) == NULL)
+	if ((poTunnelARHop = mplsTunnelARHopTable_getByIndex (u32ListIndex, u32Index)) == NULL)
 	{
-		xBuffer_free (poTmpEntry);
 		return NULL;
 	}
 
-	xBuffer_free (poTmpEntry);
-	return xBTree_entry (poNode, gmplsTunnelARHopEntry_t, oBTreeNode);
+	return &poTunnelARHop->oG;
 }
 
 gmplsTunnelARHopEntry_t *
 gmplsTunnelARHopTable_getNextIndex (
 	uint32_t u32ListIndex,
 	uint32_t u32Index)
 {
-	register gmplsTunnelARHopEntry_t *poTmpEntry = NULL;
-	register xBTree_Node_t *poNode = NULL;
-
-	if ((poTmpEntry = xBuffer_cAlloc (sizeof (*poTmpEntry))) == NULL)
-	{
-		return NULL;
-	}
+	register mplsTunnelARHopEntry_t *poTunnelARHop = NULL;
 
-	poTmpEntry->u32ListIndex = u32ListIndex;
-	poTmpEntry->u32Index = u32Index;
-	if ((poNode = xBTree_nodeFindNext (&poTmpEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree)) == NULL)
+	if ((poTunnelARHop = mplsTunnelARHopTable_getByIndex (u32ListIndex, u32Index)) == NULL)
 	{
-		xBuffer_free (poTmpEntry);
 		return NULL;
 	}
 
-	xBuffer_free (poTmpEntry);
-	return xBTree_entry (poNode, gmplsTunnelARHopEntry_t, oBTreeNode);
+	return &poTunnelARHop->oG;
 }
 
 /* remove a row from the table */
 void
 gmplsTunnelARHopTable_removeEntry (gmplsTunnelARHopEntry_t *poEntry)
 {
-	if (poEntry == NULL ||
-		xBTree_nodeFind (&poEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree) == NULL)
-	{
-		return;    /* Nothing to remove */
-	}
-
-	xBTree_nodeRemove (&poEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree);
-	xBuffer_free (poEntry);   /* XXX - release any other internal resources */
 	return;
 }
 
@@ -5506,7 +5456,7 @@ gmplsTunnelARHopTable_getFirst (
 	void **my_loop_context, void **my_data_context,
 	netsnmp_variable_list *put_index_data, netsnmp_iterator_info *mydata)
 {
-	*my_loop_context = xBTree_nodeGetFirst (&oGmplsTunnelARHopTable_BTree);
+	*my_loop_context = xBTree_nodeGetFirst (&oMplsTunnelARHopTable_BTree);
 	return gmplsTunnelARHopTable_getNext (my_loop_context, my_data_context, put_index_data, mydata);
 }
 
@@ -5515,20 +5465,20 @@ gmplsTunnelARHopTable_getNext (
 	void **my_loop_context, void **my_data_context,
 	netsnmp_variable_list *put_index_data, netsnmp_iterator_info *mydata)
 {
-	gmplsTunnelARHopEntry_t *poEntry = NULL;
+	mplsTunnelARHopEntry_t *poEntry = NULL;
 	netsnmp_variable_list *idx = put_index_data;
 
 	if (*my_loop_context == NULL)
 	{
 		return NULL;
 	}
-	poEntry = xBTree_entry (*my_loop_context, gmplsTunnelARHopEntry_t, oBTreeNode);
+	poEntry = xBTree_entry (*my_loop_context, mplsTunnelARHopEntry_t, oBTreeNode);
 
 	snmp_set_var_typed_integer (idx, ASN_UNSIGNED, poEntry->u32ListIndex);
 	idx = idx->next_variable;
 	snmp_set_var_typed_integer (idx, ASN_UNSIGNED, poEntry->u32Index);
-	*my_data_context = (void*) poEntry;
-	*my_loop_context = (void*) xBTree_nodeGetNext (&poEntry->oBTreeNode, &oGmplsTunnelARHopTable_BTree);
+	*my_data_context = (void*) &poEntry->oG;
+	*my_loop_context = (void*) xBTree_nodeGetNext (&poEntry->oBTreeNode, &oMplsTunnelARHopTable_BTree);
 	return put_index_data;
 }
 
@@ -5537,19 +5487,19 @@ gmplsTunnelARHopTable_get (
 	void **my_data_context,
 	netsnmp_variable_list *put_index_data, netsnmp_iterator_info *mydata)
 {
-	gmplsTunnelARHopEntry_t *poEntry = NULL;
+	mplsTunnelARHopEntry_t *poEntry = NULL;
 	register netsnmp_variable_list *idx1 = put_index_data;
 	register netsnmp_variable_list *idx2 = idx1->next_variable;
 
-	poEntry = gmplsTunnelARHopTable_getByIndex (
+	poEntry = mplsTunnelARHopTable_getByIndex (
 		*idx1->val.integer,
 		*idx2->val.integer);
 	if (poEntry == NULL)
 	{
 		return false;
 	}
 
-	*my_data_context = (void*) poEntry;
+	*my_data_context = (void*) &poEntry->oG;
 	return true;
 }
 

mpls/mplsTeStdMIB.h

@@ -1229,6 +1229,8 @@ typedef struct mplsTunnelARHopEntry_t
 	uint8_t au8LspId[6];
 	size_t u16LspId_len;	/* # of uint8_t elements */
 
+	gmplsTunnelARHopEntry_t oG;
+
 	xBTree_Node_t oBTreeNode;
 } mplsTunnelARHopEntry_t;