set LWIP reassembly flag - release

issue was (my bad) in LMS

.github/workflows/CrossBuild.yml

@@ -80,7 +80,7 @@ jobs:
       run: |
         env | grep "artifact\|tag\|GITHUB\|version\|NUMBER\|TARGET" >${TARGET_BUILD_NAME}-env.txt
         echo "${tag}" >version.txt
-        docker run --env-file=${TARGET_BUILD_NAME}-env.txt --rm -v $PWD:/project -w /project sle118/squeezelite-esp32:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && idf.py build && zip build/${artifact_file_name} partitions*.csv build/*.bin build/bootloader/bootloader.bin build/partition_table/partition-table.bin build/flash_project_args build/size_*.txt"
+        docker run --env-file=${TARGET_BUILD_NAME}-env.txt --rm -v $PWD:/project -w /project sle118/squeezelite-esp32:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && idf.py build && zip -r build_output.zip build && zip build/${artifact_file_name} partitions*.csv build/*.bin build/bootloader/bootloader.bin build/partition_table/partition-table.bin build/flash_project_args build/size_*.txt"
     # - name: Build Mock firmware
     #   run: |
     #     mkdir -p build
@@ -106,6 +106,7 @@ jobs:
           build/size_comp1.txt
           build/size_comp2.txt
           partitions.csv
+          build_output.zip
     - uses: actions/upload-artifact@v2
       with:
         name: ${{ env.artifact_bin_file_name }}

build-scripts/ESP32-A1S-sdkconfig.defaults

@@ -626,6 +626,8 @@ CONFIG_LWIP_MAX_SOCKETS=16
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 #CONFIG_LWIP_IP_REASSEMBLY is not set
+CONFIG_LWIP_IP6_REASSEMBLY=Y
+CONFIG_LWIP_IP4_REASSEMBLY=Y
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32

build-scripts/I2S-4MFlash-sdkconfig.defaults

@@ -459,7 +459,9 @@ CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_IP_FRAG is not set
 # CONFIG_LWIP_STATS is not set
 # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
-CONFIG_LWIP_IP_REASSEMBLY=y
+#CONFIG_LWIP_IP_REASSEMBLY is not set
+CONFIG_LWIP_IP6_REASSEMBLY=Y
+CONFIG_LWIP_IP4_REASSEMBLY=Y
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32

build-scripts/SqueezeAmp-sdkconfig.defaults

@@ -182,8 +182,6 @@ CONFIG_BT_A2DP_ENABLE=y
 CONFIG_BT_SSP_ENABLED=y
 # CONFIG_BT_BLE_ENABLED is not set
 CONFIG_BT_STACK_NO_LOG=n
-CONFIG_BT_BLE_ENABLED=n
-CONFIG_BT_BLE_SMP_ENABLE=y
 CONFIG_BT_ACL_CONNECTIONS=4
 CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
@@ -457,7 +455,10 @@ CONFIG_LWIP_MAX_SOCKETS=16
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
-CONFIG_LWIP_IP_REASSEMBLY=y
+#CONFIG_LWIP_IP_REASSEMBLY is not set
+CONFIG_LWIP_IP6_REASSEMBLY=Y
+CONFIG_LWIP_IP4_REASSEMBLY=Y
+
 CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
 CONFIG_LWIP_GARP_TMR_INTERVAL=60
 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32

components/squeezelite/helix-aac.c

@@ -431,19 +431,12 @@ static decode_state helixaac_decode(void) {
 	}
 
 	// we always have at least WRAPBUF_LEN unless it's the end of a stream	
-	/* There is a bug in helixaac where it overflows its buffer when not having 
-	 * samples and enters an infinite loop so we can't do here the proper test
-	 *        if (bytes_wrap < WRAPBUF_LEN && bytes_wrap != bytes_total)
-	 * but instead we'll zero the wrap buf and provide a safe overflow space 
-	 * for the decoder
-	*/ 
-	if (bytes_wrap < WRAPBUF_LEN) {
+	if (bytes_wrap < WRAPBUF_LEN && bytes_wrap != bytes_total) {		
 		// build a linear buffer if we are crossing the end of streambuf
 		memcpy(a->wrap_buf, streambuf->readp, bytes_wrap);
 		memcpy(a->wrap_buf + bytes_wrap, streambuf->buf, min(WRAPBUF_LEN, bytes_total) - bytes_wrap);		
 		sptr = a->wrap_buf;
-		if (bytes_total < WRAPBUF_LEN) memset(a->wrap_buf + bytes_total, 0, WRAPBUF_LEN - bytes_total);
-		else bytes = bytes_wrap = min(WRAPBUF_LEN, bytes_total);
+		bytes = bytes_wrap = min(WRAPBUF_LEN, bytes_total);
 	} else {
 		sptr = streambuf->readp;
 		bytes = bytes_wrap;

components/squeezelite/stream.c

@@ -334,7 +334,7 @@ static void *stream_thread() {
 					
 					n = _recv(ssl, fd, streambuf->writep, space, 0);
 					if (n == 0) {
-						LOG_INFO("end of stream");
+						LOG_INFO("end of stream (%u bytes)", stream.bytes);
 						_disconnect(DISCONNECT, DISCONNECT_OK);
 					}
 					if (n < 0 && _last_error() != ERROR_WOULDBLOCK) {