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

Added missing casts (bug #28659)

Browse Source
This commit is contained in:
goldsimon 2010-01-28 12:05:14 +00:00
parent d587940801
commit 21e3cde95c
5 changed files with 132 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/snmp/asn1_dec.c
View File

@ -61,7 +61,7 @@ snmp_asn1_dec_type(struct pbuf *p, u16_t ofs, u8_t *type)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
*type = *msg_ptr; *type = *msg_ptr;
return ERR_OK; return ERR_OK;
@ -94,7 +94,7 @@ snmp_asn1_dec_length(struct pbuf *p, u16_t ofs, u8_t *octets_used, u16_t *length
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if (*msg_ptr < 0x80) if (*msg_ptr < 0x80)
@ -125,7 +125,7 @@ snmp_asn1_dec_length(struct pbuf *p, u16_t ofs, u8_t *octets_used, u16_t *length
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -160,7 +160,7 @@ snmp_asn1_dec_length(struct pbuf *p, u16_t ofs, u8_t *octets_used, u16_t *length
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
} }
else else
{ {
@ -186,7 +186,7 @@ snmp_asn1_dec_length(struct pbuf *p, u16_t ofs, u8_t *octets_used, u16_t *length
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -249,7 +249,7 @@ snmp_asn1_dec_u32t(struct pbuf *p, u16_t ofs, u16_t len, u32_t *value)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if ((len > 0) && (len < 6)) if ((len > 0) && (len < 6))
{ {
@ -273,7 +273,7 @@ snmp_asn1_dec_u32t(struct pbuf *p, u16_t ofs, u16_t len, u32_t *value)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -295,7 +295,7 @@ snmp_asn1_dec_u32t(struct pbuf *p, u16_t ofs, u16_t len, u32_t *value)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -349,7 +349,7 @@ snmp_asn1_dec_s32t(struct pbuf *p, u16_t ofs, u16_t len, s32_t *value)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if ((len > 0) && (len < 5)) if ((len > 0) && (len < 5))
{ {
@ -386,7 +386,7 @@ snmp_asn1_dec_s32t(struct pbuf *p, u16_t ofs, u16_t len, s32_t *value)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -439,7 +439,7 @@ snmp_asn1_dec_oid(struct pbuf *p, u16_t ofs, u16_t len, struct snmp_obj_id *oid)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
oid->len = 0; oid->len = 0;
@ -493,7 +493,7 @@ snmp_asn1_dec_oid(struct pbuf *p, u16_t ofs, u16_t len, struct snmp_obj_id *oid)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -519,7 +519,7 @@ snmp_asn1_dec_oid(struct pbuf *p, u16_t ofs, u16_t len, struct snmp_obj_id *oid)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -551,7 +551,7 @@ snmp_asn1_dec_oid(struct pbuf *p, u16_t ofs, u16_t len, struct snmp_obj_id *oid)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -607,7 +607,7 @@ snmp_asn1_dec_raw(struct pbuf *p, u16_t ofs, u16_t len, u16_t raw_len, u8_t *raw
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if (raw_len >= len) if (raw_len >= len)
{ {
@ -623,7 +623,7 @@ snmp_asn1_dec_raw(struct pbuf *p, u16_t ofs, u16_t len, u16_t raw_len, u8_t *raw
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else

30
src/core/snmp/asn1_enc.c
View File

@ -190,7 +190,7 @@ snmp_asn1_enc_type(struct pbuf *p, u16_t ofs, u8_t type)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
*msg_ptr = type; *msg_ptr = type;
return ERR_OK; return ERR_OK;
@ -222,7 +222,7 @@ snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if (length < 0x80) if (length < 0x80)
@ -239,7 +239,7 @@ snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
} }
else else
{ {
@ -265,7 +265,7 @@ snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -317,7 +317,7 @@ snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if (octets_needed == 5) if (octets_needed == 5)
@ -331,7 +331,7 @@ snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -350,7 +350,7 @@ snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -393,7 +393,7 @@ snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
while (octets_needed > 1) while (octets_needed > 1)
@ -406,7 +406,7 @@ snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -447,7 +447,7 @@ snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
if (ident_len > 1) if (ident_len > 1)
@ -468,7 +468,7 @@ snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -509,7 +509,7 @@ snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -529,7 +529,7 @@ snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else
@ -573,7 +573,7 @@ snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw)
plen += p->len; plen += p->len;
if (ofs < plen) if (ofs < plen)
{ {
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
msg_ptr += ofs - base; msg_ptr += ofs - base;
while (raw_len > 1) while (raw_len > 1)
@ -588,7 +588,7 @@ snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw)
/* next octet in next pbuf */ /* next octet in next pbuf */
p = p->next; p = p->next;
if (p == NULL) { return ERR_ARG; } if (p == NULL) { return ERR_ARG; }
msg_ptr = p->payload; msg_ptr = (u8_t*)p->payload;
plen += p->len; plen += p->len;
} }
else else

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

@ -1519,23 +1519,23 @@ void snmp_insert_iprteidx_tree(u8_t dflt, struct netif *ni)
*/ */
void snmp_delete_iprteidx_tree(u8_t dflt, struct netif *ni) void snmp_delete_iprteidx_tree(u8_t dflt, struct netif *ni)
{ {
u8_t delete = 0; u8_t del = 0;
struct ip_addr dst; struct ip_addr dst;
if (dflt != 0) if (dflt != 0)
{ {
/* the default route 0.0.0.0 */ /* the default route 0.0.0.0 */
dst.addr = 0; dst.addr = 0;
delete = 1; del = 1;
} }
else else
{ {
/* route to the network address */ /* route to the network address */
dst.addr = ntohl(ni->ip_addr.addr & ni->netmask.addr); dst.addr = ntohl(ni->ip_addr.addr & ni->netmask.addr);
/* exclude 0.0.0.0 network (reserved for default rte) */ /* exclude 0.0.0.0 network (reserved for default rte) */
if (dst.addr != 0) delete = 1; if (dst.addr != 0) del = 1;
} }
if (delete) if (del)
{ {
struct mib_list_rootnode *iprte_rn, *next, *del_rn[4]; struct mib_list_rootnode *iprte_rn, *next, *del_rn[4];
struct mib_list_node *iprte_n, *del_n[4]; struct mib_list_node *iprte_n, *del_n[4];
@ -2209,28 +2209,28 @@ system_get_value(struct obj_def *od, u16_t len, void *value)
switch (id) switch (id)
{ {
case 1: /* sysDescr */ case 1: /* sysDescr */
ocstrncpy(value,sysdescr_ptr, len); ocstrncpy((u8_t*)value, sysdescr_ptr, len);
break; break;
case 2: /* sysObjectID */ case 2: /* sysObjectID */
objectidncpy((s32_t*)value, (s32_t*)sysobjid.id, (u8_t)(len / sizeof(s32_t))); objectidncpy((s32_t*)value, (s32_t*)sysobjid.id, (u8_t)(len / sizeof(s32_t)));
break; break;
case 3: /* sysUpTime */ case 3: /* sysUpTime */
{ {
snmp_get_sysuptime(value); snmp_get_sysuptime((u32_t*)value);
} }
break; break;
case 4: /* sysContact */ case 4: /* sysContact */
ocstrncpy(value,syscontact_ptr,len); ocstrncpy((u8_t*)value, syscontact_ptr, len);
break; break;
case 5: /* sysName */ case 5: /* sysName */
ocstrncpy(value,sysname_ptr,len); ocstrncpy((u8_t*)value, sysname_ptr, len);
break; break;
case 6: /* sysLocation */ case 6: /* sysLocation */
ocstrncpy(value,syslocation_ptr,len); ocstrncpy((u8_t*)value, syslocation_ptr, len);
break; break;
case 7: /* sysServices */ case 7: /* sysServices */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = sysservices; *sint_ptr = sysservices;
} }
break; break;
@ -2284,15 +2284,15 @@ system_set_value(struct obj_def *od, u16_t len, void *value)
switch (id) switch (id)
{ {
case 4: /* sysContact */ case 4: /* sysContact */
ocstrncpy(syscontact_ptr,value,len); ocstrncpy(syscontact_ptr, (u8_t*)value, len);
*syscontact_len_ptr = (u8_t)len; *syscontact_len_ptr = (u8_t)len;
break; break;
case 5: /* sysName */ case 5: /* sysName */
ocstrncpy(sysname_ptr,value,len); ocstrncpy(sysname_ptr, (u8_t*)value, len);
*sysname_len_ptr = (u8_t)len; *sysname_len_ptr = (u8_t)len;
break; break;
case 6: /* sysLocation */ case 6: /* sysLocation */
ocstrncpy(syslocation_ptr,value,len); ocstrncpy(syslocation_ptr, (u8_t*)value, len);
*syslocation_len_ptr = (u8_t)len; *syslocation_len_ptr = (u8_t)len;
break; break;
}; };
@ -2342,7 +2342,7 @@ interfaces_get_value(struct obj_def *od, u16_t len, void *value)
LWIP_UNUSED_ARG(len); LWIP_UNUSED_ARG(len);
if (od->id_inst_ptr[0] == 1) if (od->id_inst_ptr[0] == 1)
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = iflist_root.count; *sint_ptr = iflist_root.count;
} }
} }
@ -2475,38 +2475,38 @@ ifentry_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* ifIndex */ case 1: /* ifIndex */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = od->id_inst_ptr[1]; *sint_ptr = od->id_inst_ptr[1];
} }
break; break;
case 2: /* ifDescr */ case 2: /* ifDescr */
ocstrncpy(value,(u8_t*)netif->name,len); ocstrncpy((u8_t*)value, (u8_t*)netif->name, len);
break; break;
case 3: /* ifType */ case 3: /* ifType */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = netif->link_type; *sint_ptr = netif->link_type;
} }
break; break;
case 4: /* ifMtu */ case 4: /* ifMtu */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = netif->mtu; *sint_ptr = netif->mtu;
} }
break; break;
case 5: /* ifSpeed */ case 5: /* ifSpeed */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->link_speed; *uint_ptr = netif->link_speed;
} }
break; break;
case 6: /* ifPhysAddress */ case 6: /* ifPhysAddress */
ocstrncpy(value,netif->hwaddr,len); ocstrncpy((u8_t*)value, netif->hwaddr, len);
break; break;
case 7: /* ifAdminStatus */ case 7: /* ifAdminStatus */
#if LWIP_NETIF_LINK_CALLBACK #if LWIP_NETIF_LINK_CALLBACK
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (netif_is_up(netif)) if (netif_is_up(netif))
{ {
if (netif_is_link_up(netif)) if (netif_is_link_up(netif))
@ -2527,7 +2527,7 @@ ifentry_get_value(struct obj_def *od, u16_t len, void *value)
#endif #endif
case 8: /* ifOperStatus */ case 8: /* ifOperStatus */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (netif_is_up(netif)) if (netif_is_up(netif))
{ {
*sint_ptr = 1; *sint_ptr = 1;
@ -2540,31 +2540,31 @@ ifentry_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 9: /* ifLastChange */ case 9: /* ifLastChange */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ts; *uint_ptr = netif->ts;
} }
break; break;
case 10: /* ifInOctets */ case 10: /* ifInOctets */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifinoctets; *uint_ptr = netif->ifinoctets;
} }
break; break;
case 11: /* ifInUcastPkts */ case 11: /* ifInUcastPkts */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifinucastpkts; *uint_ptr = netif->ifinucastpkts;
} }
break; break;
case 12: /* ifInNUcastPkts */ case 12: /* ifInNUcastPkts */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifinnucastpkts; *uint_ptr = netif->ifinnucastpkts;
} }
break; break;
case 13: /* ifInDiscarts */ case 13: /* ifInDiscarts */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifindiscards; *uint_ptr = netif->ifindiscards;
} }
break; break;
@ -2572,45 +2572,45 @@ ifentry_get_value(struct obj_def *od, u16_t len, void *value)
case 15: /* ifInUnkownProtos */ case 15: /* ifInUnkownProtos */
/** @todo add these counters! */ /** @todo add these counters! */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = 0; *uint_ptr = 0;
} }
break; break;
case 16: /* ifOutOctets */ case 16: /* ifOutOctets */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifoutoctets; *uint_ptr = netif->ifoutoctets;
} }
break; break;
case 17: /* ifOutUcastPkts */ case 17: /* ifOutUcastPkts */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifoutucastpkts; *uint_ptr = netif->ifoutucastpkts;
} }
break; break;
case 18: /* ifOutNUcastPkts */ case 18: /* ifOutNUcastPkts */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifoutnucastpkts; *uint_ptr = netif->ifoutnucastpkts;
} }
break; break;
case 19: /* ifOutDiscarts */ case 19: /* ifOutDiscarts */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = netif->ifoutdiscards; *uint_ptr = netif->ifoutdiscards;
} }
break; break;
case 20: /* ifOutErrors */ case 20: /* ifOutErrors */
/** @todo add this counter! */ /** @todo add this counter! */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = 0; *uint_ptr = 0;
} }
break; break;
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? */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = 0; *uint_ptr = 0;
} }
break; break;
@ -2626,6 +2626,7 @@ ifentry_set_test (struct obj_def *od, u16_t len, void *value)
{ {
struct netif *netif; struct netif *netif;
u8_t id, set_ok; u8_t id, set_ok;
LWIP_UNUSED_ARG(len);
set_ok = 0; set_ok = 0;
snmp_ifindextonetif(od->id_inst_ptr[1], &netif); snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
@ -2634,7 +2635,7 @@ ifentry_set_test (struct obj_def *od, u16_t len, void *value)
{ {
case 7: /* ifAdminStatus */ case 7: /* ifAdminStatus */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (*sint_ptr == 1 || *sint_ptr == 2) if (*sint_ptr == 1 || *sint_ptr == 2)
set_ok = 1; set_ok = 1;
} }
@ -2648,6 +2649,7 @@ ifentry_set_value (struct obj_def *od, u16_t len, void *value)
{ {
struct netif *netif; struct netif *netif;
u8_t id; u8_t id;
LWIP_UNUSED_ARG(len);
snmp_ifindextonetif(od->id_inst_ptr[1], &netif); snmp_ifindextonetif(od->id_inst_ptr[1], &netif);
id = od->id_inst_ptr[0]; id = od->id_inst_ptr[0];
@ -2655,7 +2657,7 @@ ifentry_set_value (struct obj_def *od, u16_t len, void *value)
{ {
case 7: /* ifAdminStatus */ case 7: /* ifAdminStatus */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (*sint_ptr == 1) if (*sint_ptr == 1)
{ {
netif_set_up(netif); netif_set_up(netif);
@ -2749,20 +2751,20 @@ atentry_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* atIfIndex */ case 1: /* atIfIndex */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = od->id_inst_ptr[1]; *sint_ptr = od->id_inst_ptr[1];
} }
break; break;
case 2: /* atPhysAddress */ case 2: /* atPhysAddress */
{ {
struct eth_addr *dst = value; struct eth_addr *dst = (struct eth_addr*)value;
*dst = *ethaddr_ret; *dst = *ethaddr_ret;
} }
break; break;
case 3: /* atNetAddress */ case 3: /* atNetAddress */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
*dst = *ipaddr_ret; *dst = *ipaddr_ret;
} }
@ -2850,7 +2852,7 @@ ip_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* ipForwarding */ case 1: /* ipForwarding */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
#if IP_FORWARD #if IP_FORWARD
/* forwarding */ /* forwarding */
*sint_ptr = 1; *sint_ptr = 1;
@ -2862,73 +2864,73 @@ ip_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 2: /* ipDefaultTTL */ case 2: /* ipDefaultTTL */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = IP_DEFAULT_TTL; *sint_ptr = IP_DEFAULT_TTL;
} }
break; break;
case 3: /* ipInReceives */ case 3: /* ipInReceives */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipinreceives; *uint_ptr = ipinreceives;
} }
break; break;
case 4: /* ipInHdrErrors */ case 4: /* ipInHdrErrors */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipinhdrerrors; *uint_ptr = ipinhdrerrors;
} }
break; break;
case 5: /* ipInAddrErrors */ case 5: /* ipInAddrErrors */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipinaddrerrors; *uint_ptr = ipinaddrerrors;
} }
break; break;
case 6: /* ipForwDatagrams */ case 6: /* ipForwDatagrams */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipforwdatagrams; *uint_ptr = ipforwdatagrams;
} }
break; break;
case 7: /* ipInUnknownProtos */ case 7: /* ipInUnknownProtos */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipinunknownprotos; *uint_ptr = ipinunknownprotos;
} }
break; break;
case 8: /* ipInDiscards */ case 8: /* ipInDiscards */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipindiscards; *uint_ptr = ipindiscards;
} }
break; break;
case 9: /* ipInDelivers */ case 9: /* ipInDelivers */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipindelivers; *uint_ptr = ipindelivers;
} }
break; break;
case 10: /* ipOutRequests */ case 10: /* ipOutRequests */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipoutrequests; *uint_ptr = ipoutrequests;
} }
break; break;
case 11: /* ipOutDiscards */ case 11: /* ipOutDiscards */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipoutdiscards; *uint_ptr = ipoutdiscards;
} }
break; break;
case 12: /* ipOutNoRoutes */ case 12: /* ipOutNoRoutes */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipoutnoroutes; *uint_ptr = ipoutnoroutes;
} }
break; break;
case 13: /* ipReasmTimeout */ case 13: /* ipReasmTimeout */
{ {
s32_t *sint_ptr = 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
@ -2938,44 +2940,44 @@ ip_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 14: /* ipReasmReqds */ case 14: /* ipReasmReqds */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipreasmreqds; *uint_ptr = ipreasmreqds;
} }
break; break;
case 15: /* ipReasmOKs */ case 15: /* ipReasmOKs */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipreasmoks; *uint_ptr = ipreasmoks;
} }
break; break;
case 16: /* ipReasmFails */ case 16: /* ipReasmFails */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipreasmfails; *uint_ptr = ipreasmfails;
} }
break; break;
case 17: /* ipFragOKs */ case 17: /* ipFragOKs */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipfragoks; *uint_ptr = ipfragoks;
} }
break; break;
case 18: /* ipFragFails */ case 18: /* ipFragFails */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipfragfails; *uint_ptr = ipfragfails;
} }
break; break;
case 19: /* ipFragCreates */ case 19: /* ipFragCreates */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = ipfragcreates; *uint_ptr = ipfragcreates;
} }
break; break;
case 23: /* ipRoutingDiscards */ case 23: /* ipRoutingDiscards */
/** @todo can lwIP discard routes at all?? hardwire this to 0?? */ /** @todo can lwIP discard routes at all?? hardwire this to 0?? */
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
*uint_ptr = iproutingdiscards; *uint_ptr = iproutingdiscards;
} }
break; break;
@ -2996,7 +2998,7 @@ static u8_t
ip_set_test(struct obj_def *od, u16_t len, void *value) ip_set_test(struct obj_def *od, u16_t len, void *value)
{ {
u8_t id, set_ok; u8_t id, set_ok;
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
LWIP_UNUSED_ARG(len); LWIP_UNUSED_ARG(len);
set_ok = 0; set_ok = 0;
@ -3098,25 +3100,25 @@ ip_addrentry_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* ipAdEntAddr */ case 1: /* ipAdEntAddr */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
*dst = netif->ip_addr; *dst = netif->ip_addr;
} }
break; break;
case 2: /* ipAdEntIfIndex */ case 2: /* ipAdEntIfIndex */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = ifidx + 1; *sint_ptr = ifidx + 1;
} }
break; break;
case 3: /* ipAdEntNetMask */ case 3: /* ipAdEntNetMask */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
*dst = netif->netmask; *dst = netif->netmask;
} }
break; break;
case 4: /* ipAdEntBcastAddr */ case 4: /* ipAdEntBcastAddr */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
/* lwIP oddity, there's no broadcast /* lwIP oddity, there's no broadcast
address in the netif we can rely on */ address in the netif we can rely on */
@ -3125,7 +3127,7 @@ ip_addrentry_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 5: /* ipAdEntReasmMaxSize */ case 5: /* ipAdEntReasmMaxSize */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
#if IP_REASSEMBLY #if IP_REASSEMBLY
/* @todo The theoretical maximum is IP_REASS_MAX_PBUFS * size of the pbufs, /* @todo The theoretical maximum is IP_REASS_MAX_PBUFS * size of the pbufs,
* but only if receiving one fragmented packet at a time. * but only if receiving one fragmented packet at a time.
@ -3249,7 +3251,7 @@ ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* ipRouteDest */ case 1: /* ipRouteDest */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
if (dest.addr == 0) if (dest.addr == 0)
{ {
@ -3265,14 +3267,14 @@ ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 2: /* ipRouteIfIndex */ case 2: /* ipRouteIfIndex */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
snmp_netiftoifindex(netif, sint_ptr); snmp_netiftoifindex(netif, sint_ptr);
} }
break; break;
case 3: /* ipRouteMetric1 */ case 3: /* ipRouteMetric1 */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (dest.addr == 0) if (dest.addr == 0)
{ {
@ -3291,14 +3293,14 @@ ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
case 6: /* ipRouteMetric4 */ case 6: /* ipRouteMetric4 */
case 12: /* ipRouteMetric5 */ case 12: /* ipRouteMetric5 */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
/* not used */ /* not used */
*sint_ptr = -1; *sint_ptr = -1;
} }
break; break;
case 7: /* ipRouteNextHop */ case 7: /* ipRouteNextHop */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
if (dest.addr == 0) if (dest.addr == 0)
{ {
@ -3314,7 +3316,7 @@ ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 8: /* ipRouteType */ case 8: /* ipRouteType */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (dest.addr == 0) if (dest.addr == 0)
{ {
@ -3330,14 +3332,14 @@ ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 9: /* ipRouteProto */ case 9: /* ipRouteProto */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
/* locally defined routes */ /* locally defined routes */
*sint_ptr = 2; *sint_ptr = 2;
} }
break; break;
case 10: /* ipRouteAge */ case 10: /* ipRouteAge */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
/** @todo (sysuptime - timestamp last change) / 100 /** @todo (sysuptime - timestamp last change) / 100
@see snmp_insert_iprteidx_tree() */ @see snmp_insert_iprteidx_tree() */
*sint_ptr = 0; *sint_ptr = 0;
@ -3345,7 +3347,7 @@ ip_rteentry_get_value(struct obj_def *od, u16_t len, void *value)
break; break;
case 11: /* ipRouteMask */ case 11: /* ipRouteMask */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
if (dest.addr == 0) if (dest.addr == 0)
{ {
@ -3443,27 +3445,27 @@ ip_ntomentry_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* ipNetToMediaIfIndex */ case 1: /* ipNetToMediaIfIndex */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = od->id_inst_ptr[1]; *sint_ptr = od->id_inst_ptr[1];
} }
break; break;
case 2: /* ipNetToMediaPhysAddress */ case 2: /* ipNetToMediaPhysAddress */
{ {
struct eth_addr *dst = value; struct eth_addr *dst = (struct eth_addr*)value;
*dst = *ethaddr_ret; *dst = *ethaddr_ret;
} }
break; break;
case 3: /* ipNetToMediaNetAddress */ case 3: /* ipNetToMediaNetAddress */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
*dst = *ipaddr_ret; *dst = *ipaddr_ret;
} }
break; break;
case 4: /* ipNetToMediaType */ case 4: /* ipNetToMediaType */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
/* dynamic (?) */ /* dynamic (?) */
*sint_ptr = 3; *sint_ptr = 3;
} }
@ -3500,7 +3502,7 @@ icmp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
static void static void
icmp_get_value(struct obj_def *od, u16_t len, void *value) icmp_get_value(struct obj_def *od, u16_t len, void *value)
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
u8_t id; u8_t id;
LWIP_UNUSED_ARG(len); LWIP_UNUSED_ARG(len);
@ -3655,8 +3657,8 @@ tcp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
static void static void
tcp_get_value(struct obj_def *od, u16_t len, void *value) tcp_get_value(struct obj_def *od, u16_t len, void *value)
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
u8_t id; u8_t id;
LWIP_UNUSED_ARG(len); LWIP_UNUSED_ARG(len);
@ -3825,7 +3827,7 @@ udp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
static void static void
udp_get_value(struct obj_def *od, u16_t len, void *value) udp_get_value(struct obj_def *od, u16_t len, void *value)
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
u8_t id; u8_t id;
LWIP_UNUSED_ARG(len); LWIP_UNUSED_ARG(len);
@ -3917,13 +3919,13 @@ udpentry_get_value(struct obj_def *od, u16_t len, void *value)
{ {
case 1: /* udpLocalAddress */ case 1: /* udpLocalAddress */
{ {
struct ip_addr *dst = value; struct ip_addr *dst = (struct ip_addr*)value;
*dst = pcb->local_ip; *dst = pcb->local_ip;
} }
break; break;
case 2: /* udpLocalPort */ case 2: /* udpLocalPort */
{ {
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
*sint_ptr = pcb->local_port; *sint_ptr = pcb->local_port;
} }
break; break;
@ -4002,7 +4004,7 @@ snmp_get_object_def(u8_t ident_len, s32_t *ident, struct obj_def *od)
static void static void
snmp_get_value(struct obj_def *od, u16_t len, void *value) snmp_get_value(struct obj_def *od, u16_t len, void *value)
{ {
u32_t *uint_ptr = value; u32_t *uint_ptr = (u32_t*)value;
u8_t id; u8_t id;
LWIP_UNUSED_ARG(len); LWIP_UNUSED_ARG(len);
@ -4116,7 +4118,7 @@ snmp_set_test(struct obj_def *od, u16_t len, void *value)
if (id == 30) if (id == 30)
{ {
/* snmpEnableAuthenTraps */ /* snmpEnableAuthenTraps */
s32_t *sint_ptr = value; s32_t *sint_ptr = (s32_t*)value;
if (snmpenableauthentraps_ptr != &snmpenableauthentraps_default) if (snmpenableauthentraps_ptr != &snmpenableauthentraps_default)
{ {
@ -4150,7 +4152,7 @@ snmp_set_value(struct obj_def *od, u16_t len, void *value)
{ {
/* snmpEnableAuthenTraps */ /* snmpEnableAuthenTraps */
/* @todo @fixme: which kind of pointer is 'value'? s32_t or u8_t??? */ /* @todo @fixme: which kind of pointer is 'value'? s32_t or u8_t??? */
u8_t *ptr = value; u8_t *ptr = (u8_t*)value;
*snmpenableauthentraps_ptr = *ptr; *snmpenableauthentraps_ptr = *ptr;
} }
} }

10
src/core/snmp/msg_in.c
View File

@ -1175,7 +1175,7 @@ snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_
vb = snmp_varbind_alloc(&oid, type, sizeof(s32_t)); vb = snmp_varbind_alloc(&oid, type, sizeof(s32_t));
if (vb != NULL) if (vb != NULL)
{ {
s32_t *vptr = vb->value; s32_t *vptr = (s32_t*)vb->value;
derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, vptr); derr = snmp_asn1_dec_s32t(p, ofs + 1 + len_octets, len, vptr);
snmp_varbind_tail_add(&m_stat->invb, vb); snmp_varbind_tail_add(&m_stat->invb, vb);
@ -1191,7 +1191,7 @@ snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_
vb = snmp_varbind_alloc(&oid, type, sizeof(u32_t)); vb = snmp_varbind_alloc(&oid, type, sizeof(u32_t));
if (vb != NULL) if (vb != NULL)
{ {
u32_t *vptr = vb->value; u32_t *vptr = (u32_t*)vb->value;
derr = snmp_asn1_dec_u32t(p, ofs + 1 + len_octets, len, vptr); derr = snmp_asn1_dec_u32t(p, ofs + 1 + len_octets, len, vptr);
snmp_varbind_tail_add(&m_stat->invb, vb); snmp_varbind_tail_add(&m_stat->invb, vb);
@ -1207,7 +1207,7 @@ snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_
vb = snmp_varbind_alloc(&oid, type, (u8_t)len); vb = snmp_varbind_alloc(&oid, type, (u8_t)len);
if (vb != NULL) if (vb != NULL)
{ {
derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, vb->value_len, vb->value); derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, vb->value_len, (u8_t*)vb->value);
snmp_varbind_tail_add(&m_stat->invb, vb); snmp_varbind_tail_add(&m_stat->invb, vb);
} }
else else
@ -1235,7 +1235,7 @@ snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_
if (vb != NULL) if (vb != NULL)
{ {
u8_t i = oid_value.len; u8_t i = oid_value.len;
s32_t *vptr = vb->value; s32_t *vptr = (s32_t*)vb->value;
while(i > 0) while(i > 0)
{ {
@ -1258,7 +1258,7 @@ snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_
vb = snmp_varbind_alloc(&oid, type, 4); vb = snmp_varbind_alloc(&oid, type, 4);
if (vb != NULL) if (vb != NULL)
{ {
derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, vb->value_len, vb->value); derr = snmp_asn1_dec_raw(p, ofs + 1 + len_octets, len, vb->value_len, (u8_t*)vb->value);
snmp_varbind_tail_add(&m_stat->invb, vb); snmp_varbind_tail_add(&m_stat->invb, vb);
} }
else else

14
src/core/snmp/msg_out.c
View File

@ -435,13 +435,13 @@ snmp_varbind_list_sum(struct snmp_varbind_root *root)
switch (vb->value_type) switch (vb->value_type)
{ {
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG):
sint_ptr = vb->value; sint_ptr = (s32_t*)vb->value;
snmp_asn1_enc_s32t_cnt(*sint_ptr, &vb->vlen); snmp_asn1_enc_s32t_cnt(*sint_ptr, &vb->vlen);
break; break;
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER):
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE):
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS):
uint_ptr = vb->value; uint_ptr = (u32_t*)vb->value;
snmp_asn1_enc_u32t_cnt(*uint_ptr, &vb->vlen); snmp_asn1_enc_u32t_cnt(*uint_ptr, &vb->vlen);
break; break;
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR):
@ -451,7 +451,7 @@ snmp_varbind_list_sum(struct snmp_varbind_root *root)
vb->vlen = vb->value_len; vb->vlen = vb->value_len;
break; break;
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID):
sint_ptr = vb->value; sint_ptr = (s32_t*)vb->value;
snmp_asn1_enc_oid_cnt(vb->value_len / sizeof(s32_t), sint_ptr, &vb->vlen); snmp_asn1_enc_oid_cnt(vb->value_len / sizeof(s32_t), sint_ptr, &vb->vlen);
break; break;
default: default:
@ -649,25 +649,25 @@ snmp_varbind_list_enc(struct snmp_varbind_root *root, struct pbuf *p, u16_t ofs)
switch (vb->value_type) switch (vb->value_type)
{ {
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_INTEG):
sint_ptr = vb->value; sint_ptr = (s32_t*)vb->value;
snmp_asn1_enc_s32t(p, ofs, vb->vlen, *sint_ptr); snmp_asn1_enc_s32t(p, ofs, vb->vlen, *sint_ptr);
break; break;
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_COUNTER):
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_GAUGE):
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_TIMETICKS):
uint_ptr = vb->value; uint_ptr = (u32_t*)vb->value;
snmp_asn1_enc_u32t(p, ofs, vb->vlen, *uint_ptr); snmp_asn1_enc_u32t(p, ofs, vb->vlen, *uint_ptr);
break; break;
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OC_STR):
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_IPADDR):
case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_OPAQUE): case (SNMP_ASN1_APPLIC | SNMP_ASN1_PRIMIT | SNMP_ASN1_OPAQUE):
raw_ptr = vb->value; raw_ptr = (u8_t*)vb->value;
snmp_asn1_enc_raw(p, ofs, vb->vlen, raw_ptr); snmp_asn1_enc_raw(p, ofs, vb->vlen, raw_ptr);
break; break;
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_NUL): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_NUL):
break; break;
case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID): case (SNMP_ASN1_UNIV | SNMP_ASN1_PRIMIT | SNMP_ASN1_OBJ_ID):
sint_ptr = vb->value; sint_ptr = (s32_t*)vb->value;
snmp_asn1_enc_oid(p, ofs, vb->value_len / sizeof(s32_t), sint_ptr); snmp_asn1_enc_oid(p, ofs, vb->value_len / sizeof(s32_t), sint_ptr);
break; break;
default: default: