mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-05 22:29:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor: mib2: removed some blocks by defining common variables above the switch

Browse Source
This commit is contained in:
goldsimon 2015-10-07 10:13:20 +02:00
parent b401f42520
commit 9b22f167f1
1 changed files with 140 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

372
src/core/snmp/mib2.c
View File

@ -1505,11 +1505,8 @@ system_get_value(struct obj_def *od, void *value)
MEMCPY(value, syslocation_ptr, *syslocation_len_ptr); MEMCPY(value, syslocation_ptr, *syslocation_len_ptr);
return *syslocation_len_ptr; return *syslocation_len_ptr;
case 7: /* sysServices */ case 7: /* sysServices */
{ *(s32_t*)value = sysservices;
s32_t *sint_ptr = (s32_t*)value; return sizeof(s32_t);
*sint_ptr = sysservices;
return sizeof(s32_t);
}
default: default:
LWIP_DEBUGF(SNMP_MIB_DEBUG,("system_get_value(): unknown id: %d\n", id)); LWIP_DEBUGF(SNMP_MIB_DEBUG,("system_get_value(): unknown id: %d\n", id));
break; break;
@ -1661,14 +1658,9 @@ ifentry_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE); od->asn_type = (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE);
break; break;
case 6: /* ifPhysAddress */ case 6: /* ifPhysAddress */
{ od->instance = MIB_OBJECT_TAB;
struct netif *netif; od->access = MIB_OBJECT_READ_ONLY;
od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
snmp_ifindextonetif(ident[1], &netif);
od->instance = MIB_OBJECT_TAB;
od->access = MIB_OBJECT_READ_ONLY;
od->asn_type = (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR);
}
break; break;
case 7: /* ifAdminStatus */ case 7: /* ifAdminStatus */
od->instance = MIB_OBJECT_TAB; od->instance = MIB_OBJECT_TAB;
@ -1720,154 +1712,109 @@ ifentry_get_value(struct obj_def *od, void *value)
{ {
struct netif *netif; struct netif *netif;
u8_t id; u8_t id;
s32_t *sint_ptr;
u32_t *uint_ptr;
snmp_ifindextonetif(od->id_inst_ptr[1], &netif); snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff)); LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
id = (u8_t)od->id_inst_ptr[0]; id = (u8_t)od->id_inst_ptr[0];
switch (id) { switch (id) {
case 1: /* ifIndex */ case 1: /* ifIndex */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value; *sint_ptr = od->id_inst_ptr[1];
*sint_ptr = od->id_inst_ptr[1]; return sizeof(*sint_ptr);
return sizeof(*sint_ptr);
}
case 2: /* ifDescr */ case 2: /* ifDescr */
MEMCPY(value, netif->name, 2); MEMCPY(value, netif->name, 2);
/** @todo this should be some sort of sizeof(struct netif.name) */ /** @todo this should be some sort of sizeof(struct netif.name) */
return 2; return 2;
case 3: /* ifType */ case 3: /* ifType */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value; *sint_ptr = netif->link_type;
*sint_ptr = netif->link_type; return sizeof(*sint_ptr);
return sizeof(*sint_ptr);
}
case 4: /* ifMtu */ case 4: /* ifMtu */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value; *sint_ptr = netif->mtu;
*sint_ptr = netif->mtu; return sizeof(*sint_ptr);
return sizeof(*sint_ptr);
}
case 5: /* ifSpeed */ case 5: /* ifSpeed */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->link_speed;
*uint_ptr = netif->link_speed; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 6: /* ifPhysAddress */ case 6: /* ifPhysAddress */
MEMCPY(value, netif->hwaddr, netif->hwaddr_len); MEMCPY(value, netif->hwaddr, netif->hwaddr_len);
return netif->hwaddr_len; return netif->hwaddr_len;
case 7: /* ifAdminStatus */ case 7: /* ifAdminStatus */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value; if (netif_is_up(netif)) {
if (netif_is_up(netif)) if (netif_is_link_up(netif)) {
{ *sint_ptr = 1; /* up */
if (netif_is_link_up(netif)) } else {
{ *sint_ptr = 7; /* lowerLayerDown */
*sint_ptr = 1; /* up */
}
else
{
*sint_ptr = 7; /* lowerLayerDown */
}
} }
else } else {
{ *sint_ptr = 2; /* down */
*sint_ptr = 2; /* down */
}
return sizeof(*sint_ptr);
} }
return sizeof(*sint_ptr);
case 8: /* ifOperStatus */ case 8: /* ifOperStatus */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value; if (netif_is_up(netif)) {
if (netif_is_up(netif)) *sint_ptr = 1;
{ } else {
*sint_ptr = 1; *sint_ptr = 2;
}
else
{
*sint_ptr = 2;
}
return sizeof(*sint_ptr);
} }
return sizeof(*sint_ptr);
case 9: /* ifLastChange */ case 9: /* ifLastChange */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->ts;
*uint_ptr = netif->ts; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 10: /* ifInOctets */ case 10: /* ifInOctets */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifinoctets;
*uint_ptr = netif->mib2_counters.ifinoctets; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 11: /* ifInUcastPkts */ case 11: /* ifInUcastPkts */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifinucastpkts;
*uint_ptr = netif->mib2_counters.ifinucastpkts; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 12: /* ifInNUcastPkts */ case 12: /* ifInNUcastPkts */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifinnucastpkts;
*uint_ptr = netif->mib2_counters.ifinnucastpkts; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 13: /* ifInDiscards */ case 13: /* ifInDiscards */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifindiscards;
*uint_ptr = netif->mib2_counters.ifindiscards; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 14: /* ifInErrors */ case 14: /* ifInErrors */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifinerrors;
*uint_ptr = netif->mib2_counters.ifinerrors; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 15: /* ifInUnkownProtos */ case 15: /* ifInUnkownProtos */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifinunknownprotos;
*uint_ptr = netif->mib2_counters.ifinunknownprotos; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 16: /* ifOutOctets */ case 16: /* ifOutOctets */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifoutoctets;
*uint_ptr = netif->mib2_counters.ifoutoctets; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 17: /* ifOutUcastPkts */ case 17: /* ifOutUcastPkts */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifoutucastpkts;
*uint_ptr = netif->mib2_counters.ifoutucastpkts; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 18: /* ifOutNUcastPkts */ case 18: /* ifOutNUcastPkts */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifoutnucastpkts;
*uint_ptr = netif->mib2_counters.ifoutnucastpkts; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 19: /* ifOutDiscarts */ case 19: /* ifOutDiscarts */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifoutdiscards;
*uint_ptr = netif->mib2_counters.ifoutdiscards; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 20: /* ifOutErrors */ case 20: /* ifOutErrors */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = netif->mib2_counters.ifouterrors;
*uint_ptr = netif->mib2_counters.ifouterrors; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 21: /* ifOutQLen */ case 21: /* ifOutQLen */
/** @todo figure out if this must be 0 (no queue) or 1? */ /** @todo figure out if this must be 0 (no queue) or 1? */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = 0;
*uint_ptr = 0; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 22: /* ifSpecific */ case 22: /* ifSpecific */
MEMCPY(value, ifspecific.id, ifspecific.len * sizeof(s32_t)); MEMCPY(value, ifspecific.id, ifspecific.len * sizeof(s32_t));
return ifspecific.len * sizeof(s32_t); return ifspecific.len * sizeof(s32_t);
@ -2083,140 +2030,102 @@ static u16_t
ip_get_value(struct obj_def *od, void *value) ip_get_value(struct obj_def *od, void *value)
{ {
u8_t id; u8_t id;
s32_t *sint_ptr;
u32_t *uint_ptr;
LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff)); LWIP_ASSERT("invalid id", (od->id_inst_ptr[0] >= 0) && (od->id_inst_ptr[0] <= 0xff));
id = (u8_t)od->id_inst_ptr[0]; id = (u8_t)od->id_inst_ptr[0];
switch (id) { switch (id) {
case 1: /* ipForwarding */ case 1: /* ipForwarding */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value;
#if IP_FORWARD #if IP_FORWARD
/* forwarding */ /* forwarding */
*sint_ptr = 1; *sint_ptr = 1;
#else #else
/* not-forwarding */ /* not-forwarding */
*sint_ptr = 2; *sint_ptr = 2;
#endif #endif
return sizeof(*sint_ptr); return sizeof(*sint_ptr);
}
case 2: /* ipDefaultTTL */ case 2: /* ipDefaultTTL */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value; *sint_ptr = IP_DEFAULT_TTL;
*sint_ptr = IP_DEFAULT_TTL; return sizeof(*sint_ptr);
return sizeof(*sint_ptr);
}
case 3: /* ipInReceives */ case 3: /* ipInReceives */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipinreceives);
*uint_ptr = STATS_GET(mib2.ipinreceives); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 4: /* ipInHdrErrors */ case 4: /* ipInHdrErrors */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipinhdrerrors);
*uint_ptr = STATS_GET(mib2.ipinhdrerrors); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 5: /* ipInAddrErrors */ case 5: /* ipInAddrErrors */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipinaddrerrors);
*uint_ptr = STATS_GET(mib2.ipinaddrerrors); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 6: /* ipForwDatagrams */ case 6: /* ipForwDatagrams */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipforwdatagrams);
*uint_ptr = STATS_GET(mib2.ipforwdatagrams); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 7: /* ipInUnknownProtos */ case 7: /* ipInUnknownProtos */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipinunknownprotos);
*uint_ptr = STATS_GET(mib2.ipinunknownprotos); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 8: /* ipInDiscards */ case 8: /* ipInDiscards */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipindiscards);
*uint_ptr = STATS_GET(mib2.ipindiscards); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 9: /* ipInDelivers */ case 9: /* ipInDelivers */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipindelivers);
*uint_ptr = STATS_GET(mib2.ipindelivers); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 10: /* ipOutRequests */ case 10: /* ipOutRequests */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipoutrequests);
*uint_ptr = STATS_GET(mib2.ipoutrequests); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 11: /* ipOutDiscards */ case 11: /* ipOutDiscards */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipoutdiscards);
*uint_ptr = STATS_GET(mib2.ipoutdiscards); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 12: /* ipOutNoRoutes */ case 12: /* ipOutNoRoutes */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipoutnoroutes);
*uint_ptr = STATS_GET(mib2.ipoutnoroutes); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 13: /* ipReasmTimeout */ case 13: /* ipReasmTimeout */
{ sint_ptr = (s32_t*)value;
s32_t *sint_ptr = (s32_t*)value;
#if IP_REASSEMBLY #if IP_REASSEMBLY
*sint_ptr = IP_REASS_MAXAGE; *sint_ptr = IP_REASS_MAXAGE;
#else #else
*sint_ptr = 0; *sint_ptr = 0;
#endif #endif
return sizeof(*sint_ptr); return sizeof(*sint_ptr);
}
case 14: /* ipReasmReqds */ case 14: /* ipReasmReqds */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipreasmreqds);
*uint_ptr = STATS_GET(mib2.ipreasmreqds); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 15: /* ipReasmOKs */ case 15: /* ipReasmOKs */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipreasmoks);
*uint_ptr = STATS_GET(mib2.ipreasmoks); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 16: /* ipReasmFails */ case 16: /* ipReasmFails */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipreasmfails);
*uint_ptr = STATS_GET(mib2.ipreasmfails); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 17: /* ipFragOKs */ case 17: /* ipFragOKs */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipfragoks);
*uint_ptr = STATS_GET(mib2.ipfragoks); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 18: /* ipFragFails */ case 18: /* ipFragFails */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipfragfails);
*uint_ptr = STATS_GET(mib2.ipfragfails); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 19: /* ipFragCreates */ case 19: /* ipFragCreates */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = STATS_GET(mib2.ipfragcreates);
*uint_ptr = STATS_GET(mib2.ipfragcreates); return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
case 23: /* ipRoutingDiscards: not supported -> always 0 */ case 23: /* ipRoutingDiscards: not supported -> always 0 */
{ uint_ptr = (u32_t*)value;
u32_t *uint_ptr = (u32_t*)value; *uint_ptr = 0;
*uint_ptr = 0; return sizeof(*uint_ptr);
return sizeof(*uint_ptr);
}
default: default:
LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_get_value(): unknown id: %d\n", id)); LWIP_DEBUGF(SNMP_MIB_DEBUG,("ip_get_value(): unknown id: %d\n", id));
break; break;
@ -2259,8 +2168,7 @@ ip_set_test(struct obj_def *od, u16_t len, void *value)
} }
break; break;
case 2: /* ipDefaultTTL */ case 2: /* ipDefaultTTL */
if (*sint_ptr == IP_DEFAULT_TTL) if (*sint_ptr == IP_DEFAULT_TTL) {
{
set_ok = 1; set_ok = 1;
} }
break; break;