Merge branch 'develop' of https://github.com/toniebox-reverse-enginee…

…ring/teddycloud into develop
toniebox-reverse-engineering · Oct 2, 2023 · 5d2bf08 · 5d2bf08
2 parents e6464a9 + e17a6bc
commit 5d2bf08
Show file tree

Hide file tree

Showing 5 changed files with 322 additions and 233 deletions.
diff --git a/contrib/docker-compose/DS723+.yaml b/contrib/docker-compose/DS723+.yaml
@@ -0,0 +1,49 @@
+# This Docker Compose file orchestrates the deployment of the teddycloud service on a Synology DS723+
+#
+# The service is served at a static IP 192.168.1.192 on a macvlan network, allowing it to operate on the host network as a unique entity.
+# Volumes from the host are mapped to the container ensuring data persistence across restarts.
+#  - library: where your global library of toniefiles is located at
+#  - content: where your box' toniefiles get stored
+#  - certs: certificates for server and client mode
+#  - firmware: firmware dumps for ESP32 firmware operations
+#
+# The container is configured to restart automatically unless manually stopped, and is granted the NET_ADMIN capability for network-related operations.
+#
+version: '3'
+
+services:
+  teddycloud:
+    mac_address: 66-66-66-00-00-01
+    networks:
+      dockervlan:
+        ipv4_address: 192.168.1.192
+    container_name: teddycloud
+    hostname: teddycloud
+    image: ghcr.io/toniebox-reverse-engineering/teddycloud:develop
+    volumes:
+      - config:/teddycloud/config
+      - certs:/teddycloud/certs
+      - content:/teddycloud/data/content
+      - library:/teddycloud/data/library
+      - firmware:/teddycloud/data/firmware
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+networks:
+  dockervlan:
+    name: dockervlan
+    driver: macvlan
+    driver_opts:
+      parent: ovs_eth0
+    ipam: 
+      config:
+        - subnet: "192.168.1.0/24"
+          ip_range: "192.168.1.192/26"
+          gateway: "192.168.1.1"
+volumes:
+  library:
+  content:
+  certs:
+  config:
+  firmware:
+
diff --git a/contrib/docker-compose/DS723+_directories.yaml b/contrib/docker-compose/DS723+_directories.yaml
@@ -0,0 +1,42 @@
+# This Docker Compose file orchestrates the deployment of the teddycloud service on a Synology DS723+
+#
+# The service is served at a static IP 192.168.1.192 on a macvlan network, allowing it to operate on the host network as a unique entity.
+# Directories from the host are mapped to the container ensuring data persistence across restarts.
+#  - library: where your global library of toniefiles is located at
+#  - content: where your box' toniefiles get stored
+#  - certs: certificates for server and client mode
+#  - firmware: firmware dumps for ESP32 firmware operations
+#
+# The container is configured to restart automatically unless manually stopped, and is granted the NET_ADMIN capability for network-related operations.
+#
+version: '3'
+
+services:
+  teddycloud:
+    mac_address: 66-66-66-00-00-01
+    networks:
+      dockervlan:
+        ipv4_address: 192.168.1.192
+    container_name: teddycloud
+    hostname: teddycloud
+    image: ghcr.io/toniebox-reverse-engineering/teddycloud:develop
+    volumes:
+      - /volume1/docker/teddyCloud/config:/teddycloud/config
+      - /volume1/docker/teddyCloud/certs:/teddycloud/certs
+      - /volume1/docker/teddyCloud/data/content:/teddycloud/data/content
+      - /volume1/docker/data/teddyCloud/firmware:/teddycloud/data/firmware
+      - /volume1/data/Share/Tonies:/teddycloud/data/library
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+networks:
+  dockervlan:
+    name: dockervlan
+    driver: macvlan
+    driver_opts:
+      parent: ovs_eth0
+    ipam: 
+      config:
+        - subnet: "192.168.1.0/24"
+          ip_range: "192.168.1.192/26"
+          gateway: "192.168.1.1"
diff --git a/include/tls_config.h b/include/tls_config.h
@@ -31,8 +31,8 @@
 #ifndef _TLS_CONFIG_H
 #define _TLS_CONFIG_H
 
-#define TLS_TX_BUFFER_SIZE 8192
-#define TLS_RX_BUFFER_SIZE 8192
+#define TLS_TX_BUFFER_SIZE TLS_MAX_RECORD_LENGTH
+#define TLS_RX_BUFFER_SIZE TLS_MAX_RECORD_LENGTH
 
 #define TLS_PRIVATE_CONTEXT       \
     char client_cert_issuer[128]; \

diff --git a/src/handler_api.c b/src/handler_api.c
@@ -832,7 +832,6 @@ error_t handleApiUploadFirmware(HttpConnection *connection, const char_t *uri, c
         case NO_ERROR:
             statusCode = 200;
             TRACE_INFO("Received new file:\r\n");
-            TRACE_INFO("  '%s'\r\n", ctx.root_path);
             TRACE_INFO("  '%s'\r\n", ctx.filename);
             osSnprintf(message, sizeof(message), "%s", &ctx.filename[strlen(ctx.root_path) + 1]);
             break;