[INETMIB1]

- Sync to Wine 1.3.37

svn path=/trunk/; revision=56188
This commit is contained in:
Rafal Harabien 2012-03-19 15:08:06 +00:00
parent 8ee2daa9a2
commit b13b27b51a
2 changed files with 22 additions and 22 deletions

View file

@ -21,6 +21,9 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
#define NONAMELESSUNION
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "snmp.h" #include "snmp.h"
@ -59,7 +62,7 @@ struct structToAsnValue
}; };
static AsnInteger32 mapStructEntryToValue(struct structToAsnValue *map, static AsnInteger32 mapStructEntryToValue(struct structToAsnValue *map,
UINT mapLen, void *record, UINT id, BYTE bPduType, SnmpVarBind *pVarBind) UINT mapLen, void *record, UINT id, SnmpVarBind *pVarBind)
{ {
/* OIDs are 1-based */ /* OIDs are 1-based */
if (!id) if (!id)
@ -640,7 +643,7 @@ static BOOL mib2IfEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind,
{ {
*pErrorStatus = mapStructEntryToValue(mib2IfEntryMap, *pErrorStatus = mapStructEntryToValue(mib2IfEntryMap,
DEFINE_SIZEOF(mib2IfEntryMap), DEFINE_SIZEOF(mib2IfEntryMap),
&ifTable->table[tableIndex - 1], item, bPduType, &ifTable->table[tableIndex - 1], item,
pVarBind); pVarBind);
if (bPduType == SNMP_PDU_GETNEXT) if (bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItemAndInteger(&pVarBind->name, ret = setOidWithItemAndInteger(&pVarBind->name,
@ -713,7 +716,7 @@ static BOOL mib2IpStatsQuery(BYTE bPduType, SnmpVarBind *pVarBind,
if (!*pErrorStatus) if (!*pErrorStatus)
{ {
*pErrorStatus = mapStructEntryToValue(mib2IpMap, *pErrorStatus = mapStructEntryToValue(mib2IpMap,
DEFINE_SIZEOF(mib2IpMap), &ipStats, item, bPduType, pVarBind); DEFINE_SIZEOF(mib2IpMap), &ipStats, item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItem(&pVarBind->name, &myOid, item); ret = setOidWithItem(&pVarBind->name, &myOid, item);
} }
@ -798,7 +801,7 @@ static BOOL mib2IpAddrQuery(BYTE bPduType, SnmpVarBind *pVarBind,
assert(item); assert(item);
*pErrorStatus = mapStructEntryToValue(mib2IpAddrMap, *pErrorStatus = mapStructEntryToValue(mib2IpAddrMap,
DEFINE_SIZEOF(mib2IpAddrMap), DEFINE_SIZEOF(mib2IpAddrMap),
&ipAddrTable->table[tableIndex - 1], item, bPduType, pVarBind); &ipAddrTable->table[tableIndex - 1], item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item,
ipAddrTable->table[tableIndex - 1].dwAddr); ipAddrTable->table[tableIndex - 1].dwAddr);
@ -891,7 +894,7 @@ static BOOL mib2IpRouteQuery(BYTE bPduType, SnmpVarBind *pVarBind,
assert(item); assert(item);
*pErrorStatus = mapStructEntryToValue(mib2IpRouteMap, *pErrorStatus = mapStructEntryToValue(mib2IpRouteMap,
DEFINE_SIZEOF(mib2IpRouteMap), DEFINE_SIZEOF(mib2IpRouteMap),
&ipRouteTable->table[tableIndex - 1], item, bPduType, pVarBind); &ipRouteTable->table[tableIndex - 1], item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item, ret = setOidWithItemAndIpAddr(&pVarBind->name, &myOid, item,
ipRouteTable->table[tableIndex - 1].dwForwardDest); ipRouteTable->table[tableIndex - 1].dwForwardDest);
@ -978,7 +981,7 @@ static BOOL mib2IpNetQuery(BYTE bPduType, SnmpVarBind *pVarBind,
{ {
*pErrorStatus = mapStructEntryToValue(mib2IpNetMap, *pErrorStatus = mapStructEntryToValue(mib2IpNetMap,
DEFINE_SIZEOF(mib2IpNetMap), DEFINE_SIZEOF(mib2IpNetMap),
&ipNetTable[tableIndex - 1], item, bPduType, pVarBind); &ipNetTable[tableIndex - 1], item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItemAndInteger(&pVarBind->name, &myOid, ret = setOidWithItemAndInteger(&pVarBind->name, &myOid,
item, tableIndex); item, tableIndex);
@ -1053,7 +1056,7 @@ static BOOL mib2IcmpQuery(BYTE bPduType, SnmpVarBind *pVarBind,
if (!*pErrorStatus) if (!*pErrorStatus)
{ {
*pErrorStatus = mapStructEntryToValue(mib2IcmpMap, *pErrorStatus = mapStructEntryToValue(mib2IcmpMap,
DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item, bPduType, DEFINE_SIZEOF(mib2IcmpMap), &icmpStats, item,
pVarBind); pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItem(&pVarBind->name, &myOid, item); ret = setOidWithItem(&pVarBind->name, &myOid, item);
@ -1115,7 +1118,7 @@ static BOOL mib2TcpQuery(BYTE bPduType, SnmpVarBind *pVarBind,
if (!*pErrorStatus) if (!*pErrorStatus)
{ {
*pErrorStatus = mapStructEntryToValue(mib2TcpMap, *pErrorStatus = mapStructEntryToValue(mib2TcpMap,
DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, bPduType, pVarBind); DEFINE_SIZEOF(mib2TcpMap), &tcpStats, item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItem(&pVarBind->name, &myOid, item); ret = setOidWithItem(&pVarBind->name, &myOid, item);
} }
@ -1165,7 +1168,7 @@ static BOOL mib2UdpQuery(BYTE bPduType, SnmpVarBind *pVarBind,
if (!*pErrorStatus) if (!*pErrorStatus)
{ {
*pErrorStatus = mapStructEntryToValue(mib2UdpMap, *pErrorStatus = mapStructEntryToValue(mib2UdpMap,
DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, bPduType, pVarBind); DEFINE_SIZEOF(mib2UdpMap), &udpStats, item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
ret = setOidWithItem(&pVarBind->name, &myOid, item); ret = setOidWithItem(&pVarBind->name, &myOid, item);
} }
@ -1258,7 +1261,7 @@ static BOOL mib2UdpEntryQuery(BYTE bPduType, SnmpVarBind *pVarBind,
assert(item); assert(item);
*pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap, *pErrorStatus = mapStructEntryToValue(mib2UdpEntryMap,
DEFINE_SIZEOF(mib2UdpEntryMap), DEFINE_SIZEOF(mib2UdpEntryMap),
&udpTable->table[tableIndex - 1], item, bPduType, pVarBind); &udpTable->table[tableIndex - 1], item, pVarBind);
if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT) if (!*pErrorStatus && bPduType == SNMP_PDU_GETNEXT)
{ {
AsnObjectIdentifier oid; AsnObjectIdentifier oid;
@ -1342,29 +1345,26 @@ static void cleanup(void)
static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength, static struct mibImplementation *findSupportedQuery(UINT *ids, UINT idLength,
UINT *matchingIndex) UINT *matchingIndex)
{ {
int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0, i; int indexHigh = DEFINE_SIZEOF(supportedIDs) - 1, indexLow = 0;
struct mibImplementation *impl = NULL;
AsnObjectIdentifier oid1 = { idLength, ids}; AsnObjectIdentifier oid1 = { idLength, ids};
if (!idLength) if (!idLength)
return NULL; return NULL;
for (i = (indexLow + indexHigh) / 2; !impl && indexLow <= indexHigh;
i = (indexLow + indexHigh) / 2)
{
INT cmp;
cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength); while (indexLow <= indexHigh)
if (!cmp) {
INT cmp, i = (indexLow + indexHigh) / 2;
if (!(cmp = SnmpUtilOidNCmp(&oid1, &supportedIDs[i].name, idLength)))
{ {
impl = &supportedIDs[i];
*matchingIndex = i; *matchingIndex = i;
return &supportedIDs[i];
} }
else if (cmp > 0) if (cmp > 0)
indexLow = i + 1; indexLow = i + 1;
else else
indexHigh = i - 1; indexHigh = i - 1;
} }
return impl; return NULL;
} }
/***************************************************************************** /*****************************************************************************

View file

@ -72,7 +72,7 @@ reactos/dll/win32/imaadp32.acm # Synced to Wine-1.3.37
reactos/dll/win32/imagehlp # Synced to Wine-1.3.37 reactos/dll/win32/imagehlp # Synced to Wine-1.3.37
reactos/dll/win32/imm32 # Synced to Wine-1.3.37 reactos/dll/win32/imm32 # Synced to Wine-1.3.37
reactos/dll/win32/inetcomm # Synced to Wine-1.3.37 reactos/dll/win32/inetcomm # Synced to Wine-1.3.37
reactos/dll/win32/inetmib1 # Autosync reactos/dll/win32/inetmib1 # Synced to Wine-1.3.37
reactos/dll/win32/initpki # Synced to Wine-1.3.37 reactos/dll/win32/initpki # Synced to Wine-1.3.37
reactos/dll/win32/inseng # Synced to Wine-1.3.37 reactos/dll/win32/inseng # Synced to Wine-1.3.37
reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/iphlpapi # Out of sync