From 5d602b3212b4d107bd8706357c89e79ebbcf0e70 Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Mon, 27 Apr 2020 10:51:49 +0900 Subject: [PATCH] Change string comparison function for null string 1. Modify to g_strcmp0 from g_str_equal 2. Add nobacktrace option to service of tv 3. Add INS options to main configuration of tv Change-Id: I6fa271b3b522ae5c1495714f089c69c1602a3faf Signed-off-by: hyunuk.tak --- packaging/connman.spec | 2 +- src/connman_tv.service.in | 2 +- src/main_tv.conf | 30 ++++++++++++++++++++++++++++++ src/service.c | 20 ++++++++++---------- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/packaging/connman.spec b/packaging/connman.spec index 879cb47..3351c8d 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -5,7 +5,7 @@ Name: connman Version: 1.37 -Release: 37 +Release: 38 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net diff --git a/src/connman_tv.service.in b/src/connman_tv.service.in index 9eb75b2..f0bf5c3 100644 --- a/src/connman_tv.service.in +++ b/src/connman_tv.service.in @@ -10,7 +10,7 @@ Group=network_fw BusName=net.connman Restart=on-failure SmackProcessLabel=System -ExecStart=@bindir@/connmand -n --noplugin vpn +ExecStart=@bindir@/connmand -n --nobacktrace --noplugin vpn StandardOutput=null Capabilities=cap_setgid,cap_net_admin,cap_net_bind_service,cap_net_broadcast,cap_net_raw,cap_dac_override=i SecureBits=keep-caps diff --git a/src/main_tv.conf b/src/main_tv.conf index 7a72dbe..65dc727 100755 --- a/src/main_tv.conf +++ b/src/main_tv.conf @@ -116,3 +116,33 @@ NetworkCellularInterfaceList = pdp,rmnet,seth_td,seth_w # Enable Tizen TV Profile Features TizenTVExtension = true +[INS] +# INS(Intelligent Network Selection) configuration: BSSID Selection. +INSPreferredFreqBSSID = 5GHz +INSPreferredFreqBSSIDScore = 20 +INSLastConnectedBSSID = true +INSLastConnectedBSSIDScore = 20 +INSAssocReject = true +INSAssocRejectScore = 10 +INSSignalBSSID = true + +# INS(Intelligent Network Selection) configuration: SSID Selection. +INSLastUserSelection = true +INSLastUserSelectionTime = 480 +INSLastUserSelectionScore = 30 +# (INSLastUserSelectionTime - selection time diff) / (INSLastUserSelectionTime / INSLastUserSelectionScore) +# This means '(480 - selection time) / x) <= 30' +INSLastConnected = true +INSLastConnectedScore = 30 +INSPreferredFreq = 5GHz +INSPreferredFreqScore = 60 +INSSecurityPriority = SAE,RSN +INSSecurityPriorityScore = 5 +# In this case, SAE(10 score), RSN(5 score) +INSSignal = true +INSInternet = true +INSInternetScore = 30 + +# INS(Intelligent Network Selection) configuration: Common. +INSSignalLevel3_5GHz = -76 +INSSignalLevel3_24GHz = -74 diff --git a/src/service.c b/src/service.c index 3f6a003..2012319 100755 --- a/src/service.c +++ b/src/service.c @@ -10492,9 +10492,9 @@ static void ins_setting_init(void) ins_settings.last_connected = connman_setting_get_bool("INSLastConnected"); string = connman_option_get_string("INSPreferredFreq"); - if (g_str_equal(string, "5GHz")) + if (g_strcmp0(string, "5GHz") == 0) ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_5GHZ; - else if (g_str_equal(string, "2.4GHz")) + else if (g_strcmp0(string, "2.4GHz") == 0) ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_24GHZ; else ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_UNKNOWN; @@ -10508,21 +10508,21 @@ static void ins_setting_init(void) for (i = 0; string_list && string_list[i]; i++) { unsigned int security_score = string_count * ins_settings.security_priority_score; - if (g_str_equal(string_list[i], "WEP")) + if (g_strcmp0(string_list[i], "WEP") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WEP] = security_score; - else if (g_str_equal(string_list[i], "PSK")) + else if (g_strcmp0(string_list[i], "PSK") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_PSK] = security_score; - else if (g_str_equal(string_list[i], "8021X")) + else if (g_strcmp0(string_list[i], "8021X") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_8021X] = security_score; - else if (g_str_equal(string_list[i], "WPA")) + else if (g_strcmp0(string_list[i], "WPA") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WPA] = security_score; - else if (g_str_equal(string_list[i], "RSN")) + else if (g_strcmp0(string_list[i], "RSN") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_RSN] = security_score; - else if (g_str_equal(string_list[i], "SAE")) + else if (g_strcmp0(string_list[i], "SAE") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_SAE] = security_score; - else if (g_str_equal(string_list[i], "OWE")) + else if (g_strcmp0(string_list[i], "OWE") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_OWE] = security_score; - else if (g_str_equal(string_list[i], "DPP")) + else if (g_strcmp0(string_list[i], "DPP") == 0) ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_DPP] = security_score; string_count--; -- 2.7.4