mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-30 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch by Freddie Chopin: SNMP: const-correctness around snmp traps and enterprise

Browse Source
This commit is contained in:
sg 2015-02-14 15:11:44 +01:00
parent e579e98469
commit e22c815444
7 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -179,6 +179,9 @@ HISTORY
++ Bugfixes: ++ Bugfixes:
2015-02-15: patches by Freddie Chopin
* snmp*: made community writable, fixed some const pointers
2015-02-13: Simon Goldschmidt 2015-02-13: Simon Goldschmidt
* msg_in.c: fixed bug #22070 "MIB_OBJECT_WRITE_ONLY not implemented in SNMP" * msg_in.c: fixed bug #22070 "MIB_OBJECT_WRITE_ONLY not implemented in SNMP"

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

@ -139,7 +139,7 @@ snmp_asn1_enc_s32t_cnt(s32_t value, u16_t *octets_needed)
* @param octets_needed points to the return value * @param octets_needed points to the return value
*/ */
void void
snmp_asn1_enc_oid_cnt(u8_t ident_len, s32_t *ident, u16_t *octets_needed) snmp_asn1_enc_oid_cnt(u8_t ident_len, const s32_t *ident, u16_t *octets_needed)
{ {
s32_t sub_id; s32_t sub_id;
u8_t cnt; u8_t cnt;
@ -435,7 +435,7 @@ snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value)
* @return ERR_OK if successful, ERR_ARG if we can't (or won't) encode * @return ERR_OK if successful, ERR_ARG if we can't (or won't) encode
*/ */
err_t err_t
snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident) snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, const s32_t *ident)
{ {
u16_t plen, base; u16_t plen, base;
u8_t *msg_ptr; u8_t *msg_ptr;

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

@ -2022,7 +2022,7 @@ void snmp_inc_snmpouttraps(void)
snmpouttraps++; snmpouttraps++;
} }
void snmp_get_snmpgrpid_ptr(struct snmp_obj_id **oid) void snmp_get_snmpgrpid_ptr(const struct snmp_obj_id **oid)
{ {
*oid = &snmpgrp_id; *oid = &snmpgrp_id;
} }

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

@ -218,7 +218,7 @@ snmp_send_response(struct snmp_msg_pstat *m_stat)
* (sysObjectID) for specific traps. * (sysObjectID) for specific traps.
*/ */
err_t err_t
snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap) snmp_send_trap(s8_t generic_trap, const struct snmp_obj_id *eoid, s32_t specific_trap)
{ {
struct snmp_trap_dst *td; struct snmp_trap_dst *td;
struct netif *dst_if; struct netif *dst_if;

2
src/include/lwip/snmp.h
View File

@ -225,7 +225,7 @@ void snmp_inc_snmpoutgetnexts(void);
void snmp_inc_snmpoutsetrequests(void); void snmp_inc_snmpoutsetrequests(void);
void snmp_inc_snmpoutgetresponses(void); void snmp_inc_snmpoutgetresponses(void);
void snmp_inc_snmpouttraps(void); void snmp_inc_snmpouttraps(void);
void snmp_get_snmpgrpid_ptr(struct snmp_obj_id **oid); void snmp_get_snmpgrpid_ptr(const struct snmp_obj_id **oid);
void snmp_set_snmpenableauthentraps(u8_t *value); void snmp_set_snmpenableauthentraps(u8_t *value);
void snmp_get_snmpenableauthentraps(u8_t *value); void snmp_get_snmpenableauthentraps(u8_t *value);

4
src/include/lwip/snmp_asn1.h
View File

@ -84,12 +84,12 @@ err_t snmp_asn1_dec_raw(struct pbuf *p, u16_t ofs, u16_t len, u16_t raw_len, u8_
void snmp_asn1_enc_length_cnt(u16_t length, u8_t *octets_needed); void snmp_asn1_enc_length_cnt(u16_t length, u8_t *octets_needed);
void snmp_asn1_enc_u32t_cnt(u32_t value, u16_t *octets_needed); void snmp_asn1_enc_u32t_cnt(u32_t value, u16_t *octets_needed);
void snmp_asn1_enc_s32t_cnt(s32_t value, u16_t *octets_needed); void snmp_asn1_enc_s32t_cnt(s32_t value, u16_t *octets_needed);
void snmp_asn1_enc_oid_cnt(u8_t ident_len, s32_t *ident, u16_t *octets_needed); void snmp_asn1_enc_oid_cnt(u8_t ident_len, const s32_t *ident, u16_t *octets_needed);
err_t snmp_asn1_enc_type(struct pbuf *p, u16_t ofs, u8_t type); err_t snmp_asn1_enc_type(struct pbuf *p, u16_t ofs, u8_t type);
err_t snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length); err_t snmp_asn1_enc_length(struct pbuf *p, u16_t ofs, u16_t length);
err_t snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value); err_t snmp_asn1_enc_u32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, u32_t value);
err_t snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value); err_t snmp_asn1_enc_s32t(struct pbuf *p, u16_t ofs, u16_t octets_needed, s32_t value);
err_t snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, s32_t *ident); err_t snmp_asn1_enc_oid(struct pbuf *p, u16_t ofs, u8_t ident_len, const s32_t *ident);
err_t snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw); err_t snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw);
#ifdef __cplusplus #ifdef __cplusplus

4
src/include/lwip/snmp_msg.h
View File

@ -265,7 +265,7 @@ struct snmp_msg_trap
ip_addr_t dip; ip_addr_t dip;
/* source enterprise ID (sysObjectID) */ /* source enterprise ID (sysObjectID) */
struct snmp_obj_id *enterprise; const struct snmp_obj_id *enterprise;
/* source IP address, raw network order format */ /* source IP address, raw network order format */
u8_t sip_raw[4]; u8_t sip_raw[4];
/* generic trap code */ /* generic trap code */
@ -302,7 +302,7 @@ struct snmp_varbind* snmp_varbind_tail_remove(struct snmp_varbind_root *root);
/** Handle an internal (recv) or external (private response) event. */ /** Handle an internal (recv) or external (private response) event. */
void snmp_msg_event(u8_t request_id); void snmp_msg_event(u8_t request_id);
err_t snmp_send_response(struct snmp_msg_pstat *m_stat); err_t snmp_send_response(struct snmp_msg_pstat *m_stat);
err_t snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap); err_t snmp_send_trap(s8_t generic_trap, const struct snmp_obj_id *eoid, s32_t specific_trap);
void snmp_coldstart_trap(void); void snmp_coldstart_trap(void);
void snmp_authfail_trap(void); void snmp_authfail_trap(void);