message handling iface updated

1 files changed, 6 insertions, 5 deletions

diff --git a/fw/fe310/eos/wifi.c b/fw/fe310/eos/wifi.c
index d58c0eb..6d39332 100644
--- a/fw/fe310/eos/wifi.c
+++ b/fw/fe310/eos/wifi.c
@@ -11,14 +11,16 @@
 static eos_evt_handler_t evt_handler[EOS_WIFI_MAX_MTYPE];
 
 static void wifi_handle_evt(unsigned char type, unsigned char *buffer, uint16_t len) {
+    unsigned char mtype;
+
     if ((buffer == NULL) || (len < 1)) {
         eos_net_bad_handler(type, buffer, len);
         return;
     }
 
-    unsigned char mtype = buffer[0];
-    if (mtype < EOS_WIFI_MAX_MTYPE) {
-        evt_handler[mtype](type, buffer, len);
+    mtype = buffer[0];
+    if ((mtype < EOS_WIFI_MAX_MTYPE) && evt_handler[mtype]) {
+        evt_handler[mtype](mtype, buffer, len);
     } else {
         eos_net_bad_handler(type, buffer, len);
     }
@@ -28,13 +30,12 @@ void eos_wifi_init(void) {
     int i;
 
     for (i=0; i<EOS_WIFI_MAX_MTYPE; i++) {
-        evt_handler[i] = eos_net_bad_handler;
+        evt_handler[i] = NULL;
     }
     eos_net_set_handler(EOS_NET_MTYPE_WIFI, wifi_handle_evt);
 }
 
 void eos_wifi_set_handler(unsigned char mtype, eos_evt_handler_t handler) {
-    if (handler == NULL) handler = eos_net_bad_handler;
     if (mtype < EOS_WIFI_MAX_MTYPE) evt_handler[mtype] = handler;
 }