esp32/modnetwork: fixed wrong nic selection in case of AF_INET

iwahdan88 · iwahdan88 · commit 12dcbdb80d31 · 2019-01-11T15:14:05.000+01:00
diff --git a/esp32/mods/modnetwork.c b/esp32/mods/modnetwork.c
@@ -108,10 +108,15 @@ mp_obj_t mod_network_find_nic(const mod_network_socket_obj_t *s, const uint8_t *
             }
         #endif
         } else if (s->sock_base.u.u_param.domain == AF_INET) {
-            return nic;
+            if(mp_obj_get_type(nic) == (mp_obj_type_t *)&mod_network_nic_type_wlan || mp_obj_get_type(nic) == (mp_obj_type_t *)&mod_network_nic_type_lte)
+            {
+                return nic;
+            }
         }
     }
     nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Network card not available"));
+    //just to silence warning
+    return mp_const_none;
 }
 
 STATIC mp_obj_t network_server_init_helper(mp_obj_t self, const mp_arg_val_t *args) {

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,15 @@ mp_obj_t mod_network_find_nic(const mod_network_socket_obj_t s, const uint8_t `
`108`	`108`	`}`
`109`	`109`	`#endif`
`110`	`110`	`} else if (s->sock_base.u.u_param.domain == AF_INET) {`
`111`		`- return nic;`
	`111`	`+ if(mp_obj_get_type(nic) == (mp_obj_type_t )&mod_network_nic_type_wlan \|\| mp_obj_get_type(nic) == (mp_obj_type_t )&mod_network_nic_type_lte)`
	`112`	`+ {`
	`113`	`+ return nic;`
	`114`	`+ }`
`112`	`115`	`}`
`113`	`116`	`}`
`114`	`117`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Network card not available"));`
	`118`	`+ //just to silence warning`
	`119`	`+ return mp_const_none;`
`115`	`120`	`}`
`116`	`121`
`117`	`122`	`STATIC mp_obj_t network_server_init_helper(mp_obj_t self, const mp_arg_val_t *args) {`