net: http: Remove the old legacy API

There are no internal users for old HTTP API so removing it.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

include/net/http.h

@@ -1398,37 +1398,6 @@ static char *http_str_output(char *output, int outlen, const char *str, int len)
 	return output;
 }
 
-#if !defined(CONFIG_HTTP_APP)
-static void http_server_cb(struct http_server_ctx *entry,
-			   void *user_data)
-{
-	int *count = user_data;
-	static char output[MAX_HTTP_OUTPUT_LEN];
-
-	/* +7 for []:port */
-	char addr_local[ADDR_LEN + 7];
-	char addr_remote[ADDR_LEN + 7] = "";
-
-	get_addresses(entry->req.net_ctx, addr_local, sizeof(addr_local),
-		      addr_remote, sizeof(addr_remote));
-
-	if (*count == 0) {
-		printk("        HTTP ctx    Local           \t"
-		       "Remote          \tURL\n");
-	}
-
-	(*count)++;
-
-	printk("[%2d] %c%c %p  %16s\t%16s\t%s\n",
-	       *count, entry->enabled ? 'E' : 'D',
-	       entry->is_https ? 'S' : ' ',
-	       entry, addr_local, addr_remote,
-	       http_str_output(output, sizeof(output) - 1,
-			       entry->req.url, entry->req.url_len));
-}
-#endif
-
-#if defined(CONFIG_HTTP_APP)
 static void http_server_cb(struct http_ctx *entry, void *user_data)
 {
 	int *count = user_data;
@@ -1465,7 +1434,6 @@ static void http_server_cb(struct http_ctx *entry, void *user_data)
 				       entry->http.url, entry->http.url_len));
 	}
 }
-#endif /* CONFIG_HTTP_APP */
 #endif /* CONFIG_NET_DEBUG_HTTP_CONN && CONFIG_HTTP_SERVER */
 
 int net_shell_cmd_http(int argc, char *argv[])

include/net/http_app.h

@@ -7,15 +7,10 @@ endif()
 zephyr_library_sources_if_kconfig(http_parser.c)
 zephyr_library_sources_if_kconfig(http_parser_url.c)
 
-if(CONFIG_HTTP_APP)
-  zephyr_library_sources(http_app.c)
+zephyr_library_sources(http.c)
 
-  zephyr_library_sources_ifdef(CONFIG_HTTP_SERVER http_app_server.c)
-  zephyr_library_sources_ifdef(CONFIG_HTTP_CLIENT http_app_client.c)
-else()
-  zephyr_library_sources_ifdef(CONFIG_HTTP_SERVER http_server.c)
-  zephyr_library_sources_ifdef(CONFIG_HTTP_CLIENT http_client.c)
-endif()
+zephyr_library_sources_ifdef(CONFIG_HTTP_SERVER http_server.c)
+zephyr_library_sources_ifdef(CONFIG_HTTP_CLIENT http_client.c)
 
 zephyr_link_interface_ifdef(CONFIG_MBEDTLS mbedTLS)
 zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)

include/net/http_legacy.h

@@ -11,12 +11,6 @@ config HTTP
 
 if HTTP
 
-config HTTP_APP
-	bool "Use new HTTP API built on top of net-app API"
-	default y
-
-if HTTP_APP
-
 config HTTP_SERVER
 	bool "HTTP server support"
 	default n
@@ -60,60 +54,6 @@ config HTTP_SERVER_CONNECTIONS
 	  served at a time, so set CONFIG_NET_APP_SERVER_NUM_CONN and
 	  CONFIG_NET_TCP_BACKLOG_SIZE to 1 in that case.
 
-endif # HTTP_APP
-
-if !HTTP_APP
-
-config HTTP_SERVER
-	bool "HTTP server support"
-	default n
-	select HTTP_PARSER
-	select HTTP_PARSER_URL
-	help
-	  Enables HTTP server routines.
-
-config HTTP_CLIENT
-	bool "HTTP client support"
-	default n
-	select HTTP_PARSER
-	select HTTP_PARSER_URL
-	help
-	  Enables HTTP client routines.
-
-config HTTP_HEADER_FIELD_ITEMS
-	int "HTTP header field max number of items"
-	depends on HTTP_SERVER
-	default 8
-	help
-	  Number of HTTP header field items that an HTTP server
-	  application will handle
-
-config HTTPS
-	bool "HTTPS support"
-	default n
-	select MBEDTLS
-	help
-	  Enables HTTPS support.
-
-config HTTPS_STACK_SIZE
-	int "HTTPS thread stack size"
-	default 8192
-	depends on HTTPS
-	help
-	  HTTPS thread stack size. The mbedtls routines will use this stack
-	  thus it is by default very large.
-
-config HTTP_SERVER_CONNECTIONS
-	int "Max number of concurrent HTTP server connections"
-	default NET_MAX_CONTEXTS
-	depends on HTTP_SERVER
-	help
-	  This value determines how many simultaneous HTTP connections the
-	  HTTP server can serve. Note that only 1 HTTPS connection can be
-	  served at a time.
-
-endif # !HTTP_APP
-
 config HTTP_SERVER_NUM_URLS
 	int "Max number of URLs that the HTTP server will handle"
 	default 8