From 77e0f77850f9447bd00e58fc640f71bf7b20c2ed Mon Sep 17 00:00:00 2001
From: christiaans <christiaans>
Date: Mon, 27 Nov 2006 08:43:10 +0000
Subject: [PATCH] Added snmp_send_trap() parameter, caller must pass enterprise
 id for enterprise secific traps.

---
 src/core/snmp/msg_out.c     | 9 +++++----
 src/include/lwip/snmp_msg.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/snmp/msg_out.c b/src/core/snmp/msg_out.c
index 1df0d1c1..c8961c9b 100644
--- a/src/core/snmp/msg_out.c
+++ b/src/core/snmp/msg_out.c
@@ -209,6 +209,7 @@ snmp_send_response(struct snmp_msg_pstat *m_stat)
  * Sends an generic or enterprise specific trap message.
  *
  * @param generic_trap is the trap code
+ * @param eoid points to enterprise object identifier
  * @param specific_trap used for enterprise traps when generic_trap == 6
  * @return ERR_OK when success, ERR_MEM if we're out of memory
  *
@@ -220,7 +221,7 @@ snmp_send_response(struct snmp_msg_pstat *m_stat)
  * (sysObjectID) for specific traps.
  */
 err_t
-snmp_send_trap(s8_t generic_trap, s32_t specific_trap)
+snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap)
 {
   struct snmp_trap_dst *td;
   struct netif *dst_if;
@@ -246,7 +247,7 @@ snmp_send_trap(s8_t generic_trap, s32_t specific_trap)
       if (generic_trap == SNMP_GENTRAP_ENTERPRISESPC)
       {
         /* enterprise-Specific trap */
-        snmp_get_sysobjid_ptr(&trap_msg.enterprise);
+        trap_msg.enterprise = eoid;
       }
       else
       {
@@ -295,7 +296,7 @@ snmp_coldstart_trap(void)
   trap_msg.outvb.head = NULL;
   trap_msg.outvb.tail = NULL;
   trap_msg.outvb.count = 0;
-  snmp_send_trap(SNMP_GENTRAP_COLDSTART, 0);
+  snmp_send_trap(SNMP_GENTRAP_COLDSTART, NULL, 0);
 }
 
 void
@@ -308,7 +309,7 @@ snmp_authfail_trap(void)
     trap_msg.outvb.head = NULL;
     trap_msg.outvb.tail = NULL;
     trap_msg.outvb.count = 0;
-    snmp_send_trap(SNMP_GENTRAP_AUTHFAIL, 0);
+    snmp_send_trap(SNMP_GENTRAP_AUTHFAIL, NULL, 0);
   }
 }
 
diff --git a/src/include/lwip/snmp_msg.h b/src/include/lwip/snmp_msg.h
index d1d0da04..66faedd4 100644
--- a/src/include/lwip/snmp_msg.h
+++ b/src/include/lwip/snmp_msg.h
@@ -285,7 +285,7 @@ struct snmp_varbind* snmp_varbind_tail_remove(struct snmp_varbind_root *root);
 /** Handle an internal (recv) or external (private response) event. */
 void snmp_msg_event(u8_t request_id);
 err_t snmp_send_response(struct snmp_msg_pstat *m_stat);
-err_t snmp_send_trap(s8_t generic_trap, s32_t specific_trap);
+err_t snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap);
 void snmp_coldstart_trap(void);
 void snmp_authfail_trap(void);