Skip to content

Fix strncpy sizeof + missing WiFi include for ESP32 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdamman wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix strncpy sizeof + missing WiFi include for ESP32 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d260867
Fix strncpy sizeof
cdamman Dec 16, 2024
9e9b940
Fix missing WiFi include for ESP32
cdamman Dec 23, 2024
7b6f9ca
Improve HTTPS support
cdamman Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/nRF905API/fan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ enum { FAN_FRAME_SETVOLTAGE = 0x01, // Set speed (voltage / percentage)
FAN_NETWORK_JOIN_OPEN = 0x06,
FAN_TYPE_FAN_SETTINGS = 0x07, // Current settings, sent by fan in reply to 0x01, 0x02, 0x10
FAN_FRAME_0B = 0x0B,
FAN_FRAME_04 = 0x04,
FAN_NETWORK_JOIN_ACK = 0x0C,
// FAN_NETWORK_JOIN_FINISH = 0x0D,
FAN_TYPE_QUERY_NETWORK = 0x0D,
Expand Down
2 changes: 2 additions & 0 deletions src/nRF905API/nRF905API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#ifndef __NRF905API_H__
#define __NRF905API_H__

#include "config.h"

#if NRF905API_HTTPS == 1
#include "certificate.h"
#endif
Expand Down
11 changes: 7 additions & 4 deletions src/nRF905API/nRF905API.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ void setup() {
if (checkNVRAMIsValidData() == false) {
loadNVRAMDefaults();
}
strncpy(config.http_username, "", sizeof(MAX_HTTP_USERNAME));
strncpy(config.http_password, "", sizeof(MAX_HTTP_PASSWORD));
strncpy(config.http_username, "", MAX_HTTP_USERNAME);
strncpy(config.http_password, "", MAX_HTTP_PASSWORD);

server.begin();
htmlAddHandlers();
Expand Down Expand Up @@ -193,6 +193,9 @@ void setup() {
// Set the certificates from PMEM (if using DRAM remove the _P from the call)
server.getServer().setRSACert(new BearSSL::X509List(serverCert), new BearSSL::PrivateKey(serverKey));
// server.getServer().setServerKeyAndCert_P(rsakey, sizeof(rsakey), x509, sizeof(x509));
#ifdef ARDUINO_ARCH_ESP8266
server.getServer().setBufferSizes(2048, 837);
#endif
#endif

// Start the HTTP server
Expand Down Expand Up @@ -235,9 +238,9 @@ void setup() {
rxnum = 0;
rx_buffer_overflow = false;
Serial.printf("nRF905: switching to receive mode\n");
Serial.printf("mode=%i", nrf905->getMode());
Serial.printf("mode=%i\n", nrf905->getMode());
nrf905->setModeReceive();
Serial.printf("mode=%i", nrf905->getMode());
Serial.printf("mode=%i\n", nrf905->getMode());
Serial.printf("Setup done\n");
}

Expand Down
3 changes: 0 additions & 3 deletions src/nRF905API/src/api/json_api_v1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,6 @@ void apiv1_status() {
server.sendContent(",\"system_status\":{");
server.sendContent("\"board\":\"" + board->get_arch() + "\",");
server.sendContent("\"firmware_version\":\"" + String(FPSTR(firmware_version)) + "\",");
#if NRF905API_NTP == 1
server.sendContent("\"system_time\":\"" + timeClient.getFormattedTime() + "\",");
#endif
server.sendContent("\"restart_reason\":" + String(board->restartReason()) + ",");
server.sendContent("\"cpu_id\":\"" + String(board->get_cpu_id(), HEX) + "\",");
server.sendContent("\"cpu_frequency\":" + String(board->getCPUFreqMhz()) + ",");
Expand Down
2 changes: 1 addition & 1 deletion src/nRF905API/src/hardware/bcm2835.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifdef RPI

#include <SPI.h>
#include "esp32.h"
#include "../../board.h" // board-> functions
#include "../../utils.h" // serialPrintHex()
#include "esp32.h"

// Create an instance of the server
#if NRF905API_HTTPS == 1
Expand Down
6 changes: 3 additions & 3 deletions src/nRF905API/src/hardware/esp32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
#include <EEPROM.h>
#include <SPI.h>
#include <rom/rtc.h> // RESET_REASON
#include "esp32.h"
#include "../../board.h" // board-> functions
#include "../../nvram.h" // NVRAMBuffer
#include "../../utils.h" // serialPrintHex()
#include "esp32.h"

// Create an instance of the server
#if NRF905API_HTTPS == 1
Expand Down Expand Up @@ -208,11 +208,11 @@ void Board::set_hostname(const char *hostname) {
}

String Board::get_localIPv6(void) {
return WiFi.localIPv6().toString();
return WiFi.localIP().toString();
}

bool Board::enable_IPv6(void) {
return WiFi.enableIpV6();
return WiFi.enableIPv6();
}

void Board::setPinMode(const uint8_t pin, const uint8_t mode) {
Expand Down
1 change: 1 addition & 0 deletions src/nRF905API/src/hardware/esp32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <SPI.h> // SPIClass

#include <WiFi.h>
#if NRF905API_HTTPS == 1
#include <WebServerSecure.h>
extern WebServerSecure server;
Expand Down
2 changes: 1 addition & 1 deletion src/nRF905API/src/hardware/esp8266.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

#include <EEPROM.h>
#include <SPI.h>
#include "esp8266.h"
#include "../../board.h" // board-> functions
#include "../../nvram.h" // NVRAMBuffer
#include "../../utils.h" // serialPrintHex()
#include "esp8266.h"

// Create an instance of the server
#if NRF905API_HTTPS == 1
Expand Down
16 changes: 8 additions & 8 deletions src/nRF905API/src/html/configwizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void htmlConfigWizardLanguage(void) {

if (server.method() == HTTP_POST) {
if (server.hasArg("language")) {
strncpy(config.language, server.arg("language").c_str(), sizeof(MAX_LANGUAGE));
strncpy(config.language, server.arg("language").c_str(), MAX_LANGUAGE);
}
}

Expand Down Expand Up @@ -78,10 +78,10 @@ void htmlConfigWizardAuthentication(void) {

if (server.method() == HTTP_POST) {
if (server.hasArg("http_username")) {
strncpy(config.http_username, server.arg("http_username").c_str(), sizeof(MAX_HTTP_USERNAME));
strncpy(config.http_username, server.arg("http_username").c_str(), MAX_HTTP_USERNAME);
}
if (server.hasArg("http_password")) {
strncpy(config.http_password, server.arg("http_password").c_str(), sizeof(MAX_HTTP_PASSWORD));
strncpy(config.http_password, server.arg("http_password").c_str(), MAX_HTTP_PASSWORD);
}
}

Expand Down Expand Up @@ -121,7 +121,7 @@ void htmlConfigWizardWifi(void) {

if (server.method() == HTTP_POST) {
if (server.hasArg("hostname")) {
strncpy(config.wifi_hostname, server.arg("hostname").c_str(), sizeof(MAX_WIFI_HOSTNAME));
strncpy(config.wifi_hostname, server.arg("hostname").c_str(), sizeof(config.wifi_hostname));
}
if (server.hasArg("ssid")) {
strncpy(config.wifi_ssid, server.arg("ssid").c_str(), sizeof(config.wifi_ssid));
Expand Down Expand Up @@ -421,9 +421,9 @@ void htmlConfigWizardAdvanced(void) {
if (server.method() == HTTP_POST) {
/* TODO input validation */
if (server.hasArg("ntpserver"))
strncpy(config.ntp_server, server.arg("ntpserver").c_str(), sizeof(MAX_NTPSERVER));
strncpy(config.ntp_server, server.arg("ntpserver").c_str(), MAX_NTPSERVER);
else
strncpy(config.ntp_server, DEFAULT_NTP_SERVER, sizeof(MAX_NTPSERVER));
strncpy(config.ntp_server, DEFAULT_NTP_SERVER, MAX_NTPSERVER);
if (server.hasArg("ntpoffset"))
config.ntp_offset = server.arg("ntpoffset").toInt();
else
Expand All @@ -433,9 +433,9 @@ void htmlConfigWizardAdvanced(void) {
else
config.ntp_interval = DEFAULT_NTP_INTERVAL;
if (server.hasArg("ota_password"))
strncpy(config.ota_password, server.arg("ota_password").c_str(), sizeof(MAX_OTA_PASSWORD));
strncpy(config.ota_password, server.arg("ota_password").c_str(), MAX_OTA_PASSWORD);
else
strncpy(config.ota_password, DEFAULT_OTA_PASSWORD, sizeof(MAX_OTA_PASSWORD));
strncpy(config.ota_password, DEFAULT_OTA_PASSWORD, MAX_OTA_PASSWORD);
if (server.hasArg("ota_port"))
config.ota_port = server.arg("ota_port").toInt();
else
Expand Down
14 changes: 7 additions & 7 deletions src/nRF905API/src/html/html.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ void htmlConfig() {
/* TODO input validation */
config.signature = NVRAM_SIGNATURE;
config.version = NVRAM_VERSION;
strncpy(config.wifi_hostname, server.arg("hostname").c_str(), sizeof(MAX_WIFI_HOSTNAME));
strncpy(config.wifi_hostname, server.arg("hostname").c_str(), MAX_WIFI_HOSTNAME);
strncpy(config.wifi_ssid, server.arg("ssid").c_str(), sizeof(config.wifi_ssid));
strncpy(config.wifi_password, server.arg("wifi_password").c_str(), sizeof(config.wifi_password));
if (server.hasArg("ntpserver"))
strncpy(config.ntp_server, server.arg("ntpserver").c_str(), sizeof(MAX_NTPSERVER));
strncpy(config.ntp_server, server.arg("ntpserver").c_str(), MAX_NTPSERVER);
else
strncpy(config.ntp_server, DEFAULT_NTP_SERVER, sizeof(MAX_NTPSERVER));
strncpy(config.ntp_server, DEFAULT_NTP_SERVER, MAX_NTPSERVER);
if (server.hasArg("ntpoffset"))
config.ntp_offset = server.arg("ntpoffset").toInt();
else
Expand All @@ -61,15 +61,15 @@ void htmlConfig() {
else
config.ntp_interval = DEFAULT_NTP_INTERVAL;
if (server.hasArg("ota_password"))
strncpy(config.ota_password, server.arg("ota_password").c_str(), sizeof(MAX_OTA_PASSWORD));
strncpy(config.ota_password, server.arg("ota_password").c_str(), MAX_OTA_PASSWORD);
else
strncpy(config.ota_password, DEFAULT_OTA_PASSWORD, sizeof(MAX_OTA_PASSWORD));
strncpy(config.ota_password, DEFAULT_OTA_PASSWORD, MAX_OTA_PASSWORD);
if (server.hasArg("ota_port"))
config.ota_port = server.arg("ota_port").toInt();
else
config.ota_port = DEFAULT_OTA_PORT;
strncpy(config.http_username, server.arg("http_username").c_str(), sizeof(MAX_HTTP_USERNAME));
strncpy(config.http_password, server.arg("http_password").c_str(), sizeof(MAX_HTTP_PASSWORD));
strncpy(config.http_username, server.arg("http_username").c_str(), MAX_HTTP_USERNAME);
strncpy(config.http_password, server.arg("http_password").c_str(), MAX_HTTP_PASSWORD);

switch (server.arg("profile").toInt()) {
case FAN_PROFILE_ZEHNDER : // Zehnder
Expand Down