jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-21 09:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert UDP begin() (#17431)

Browse Source
This commit is contained in:
s-hadinger 2022-12-18 14:28:05 +01:00 committed by GitHub
parent b33d2d540f
commit 318c83cb36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libesp32/berry_tasmota/src/be_udp_lib.cpp
View File

@ -14,7 +14,6 @@
// extern int be_udp_begin_mcast(bvm *vm); // extern int be_udp_begin_mcast(bvm *vm);
#include <Arduino.h> #include <Arduino.h>
#include <WiFiGeneric.h>
#include <WiFiUdp.h> #include <WiFiUdp.h>
#include "be_mapping.h" #include "be_mapping.h"
@ -22,6 +21,8 @@
extern void AddLog(uint32_t loglevel, PGM_P formatP, ...); extern void AddLog(uint32_t loglevel, PGM_P formatP, ...);
enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE}; enum LoggingLevels {LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE};
extern bool WifiHostByName(const char* aHostname, IPAddress & aResult);
extern "C" { extern "C" {
// init() // init()
@ -41,19 +42,17 @@ extern "C" {
return be_call_c_func(vm, (void*) &be_udp_deinit_ntv, "=.p", ""); return be_call_c_func(vm, (void*) &be_udp_deinit_ntv, "=.p", "");
} }
// udp.begin(address:string, port:int) -> bool // udp.begin(interface:string, port:int) -> bool
int32_t be_udp_begin_ntv(WiFiUDP *udp, int32_t port) { int32_t be_udp_begin_ntv(WiFiUDP *udp, const char *host, int32_t port) {
IPAddress addr; IPAddress addr;
// AddLog(LOG_LEVEL_DEBUG, "BRY: udp.begin listening to '%s'", addr.toString().c_str()); // if no host or host is "" then we defult to INADDR_ANY
if(host && (*host != 0) && !WifiHostByName(host, addr)){
return 0;
}
return udp->begin(addr, port); return udp->begin(addr, port);
} }
int32_t be_udp_begin(struct bvm *vm) { int32_t be_udp_begin(struct bvm *vm) {
if (be_top(vm) >= 3 && be_isstring(vm, 2)) { return be_call_c_func(vm, (void*) &be_udp_begin_ntv, "b", ".si");
// legacy string parameter, now ignored
return be_call_c_func(vm, (void*) &be_udp_begin_ntv, "b", ".-i");
} else {
return be_call_c_func(vm, (void*) &be_udp_begin_ntv, "b", ".i");
}
} }
// udp.stop() -> nil // udp.stop() -> nil
@ -67,7 +66,7 @@ extern "C" {
// udp.begin_multicast(address:string, port:int) -> nil // udp.begin_multicast(address:string, port:int) -> nil
int32_t be_udp_begin_mcast_ntv(WiFiUDP *udp, const char *host, int32_t port) { int32_t be_udp_begin_mcast_ntv(WiFiUDP *udp, const char *host, int32_t port) {
IPAddress addr; IPAddress addr;
if(!WiFiGenericClass::hostByName(host, addr)){ if(!WifiHostByName(host, addr)){
return 0; return 0;
} }
return udp->WiFiUDP::beginMulticast(addr, port); return udp->WiFiUDP::beginMulticast(addr, port);
@ -79,7 +78,7 @@ extern "C" {
// udp.send(address:string, port:int, payload:bytes) -> bool // udp.send(address:string, port:int, payload:bytes) -> bool
int32_t be_udp_send_ntv(WiFiUDP *udp, const char *host, int32_t port, const uint8_t* buf, int32_t len) { int32_t be_udp_send_ntv(WiFiUDP *udp, const char *host, int32_t port, const uint8_t* buf, int32_t len) {
IPAddress addr; IPAddress addr;
if (!WiFiGenericClass::hostByName(host, addr)){ if (!WifiHostByName(host, addr)){
return 0; return 0;
} }
// AddLog(LOG_LEVEL_DEBUG, "BRY: udp.begin got host '%s'", addr.toString().c_str()); // AddLog(LOG_LEVEL_DEBUG, "BRY: udp.begin got host '%s'", addr.toString().c_str());