From 45a055840dd59198dbefcf39103bb4255603b2ee Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Thu, 22 Nov 2018 13:14:52 +0100 Subject: [PATCH] snmp_traps.c: Portability fix: Don't use non-constant initializers --- src/apps/snmp/snmp_traps.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/apps/snmp/snmp_traps.c b/src/apps/snmp/snmp_traps.c index 4edbd410..3f83f2df 100644 --- a/src/apps/snmp/snmp_traps.c +++ b/src/apps/snmp/snmp_traps.c @@ -356,7 +356,7 @@ snmp_send_trap_or_notification_or_inform_generic(struct snmp_msg_trap *trap_msg, struct snmp_varbind snmp_v2_special_varbinds[] = { /* First varbind is used to store sysUpTime */ { - &snmp_v2_special_varbinds[1], /* *next */ + NULL, /* *next */ NULL, /* *prev */ { /* oid */ 8, /* oid len */ @@ -364,12 +364,12 @@ snmp_send_trap_or_notification_or_inform_generic(struct snmp_msg_trap *trap_msg, }, SNMP_ASN1_TYPE_TIMETICKS, /* type */ sizeof(u32_t), /* value_len */ - ×tamp /* value */ + NULL /* value */ }, /* Second varbind is used to store snmpTrapOID */ { - varbinds, /* *next */ - &snmp_v2_special_varbinds[0], /* *prev */ + NULL, /* *next */ + NULL, /* *prev */ { /* oid */ 10, /* oid len */ {1, 3, 6, 1, 6, 3, 1, 1, 4, 1} /* oid for snmpTrapOID */ @@ -382,6 +382,13 @@ snmp_send_trap_or_notification_or_inform_generic(struct snmp_msg_trap *trap_msg, LWIP_ASSERT_CORE_LOCKED(); + snmp_v2_special_varbinds[0].next = &snmp_v2_special_varbinds[1]; + snmp_v2_special_varbinds[1].prev = &snmp_v2_special_varbinds[0]; + + snmp_v2_special_varbinds[0].value = ×tamp; + + snmp_v2_special_varbinds[1].next = varbinds; + /* see rfc3584 */ if (trap_msg->snmp_version == SNMP_VERSION_2c) { struct snmp_obj_id snmp_trap_oid = { 0 }; /* used for converting SNMPv1 generic/specific trap parameter to SNMPv2 snmpTrapOID */