Skip to content

Commit

Permalink
removed #define USE_WIFI_RANGE_EXTENDER_PORTADD, because new framewor…
Browse files Browse the repository at this point in the history
…k-arduinoespressif32 @ 3.1.0+sha.22a3b096 is available with CONFIG_LWIP_IPV4_NAPT_PORTMAP=y
  • Loading branch information
pharaocurt committed Sep 27, 2024
1 parent a4d7bf9 commit 201f29e
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions tasmota/tasmota_xdrv_driver/xdrv_58_range_extender.ino
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,7 @@ Backlog RgxSSID rangeextender ; RgxPassword securepassword ; RgxAddress 192.168.
#else
#error CONFIG_LWIP_IPV4_NAPT not set, arduino-esp32 v2 or later required with CONFIG_LWIP_IPV4_NAPT support
#endif // CONFIG_LWIP_IPV4_NAPT
#ifdef IP_NAPT_PORTMAP
// All good
#else
#warning IP_NAPT_PORTMAP not set, arduino-esp32 v2 or later required with IP_NAPT_PORTMAP support
#ifdef USE_WIFI_RANGE_EXTENDER_PORTADD
#undef USE_WIFI_RANGE_EXTENDER_PORTADD
#endif // USE_WIFI_RANGE_EXTENDER_PORTADD
#endif // IP_NAPT_PORTMAP
#endif // CONFIG_LWIP_IPV4_NAPT
#endif // CONFIG_LWIP_IP_FORWARD
#endif // ESP32

const char kDrvRgxCommands[] PROGMEM = "Rgx|" // Prefix
Expand All @@ -101,10 +93,8 @@ const char kDrvRgxCommands[] PROGMEM = "Rgx|" // Prefix
#ifdef USE_WIFI_RANGE_EXTENDER_NAPT
"|"
"NAPT"
#ifdef USE_WIFI_RANGE_EXTENDER_PORTADD
"|"
"Port"
#endif
#endif // USE_WIFI_RANGE_EXTENDER_NAPT
"|"
"Clients"
Expand All @@ -119,9 +109,7 @@ void (*const DrvRgxCommand[])(void) PROGMEM = {
&CmndRgxPassword,
#ifdef USE_WIFI_RANGE_EXTENDER_NAPT
&CmndRgxNAPT,
#ifdef USE_WIFI_RANGE_EXTENDER_PORTADD
&CmndRgxPort,
#endif
#endif // USE_WIFI_RANGE_EXTENDER_NAPT
&CmndRgxClients,
&CmndRgxAddresses,
Expand Down Expand Up @@ -301,7 +289,6 @@ void CmndRgxNAPT(void)
ResponseCmndStateText(Settings->sbflag1.range_extender_napt);
}

#ifdef USE_WIFI_RANGE_EXTENDER_PORTADD
// CmndRgxPort helper: Do port map and set response if successful
void CmndRgxPortMap(uint8_t proto, uint16_t gw_port, uint32_t dst_ip, uint16_t dst_port)
{
Expand Down Expand Up @@ -385,7 +372,6 @@ void CmndRgxPort(void)
wifi_softap_free_station_info();
#endif // ESP8266
}
#endif
#endif // USE_WIFI_RANGE_EXTENDER_NAPT

void ResponseRgxConfig(void)
Expand Down

0 comments on commit 201f29e

Please sign in to comment.