libwebsockets: disable unnecessary options

Change-Id: Icad061dbcab8dc9556036693fb52138e82252f5c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85a4fb8cd3b56b0a9a6d6d86fa47c6d223568e47..9a062c54146d7a068f6493e8ad3831b1c31aaf86 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,8 @@ IF(NOT USE_LIBWEBSOCKETS_STATIC_PREBUILT)
        SET(LWS_IPV6 ON CACHE BOOL "" FORCE)
        SET(LWS_WITHOUT_TESTAPPS ON CACHE BOOL "" FORCE)
        SET(LWS_WITH_FILE_OPS OFF CACHE BOOL "" FORCE)
+       SET(LWS_WITH_SYS_SMD OFF CACHE BOOL "" FORCE)
+       SET(LWS_WITH_NETLINK OFF CACHE BOOL "" FORCE)
        SET(LWS_WITH_VINE_EXT ON CACHE BOOL "" FORCE)
        ADD_SUBDIRECTORY(third-party/libwebsockets)
 ENDIF(NOT USE_LIBWEBSOCKETS_STATIC_PREBUILT)

diff --git a/packaging/capi-network-vine.spec b/packaging/capi-network-vine.spec
index 24110590e8d53d38675a8844a0f2419836f306c2..df97a60a3e53cebc6a7e89b3fb7b4074e76aa363 100755 (executable)
--- a/packaging/capi-network-vine.spec
+++ b/packaging/capi-network-vine.spec
@@ -3,7 +3,7 @@
 %bcond_without use_glib_event_loop
 Name:    capi-network-vine
 Summary: An service discovery framework
-Version: 1.0.9
+Version: 1.0.10
 Release: 0
 Group:   Network & Connectivity/API
 License: Apache-2.0

diff --git a/third-party/prebuilt/android/arm64-v8a/libwebsockets.a b/third-party/prebuilt/android/arm64-v8a/libwebsockets.a
index 87030f86cf1728784d39b118dba23eb2a74aee9b..3a19befd0b06ff6a5011482e707c9c97388c8e21 100644 (file)
Binary files a/third-party/prebuilt/android/arm64-v8a/libwebsockets.a and b/third-party/prebuilt/android/arm64-v8a/libwebsockets.a differ

diff --git a/third-party/prebuilt/android/arm64-v8a/lws_config.h b/third-party/prebuilt/android/arm64-v8a/lws_config.h
index 2a653cdc1684268747493c4f205e5c0a48bfbfa6..1a5809779d3a09ba7115427a67d272bd5f0d04be 100644 (file)
--- a/third-party/prebuilt/android/arm64-v8a/lws_config.h
+++ b/third-party/prebuilt/android/arm64-v8a/lws_config.h
@@ -10,7 +10,7 @@
 #define LWS_INSTALL_LIBDIR "/usr/local/lib"
 #define LWS_LIBRARY_VERSION_MAJOR 4
 #define LWS_LIBRARY_VERSION_MINOR 2
-#define LWS_LIBRARY_VERSION_PATCH_ELABORATED 0-accepted/tizen/unified/20210602.122354-9-g8ca7310
+#define LWS_LIBRARY_VERSION_PATCH_ELABORATED 0-submit/tizen/20210621.075049-4-g849b36a
 #define LWS_LIBRARY_VERSION_PATCH 0
 
 /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
@@ -25,7 +25,7 @@
 /* #undef LWS_EXT_PTHREAD_LIBRARIES */
 
 /* #undef LWS_AVOID_SIGPIPE_IGN */
-#define LWS_BUILD_HASH "accepted/tizen/unified/20210602.122354-9-g8ca7310"
+#define LWS_BUILD_HASH "submit/tizen/20210621.075049-4-g849b36a"
 /* #undef LWS_BUILTIN_GETIFADDRS */
 #define LWS_CLIENT_HTTP_PROXYING
 /* #undef LWS_DETECTED_PLAT_IOS */
@@ -102,7 +102,7 @@
 #define LWS_HAVE_VFORK
 #define LWS_HAVE_X509_get_key_usage
 #define LWS_HAVE_X509_VERIFY_PARAM_set1_host
-#define LWS_LIBRARY_VERSION "4.2.0-accepted/tizen/unified/20210602.122354-9-g8ca7310"
+#define LWS_LIBRARY_VERSION "4.2.0-submit/tizen/20210621.075049-4-g849b36a"
 #define LWS_LOGGING_BITFIELD_CLEAR 0
 #define LWS_LOGGING_BITFIELD_SET 0
 #define LWS_LOG_TAG_LIFECYCLE
@@ -171,7 +171,7 @@
 #define LWS_LOGS_TIMESTAMP
 /* #undef LWS_WITH_MBEDTLS */
 /* #undef LWS_WITH_MINIZ */
-#define LWS_WITH_NETLINK
+/* #undef LWS_WITH_NETLINK */
 #define LWS_WITH_NETWORK
 /* #undef LWS_WITH_NO_LOGS */
 #define LWS_WITH_CLIENT
@@ -194,7 +194,7 @@
 /* #undef LWS_WITH_SELFTESTS */
 /* #undef LWS_WITH_SEQUENCER */
 /* #undef LWS_WITH_SERVER_STATUS */
-#define LWS_WITH_SYS_SMD
+/* #undef LWS_WITH_SYS_SMD */
 /* #undef LWS_WITH_SMTP */
 /* #undef LWS_WITH_SOCKS5 */
 /* #undef LWS_WITH_STATEFUL_URLDECODE */

diff --git a/third-party/prebuilt/android/armeabi-v7a/libwebsockets.a b/third-party/prebuilt/android/armeabi-v7a/libwebsockets.a
index 6eb7994e45477c7ee2cf2b808b56c5dfc4ed1c81..b54240204342b6e6d549023b4cdf681e50a8235e 100644 (file)
Binary files a/third-party/prebuilt/android/armeabi-v7a/libwebsockets.a and b/third-party/prebuilt/android/armeabi-v7a/libwebsockets.a differ

diff --git a/third-party/prebuilt/android/armeabi-v7a/lws_config.h b/third-party/prebuilt/android/armeabi-v7a/lws_config.h
index 2a653cdc1684268747493c4f205e5c0a48bfbfa6..1a5809779d3a09ba7115427a67d272bd5f0d04be 100644 (file)
--- a/third-party/prebuilt/android/armeabi-v7a/lws_config.h
+++ b/third-party/prebuilt/android/armeabi-v7a/lws_config.h
@@ -10,7 +10,7 @@
 #define LWS_INSTALL_LIBDIR "/usr/local/lib"
 #define LWS_LIBRARY_VERSION_MAJOR 4
 #define LWS_LIBRARY_VERSION_MINOR 2
-#define LWS_LIBRARY_VERSION_PATCH_ELABORATED 0-accepted/tizen/unified/20210602.122354-9-g8ca7310
+#define LWS_LIBRARY_VERSION_PATCH_ELABORATED 0-submit/tizen/20210621.075049-4-g849b36a
 #define LWS_LIBRARY_VERSION_PATCH 0
 
 /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
@@ -25,7 +25,7 @@
 /* #undef LWS_EXT_PTHREAD_LIBRARIES */
 
 /* #undef LWS_AVOID_SIGPIPE_IGN */
-#define LWS_BUILD_HASH "accepted/tizen/unified/20210602.122354-9-g8ca7310"
+#define LWS_BUILD_HASH "submit/tizen/20210621.075049-4-g849b36a"
 /* #undef LWS_BUILTIN_GETIFADDRS */
 #define LWS_CLIENT_HTTP_PROXYING
 /* #undef LWS_DETECTED_PLAT_IOS */
@@ -102,7 +102,7 @@
 #define LWS_HAVE_VFORK
 #define LWS_HAVE_X509_get_key_usage
 #define LWS_HAVE_X509_VERIFY_PARAM_set1_host
-#define LWS_LIBRARY_VERSION "4.2.0-accepted/tizen/unified/20210602.122354-9-g8ca7310"
+#define LWS_LIBRARY_VERSION "4.2.0-submit/tizen/20210621.075049-4-g849b36a"
 #define LWS_LOGGING_BITFIELD_CLEAR 0
 #define LWS_LOGGING_BITFIELD_SET 0
 #define LWS_LOG_TAG_LIFECYCLE
@@ -171,7 +171,7 @@
 #define LWS_LOGS_TIMESTAMP
 /* #undef LWS_WITH_MBEDTLS */
 /* #undef LWS_WITH_MINIZ */
-#define LWS_WITH_NETLINK
+/* #undef LWS_WITH_NETLINK */
 #define LWS_WITH_NETWORK
 /* #undef LWS_WITH_NO_LOGS */
 #define LWS_WITH_CLIENT
@@ -194,7 +194,7 @@
 /* #undef LWS_WITH_SELFTESTS */
 /* #undef LWS_WITH_SEQUENCER */
 /* #undef LWS_WITH_SERVER_STATUS */
-#define LWS_WITH_SYS_SMD
+/* #undef LWS_WITH_SYS_SMD */
 /* #undef LWS_WITH_SMTP */
 /* #undef LWS_WITH_SOCKS5 */
 /* #undef LWS_WITH_STATEFUL_URLDECODE */

diff --git a/third-party/prebuilt/default/x86_64/libwebsockets.a b/third-party/prebuilt/default/x86_64/libwebsockets.a
index e5a9f49a667e54c7df32abceaad5de0fa0c45ffa..8cd94bf96f417bcb0c587cfa9ab597be5757e48a 100644 (file)
Binary files a/third-party/prebuilt/default/x86_64/libwebsockets.a and b/third-party/prebuilt/default/x86_64/libwebsockets.a differ

diff --git a/third-party/prebuilt/include/lws_config.h b/third-party/prebuilt/include/lws_config.h
index 2a653cdc1684268747493c4f205e5c0a48bfbfa6..1a5809779d3a09ba7115427a67d272bd5f0d04be 100644 (file)
--- a/third-party/prebuilt/include/lws_config.h
+++ b/third-party/prebuilt/include/lws_config.h
@@ -10,7 +10,7 @@
 #define LWS_INSTALL_LIBDIR "/usr/local/lib"
 #define LWS_LIBRARY_VERSION_MAJOR 4
 #define LWS_LIBRARY_VERSION_MINOR 2
-#define LWS_LIBRARY_VERSION_PATCH_ELABORATED 0-accepted/tizen/unified/20210602.122354-9-g8ca7310
+#define LWS_LIBRARY_VERSION_PATCH_ELABORATED 0-submit/tizen/20210621.075049-4-g849b36a
 #define LWS_LIBRARY_VERSION_PATCH 0
 
 /* LWS_LIBRARY_VERSION_NUMBER looks like 1005001 for e.g. version 1.5.1 */
@@ -25,7 +25,7 @@
 /* #undef LWS_EXT_PTHREAD_LIBRARIES */
 
 /* #undef LWS_AVOID_SIGPIPE_IGN */
-#define LWS_BUILD_HASH "accepted/tizen/unified/20210602.122354-9-g8ca7310"
+#define LWS_BUILD_HASH "submit/tizen/20210621.075049-4-g849b36a"
 /* #undef LWS_BUILTIN_GETIFADDRS */
 #define LWS_CLIENT_HTTP_PROXYING
 /* #undef LWS_DETECTED_PLAT_IOS */
@@ -102,7 +102,7 @@
 #define LWS_HAVE_VFORK
 #define LWS_HAVE_X509_get_key_usage
 #define LWS_HAVE_X509_VERIFY_PARAM_set1_host
-#define LWS_LIBRARY_VERSION "4.2.0-accepted/tizen/unified/20210602.122354-9-g8ca7310"
+#define LWS_LIBRARY_VERSION "4.2.0-submit/tizen/20210621.075049-4-g849b36a"
 #define LWS_LOGGING_BITFIELD_CLEAR 0
 #define LWS_LOGGING_BITFIELD_SET 0
 #define LWS_LOG_TAG_LIFECYCLE
@@ -171,7 +171,7 @@
 #define LWS_LOGS_TIMESTAMP
 /* #undef LWS_WITH_MBEDTLS */
 /* #undef LWS_WITH_MINIZ */
-#define LWS_WITH_NETLINK
+/* #undef LWS_WITH_NETLINK */
 #define LWS_WITH_NETWORK
 /* #undef LWS_WITH_NO_LOGS */
 #define LWS_WITH_CLIENT
@@ -194,7 +194,7 @@
 /* #undef LWS_WITH_SELFTESTS */
 /* #undef LWS_WITH_SEQUENCER */
 /* #undef LWS_WITH_SERVER_STATUS */
-#define LWS_WITH_SYS_SMD
+/* #undef LWS_WITH_SYS_SMD */
 /* #undef LWS_WITH_SMTP */
 /* #undef LWS_WITH_SOCKS5 */
 /* #undef LWS_WITH_STATEFUL_URLDECODE */

diff --git a/third-party/prebuilt/tizen/aarch64/libwebsockets.a b/third-party/prebuilt/tizen/aarch64/libwebsockets.a
index d0df22b7d81e8e47b6596702aa94a6916b612676..04362dd85f61ff3f566b614c21a0a7642944a31c 100644 (file)
Binary files a/third-party/prebuilt/tizen/aarch64/libwebsockets.a and b/third-party/prebuilt/tizen/aarch64/libwebsockets.a differ

diff --git a/third-party/prebuilt/tizen/armv7l/libwebsockets.a b/third-party/prebuilt/tizen/armv7l/libwebsockets.a
index cc1c122e2c46e5bd42c27cb90503e2adaf602486..72fef78d725ade95c4b9ded70865e606eeb5d745 100644 (file)
Binary files a/third-party/prebuilt/tizen/armv7l/libwebsockets.a and b/third-party/prebuilt/tizen/armv7l/libwebsockets.a differ

diff --git a/third-party/prebuilt/tizen/i686/libwebsockets.a b/third-party/prebuilt/tizen/i686/libwebsockets.a
index e4c8cc298fdac614e198ee786f71078637480c68..f4633eeeacc3d2800788fa1a6fdc9a780c085e12 100644 (file)
Binary files a/third-party/prebuilt/tizen/i686/libwebsockets.a and b/third-party/prebuilt/tizen/i686/libwebsockets.a differ

diff --git a/third-party/prebuilt/tizen/x86_64/libwebsockets.a b/third-party/prebuilt/tizen/x86_64/libwebsockets.a
index ef184f5dbf37ef235640514edba1e1b9774dd0da..35736c8857c38deaa7c4f242d992576684b54235 100644 (file)
Binary files a/third-party/prebuilt/tizen/x86_64/libwebsockets.a and b/third-party/prebuilt/tizen/x86_64/libwebsockets.a differ

diff --git a/tool/tool_run.cpp b/tool/tool_run.cpp
index b9e600d8e08b0601eb03a0205e54fd3486581afd..8b5a84cffc2c2dc8a2b2c98586eac146c9fe3d8c 100644 (file)
--- a/tool/tool_run.cpp
+++ b/tool/tool_run.cpp
@@ -409,11 +409,6 @@ static void deinit()
 
        _stop_message_timer_all();
 
-       if (log_file) {
-               fclose(log_file);
-               log_file = NULL;
-       }
-
        if (vine_configs.is_reg)
                vine_session_unregister(vine_configs.session);
 
@@ -436,6 +431,11 @@ static void deinit()
                vine_session_destroy(vine_configs.session);
 
        vine_deinitialize();
+
+       if (log_file) {
+               fclose(log_file);
+               log_file = NULL;
+       }
 }
 
 static void _logger(int log_level, const char *log)