FNET 4.4.1

fnet_demos/common/fnet_application/fapp.c

@@ -30,7 +30,7 @@
 
 #include "fapp_netif.h"
 
-#if ((FAPP_CFG_HTTP_CMD || FAPP_CFG_HTTP_TLS_CMD) && FNET_CFG_HTTP)|| (FAPP_CFG_EXP_CMD && FNET_CFG_FS)
+#if ((FAPP_CFG_HTTP_CMD || FAPP_CFG_HTTP_TLS_CMD) && FNET_CFG_HTTP_SRV)|| (FAPP_CFG_EXP_CMD && FNET_CFG_FS)
     #include "fapp_fs.h"
 #endif
 #if FAPP_CFG_FREERTOS
@@ -246,7 +246,7 @@ static void fapp_init(void)
 #endif
 
         /* Init FS and mount FS Image. */
-#if (FAPP_CFG_EXP_CMD && FNET_CFG_FS) || ((FAPP_CFG_HTTP_CMD || FAPP_CFG_HTTP_TLS_CMD) && FNET_CFG_HTTP)
+#if (FAPP_CFG_EXP_CMD && FNET_CFG_FS) || ((FAPP_CFG_HTTP_CMD || FAPP_CFG_HTTP_TLS_CMD) && FNET_CFG_HTTP_SRV)
         fapp_fs_mount();
 #endif
 
@@ -317,16 +317,16 @@ static void fapp_release(fnet_shell_desc_t desc)
     fapp_telnet_release();
 #endif
 
-#if FAPP_CFG_HTTP_CMD && FNET_CFG_HTTP          /* Release HTTP server. */
-    fapp_http_release();
+#if FAPP_CFG_HTTP_CMD && FNET_CFG_HTTP_SRV          /* Release HTTP server. */
+    fapp_http_srv_release();
 #endif
 
 #if FAPP_CFG_BENCH_CMD && FNET_CFG_BENCH_SRV    /* Release BENCH server. */
     fapp_bench_srv_release();
 #endif
 
-#if FAPP_CFG_HTTP_TLS_CMD && FNET_CFG_HTTP && FNET_CFG_HTTP_TLS && FNET_CFG_TLS /* Release HTTPS server. */
-    fapp_http_tls_release();
+#if FAPP_CFG_HTTP_TLS_CMD && FNET_CFG_HTTP_SRV && FNET_CFG_HTTP_SRV_TLS && FNET_CFG_TLS /* Release HTTPS server. */
+    fapp_http_srv_tls_release();
 #endif
 
 #if FAPP_CFG_TFTP_CMD                          /* Release TFTP server. */
@@ -337,7 +337,7 @@ static void fapp_release(fnet_shell_desc_t desc)
     fapp_dhcp_srv_release();                    /* Release DHCP server. */
 #endif
 
-#if (FAPP_CFG_EXP_CMD && FNET_CFG_FS) || ((FAPP_CFG_HTTP_CMD || FAPP_CFG_HTTP_TLS_CMD) && FNET_CFG_HTTP)
+#if (FAPP_CFG_EXP_CMD && FNET_CFG_FS) || ((FAPP_CFG_HTTP_CMD || FAPP_CFG_HTTP_TLS_CMD) && FNET_CFG_HTTP_SRV)
     fapp_fs_unmount();                          /* Unmount and release FS. */
 #endif
 

fnet_demos/common/fnet_application/fapp_config.h

@@ -361,6 +361,13 @@
     #define FAPP_CFG_HTTP_CMD           (0)
 #endif
 
+/************************************************************************
+*    "httpc" command.
+*************************************************************************/
+#ifndef FAPP_CFG_HTTPC_CMD
+    #define FAPP_CFG_HTTPC_CMD          (0)
+#endif
+
 /************************************************************************
 *    "https" command.
 *************************************************************************/

fnet_demos/common/fnet_application/fapp_dns.c

@@ -111,7 +111,7 @@ void fapp_dns_cmd( fnet_shell_desc_t desc, fnet_index_t argc, fnet_char_t **argv
                 goto ERROR_PARAMETER;
             }
         }
-        else if (!fnet_strcmp(argv[i], "-s")) /*[-s <server name>] */
+        else if (!fnet_strcmp(argv[i], "-s")) /*[-s <server ip>] */
         {
             i++;
             if(i < argc)

fnet_demos/common/fnet_application/fapp_fs.c

@@ -160,10 +160,10 @@ static void fapp_fs_cd_cmd( fnet_shell_desc_t desc, fnet_index_t argc, fnet_char
         /* Add splitter if not yet.*/
         if((size_cd == 0) || (fapp_fs_current_path[size_cd - 1U] != FNET_FS_SPLITTER))
         {
-            fnet_strncat( &fapp_fs_current_path[0], splitter, FAPP_FS_DIR_PATH_MAX);
+            fnet_strlcat( &fapp_fs_current_path[0], splitter, FAPP_FS_DIR_PATH_MAX);
         }
 
-        fnet_strncat( &fapp_fs_current_path[0], path, FAPP_FS_DIR_PATH_MAX);
+        fnet_strlcat( &fapp_fs_current_path[0], path, FAPP_FS_DIR_PATH_MAX);
         path = fapp_fs_current_path;
     }
     else /* Full path. */
@@ -192,10 +192,10 @@ static void fapp_fs_cd_cmd( fnet_shell_desc_t desc, fnet_index_t argc, fnet_char
     if (dir)
     {
         /* Update cur path. */
-        fnet_strncpy( &fapp_fs_current_path[0], path, FAPP_FS_DIR_PATH_MAX);
+        fnet_strlcpy( &fapp_fs_current_path[0], path, FAPP_FS_DIR_PATH_MAX);
         if(fapp_fs_current_path[0] == '\0') /* root dir */
         {
-            fnet_strncat( &fapp_fs_current_path[0], splitter, FAPP_FS_DIR_PATH_MAX);
+            fnet_strlcat( &fapp_fs_current_path[0], splitter, FAPP_FS_DIR_PATH_MAX);
         }
 
         /* Change shell prompt. */
@@ -238,10 +238,10 @@ static void fapp_fs_view_cmd( fnet_shell_desc_t desc, fnet_index_t argc, fnet_ch
         /* Add splitter if not yet.*/
         if((size_cd == 0) || (fapp_fs_current_path[size_cd - 1U] != FNET_FS_SPLITTER))
         {
-            fnet_strncat( &fapp_fs_current_path[0], splitter, FAPP_FS_DIR_PATH_MAX);
+            fnet_strlcat( &fapp_fs_current_path[0], splitter, FAPP_FS_DIR_PATH_MAX);
         }
 
-        fnet_strncat( &fapp_fs_current_path[0], path, FAPP_FS_DIR_PATH_MAX);
+        fnet_strlcat( &fapp_fs_current_path[0], path, FAPP_FS_DIR_PATH_MAX);
         path = fapp_fs_current_path;
     }
     else /* Full path. */

fnet_demos/common/fnet_application/fapp_fs_image.c

@@ -6,7 +6,7 @@
 
 #include "fnet.h"
 
-#if FNET_CFG_FS && FNET_CFG_FS_ROM && FNET_CFG_HTTP_VERSION_MAJOR
+#if FNET_CFG_FS && FNET_CFG_FS_ROM
 
 
 /*<FILE SYSTEM IMAGE>/auth/fnet.css*/
@@ -2385,7 +2385,7 @@ static const fnet_uint8_t node_11[2667] =
     0x3D, 0x22, 0x66, 0x6F, 0x6F, 0x74, 0x65, 0x72, 0x22, 0x3E,
     0x0D, 0x0A, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
     0x20, 0x20, 0x20, 0x20, 0x26, 0x63, 0x6F, 0x70, 0x79, 0x3B,
-    0x20, 0x32, 0x30, 0x30, 0x35, 0x2D, 0x32, 0x30, 0x31, 0x37,
+    0x20, 0x32, 0x30, 0x30, 0x35, 0x2D, 0x32, 0x30, 0x31, 0x38,
     0x20, 0x62, 0x79, 0x20, 0x41, 0x6E, 0x64, 0x72, 0x65, 0x79,
     0x20, 0x42, 0x75, 0x74, 0x6F, 0x6B, 0x2C, 0x20, 0x46, 0x4E,
     0x45, 0x54, 0x20, 0x43, 0x6F, 0x6D, 0x6D, 0x75, 0x6E, 0x69,
@@ -2423,4 +2423,4 @@ const struct fnet_fs_rom_image fnet_fs_image =
     fnet_fs_image_nodes	/* FS node table. */
 };
 
-#endif /*FNET_CFG_FS && FNET_CFG_FS_ROM && FNET_CFG_HTTP_VERSION_MAJOR*/
+#endif /*FNET_CFG_FS && FNET_CFG_FS_ROM*/