X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=471a097a4bf09307704c7883e6b96dbc2d3883fc;hp=014433c76f1600e63a22125c746ea449f291466c;hb=0fc19255c365a59acf4683d177bacf662e84d4f1;hpb=439a187ea146146e9dc008df5c7511d4c13ded5c;ds=sidebyside

diff --git a/src/openocd.c b/src/openocd.c
index 014433c76f..471a097a4b 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -229,6 +229,9 @@ command_context_t *setup_command_handler(void)
 	return cmd_ctx;
 }
 
+int httpd_start(void);
+void httpd_stop(void);
+
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
@@ -255,6 +258,11 @@ int openocd_main(int argc, char *argv[])
 	if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
 		return EXIT_FAILURE;
 
+#if BUILD_HTTPD
+	if (httpd_start()!=ERROR_OK)
+		return EXIT_FAILURE;
+#endif
+
 	if (ret != ERROR_COMMAND_CLOSE_CONNECTION)
 	{
 		command_context_mode(cmd_ctx, COMMAND_EXEC);
@@ -268,10 +276,15 @@ int openocd_main(int argc, char *argv[])
 	/* shut server down */
 	server_quit();
 
+#if BUILD_HTTPD
+	httpd_stop();
+#endif
+
 	unregister_all_commands(cmd_ctx);
 
 	/* free commandline interface */
 	command_done(cmd_ctx);
 
+
 	return EXIT_SUCCESS;
 }