wt/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-12 10:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unaligned reg access

Browse Source
This commit is contained in:
cpq
2026-06-15 12:53:01 +01:00
parent f85f550f16
commit 4b1306d2a5
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mongoose.c
+7 -5
View File
@@ -9903,8 +9903,8 @@ void mg_tcpip_mapip(struct mg_connection *c, struct mg_addr *ip) {
#endif
// Scannable version tag embedded in every firmware binary, for server-side
// version extraction. The version string starts after the 11-char "MG_VERSION:" prefix.
static const char mg_fw_version[] = "MG_VERSION:" MG_OTA_FIRMWARE_VERSION;
// version extraction. The version string starts after the "MG_VERSION:" prefix.
static const char s_fw_version[] = "MG_VERSION:" MG_OTA_FIRMWARE_VERSION;
static bool s_autocommit_ok; // True after OTA server confirms "same version"
@@ -9926,7 +9926,8 @@ void mg_ota_device_id(char *buf, size_t len) {
(defined(__SYSTEM_STM32F4XX_H) || defined(__SYSTEM_STM32F7XX_H) || \
defined(SYSTEM_STM32H5XX_H) || defined(SYSTEM_STM32H7XX_H) || \
defined(SYSTEM_STM32N6XX_H) || defined(SYSTEM_STM32U5XX_H))
mg_snprintf(buf, len, "%M", mg_print_hex, 12, (uint8_t *) UID_BASE);
uint32_t *p = (uint32_t *) UID_BASE;
mg_snprintf(buf, len, "%08x%08x%08x", p[0], p[1], p[2]);
#else
mg_snprintf(buf, len, "%d", 0);
#endif
@@ -9944,11 +9945,12 @@ static void s_version_fn(struct mg_connection *c, int ev, void *ev_data) {
const char *sep = strchr(uri, '?') == NULL ? "?" : "&";
mg_ota_device_id(id, sizeof(id));
id[sizeof(id) - 1] = '\0';
id[sizeof(id) - 1] = '\0';
mg_printf(c,
"GET %s%sarch=%d&version=%s&id=%s&interval=%d&boot=%d HTTP/1.1\r\n"
"Host: %.*s\r\n"
"Connection: close\r\n\r\n",
uri, sep, MG_ARCH, mg_fw_version + 11, id,
uri, sep, MG_ARCH, s_fw_version + 11, id,
MG_OTA_PULL_INTERVAL_SECONDS, MG_OTA_STATE_GET(), host.len, host.buf);
} else if (ev == MG_EV_HTTP_MSG) {
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
@@ -9965,7 +9967,7 @@ static void s_version_fn(struct mg_connection *c, int ev, void *ev_data) {
s_ota->fn(buf);
mg_free(s_ota);
s_ota = NULL;
} else if (strcmp(s_ota->version, mg_fw_version + 11) == 0) {
} else if (strcmp(s_ota->version, s_fw_version + 11) == 0) {
s_autocommit_ok = true;
s_ota->fn("Same version");
mg_free(s_ota);
mongoose.h
+1 -1
View File
@@ -2042,7 +2042,7 @@ struct mg_mgr {
int dnstimeout; // DNS resolve timeout in ms (default: 3000)
bool use_dns6; // If true, prefer DNS6 for hostname resolution
unsigned long nextid; // Auto-incrementing counter for connection IDs
void *userdata; // Arbitrary user pointer (initially set to mg_fw_version)
void *userdata; // Arbitrary user pointer
void *tls_ctx; // Shared TLS context for all TLS connections
uint16_t mqtt_id; // Packet ID counter for MQTT pub/sub
void *active_dns_requests; // Pending DNS queries (internal)
src/net.h
+1 -1
View File
@@ -35,7 +35,7 @@ struct mg_mgr {
int dnstimeout; // DNS resolve timeout in ms (default: 3000)
bool use_dns6; // If true, prefer DNS6 for hostname resolution
unsigned long nextid; // Auto-incrementing counter for connection IDs
void *userdata; // Arbitrary user pointer (initially set to mg_fw_version)
void *userdata; // Arbitrary user pointer
void *tls_ctx; // Shared TLS context for all TLS connections
uint16_t mqtt_id; // Packet ID counter for MQTT pub/sub
void *active_dns_requests; // Pending DNS queries (internal)
src/ota.c
+7 -5
View File
@@ -11,8 +11,8 @@
#endif
// Scannable version tag embedded in every firmware binary, for server-side
// version extraction. The version string starts after the 11-char "MG_VERSION:" prefix.
static const char mg_fw_version[] = "MG_VERSION:" MG_OTA_FIRMWARE_VERSION;
// version extraction. The version string starts after the "MG_VERSION:" prefix.
static const char s_fw_version[] = "MG_VERSION:" MG_OTA_FIRMWARE_VERSION;
static bool s_autocommit_ok; // True after OTA server confirms "same version"
@@ -34,7 +34,8 @@ void mg_ota_device_id(char *buf, size_t len) {
(defined(__SYSTEM_STM32F4XX_H) || defined(__SYSTEM_STM32F7XX_H) || \
defined(SYSTEM_STM32H5XX_H) || defined(SYSTEM_STM32H7XX_H) || \
defined(SYSTEM_STM32N6XX_H) || defined(SYSTEM_STM32U5XX_H))
mg_snprintf(buf, len, "%M", mg_print_hex, 12, (uint8_t *) UID_BASE);
uint32_t *p = (uint32_t *) UID_BASE;
mg_snprintf(buf, len, "%08x%08x%08x", p[0], p[1], p[2]);
#else
mg_snprintf(buf, len, "%d", 0);
#endif
@@ -52,11 +53,12 @@ static void s_version_fn(struct mg_connection *c, int ev, void *ev_data) {
const char *sep = strchr(uri, '?') == NULL ? "?" : "&";
mg_ota_device_id(id, sizeof(id));
id[sizeof(id) - 1] = '\0';
id[sizeof(id) - 1] = '\0';
mg_printf(c,
"GET %s%sarch=%d&version=%s&id=%s&interval=%d&boot=%d HTTP/1.1\r\n"
"Host: %.*s\r\n"
"Connection: close\r\n\r\n",
uri, sep, MG_ARCH, mg_fw_version + 11, id,
uri, sep, MG_ARCH, s_fw_version + 11, id,
MG_OTA_PULL_INTERVAL_SECONDS, MG_OTA_STATE_GET(), host.len, host.buf);
} else if (ev == MG_EV_HTTP_MSG) {
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
@@ -73,7 +75,7 @@ static void s_version_fn(struct mg_connection *c, int ev, void *ev_data) {
s_ota->fn(buf);
mg_free(s_ota);
s_ota = NULL;
} else if (strcmp(s_ota->version, mg_fw_version + 11) == 0) {
} else if (strcmp(s_ota->version, s_fw_version + 11) == 0) {
s_autocommit_ok = true;
s_ota->fn("Same version");
mg_free(s_ota);