Merge e46039adb9 into d0efd9ef7b

snmp: forgot to change OID length
LwipMibCompiler: compile read-create object as read-write in generated C code
2024-11-04 23:29:25 +00:00 · 2024-02-20 13:47:22 +08:00 · 2023-12-30 23:30:06 +08:00 · 2023-12-30 23:19:59 +08:00 · 2023-12-30 23:15:52 +08:00
2 changed files with 11 additions and 11 deletions
--- a/contrib/apps/LwipMibCompiler/LwipMibCompiler/Program.cs
+++ b/contrib/apps/LwipMibCompiler/LwipMibCompiler/Program.cs
@ -353,7 +353,7 @@ namespace LwipMibCompiler
 			}
 			else if (ote.Access == MaxAccess.readCreate)
 			{
-				result.AccessMode = SnmpAccessMode.ReadOnly;
+				result.AccessMode = SnmpAccessMode.ReadWrite;
 			}
 			else if (ignoreAccessibleFlag && (ote.Access == MaxAccess.notAccessible))
 			{
--- a/src/apps/snmp/snmp_traps.c
+++ b/src/apps/snmp/snmp_traps.c
@ -256,7 +256,7 @@ snmp_prepare_trap_oid(struct snmp_obj_id *dest_snmp_trap_oid, const struct snmp_
    if (sizeof(dest_snmp_trap_oid->id) >= sizeof(snmpTrapOID)) {
      MEMCPY(&dest_snmp_trap_oid->id, snmpTrapOID , sizeof(snmpTrapOID));
      dest_snmp_trap_oid->len = LWIP_ARRAYSIZE(snmpTrapOID);
-      dest_snmp_trap_oid->id[dest_snmp_trap_oid->len++] = specific_trap + 1;
+      dest_snmp_trap_oid->id[dest_snmp_trap_oid->len++] = generic_trap + 1;
    } else {
      err = ERR_MEM;
    }
@ -359,8 +359,8 @@ snmp_send_trap_or_notification_or_inform_generic(struct snmp_msg_trap *trap_msg,
                                                       NULL,                            /* *next */
                                                       NULL,                            /* *prev */
                                                       {                                /* oid */
-                                                         8,                             /* oid len */
-                                                         {1, 3, 6, 1, 2, 1, 1, 3}       /* oid for sysUpTime */
+                                                         9,                             /* oid len */
+                                                         {1, 3, 6, 1, 2, 1, 1, 3, 0}       /* oid for sysUpTime.0 */
                                                       },
                                                       SNMP_ASN1_TYPE_TIMETICKS,        /* type */
                                                       sizeof(u32_t),                   /* value_len */
@ -371,8 +371,8 @@ snmp_send_trap_or_notification_or_inform_generic(struct snmp_msg_trap *trap_msg,
                                                       NULL,                            /* *next */
                                                       NULL,                            /* *prev */
                                                       {                                /* oid */
-                                                         10,                            /* oid len */
-                                                         {1, 3, 6, 1, 6, 3, 1, 1, 4, 1} /* oid for snmpTrapOID */
+                                                         11,                            /* oid len */
+                                                         {1, 3, 6, 1, 6, 3, 1, 1, 4, 1, 0} /* oid for snmpTrapOID.0 */
                                                       },
                                                       SNMP_ASN1_TYPE_OBJECT_ID,        /* type */
                                                       0,                               /* value_len */
Author	SHA1	Message	Date
qazmko1029	3d206b130a	Merge `e46039adb9` into `d0efd9ef7b`	2024-02-20 13:47:22 +08:00
qazmko1029	e46039adb9	snmp: forgot to change OID length	2023-12-30 23:30:06 +08:00
qazmko1029	5c8a07cd87	LwipMibCompiler: compile read-create object as read-write in generated C code	2023-12-30 23:19:59 +08:00
qazmko1029	53c3e8165a	snmp: fix SNMPv2 generic trap ID and special varbinds OID to send according to rfc3584	2023-12-30 23:15:52 +08:00