From: Jaehyun Kim Date: Mon, 12 Dec 2022 06:00:59 +0000 (+0900) Subject: DA: Fix build warnings X-Git-Tag: accepted/tizen/7.0/unified/20221216.024728~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fconnman.git;a=commitdiff_plain;h=325427376ced628eed0208cf24d48c4784939e98 DA: Fix build warnings Change-Id: I7034b55da0b5c364ec5dbbc0395465e700dc3f75 Signed-off-by: Jaehyun Kim --- diff --git a/client/commands.c b/client/commands.c index dab6209..14f5e51 100755 --- a/client/commands.c +++ b/client/commands.c @@ -332,8 +332,8 @@ static int services_list(DBusMessageIter *iter, int errnum, const char *error, } #if defined TIZEN_EXT_INS -static int ins_list(DBusMessageIter *iter, const char *error, - void *user_data) +static int ins_list(DBusMessageIter *iter, int errnum, + const char *error, void *user_data) { char *filter = user_data; diff --git a/configure.ac b/configure.ac index 220d62b..ec8bdbb 100644 --- a/configure.ac +++ b/configure.ac @@ -36,14 +36,14 @@ AC_PROG_LIBTOOL gl_CONFIGMAKE_PREP -AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], +AC_ARG_ENABLE(optimization, AS_HELP_STRING([--disable-optimization], [disable code optimization through compiler]), [ if (test "${enableval}" = "no"); then CFLAGS="$CFLAGS -O0 -U_FORTIFY_SOURCE" fi ]) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], +AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [enable compiling with debugging information]), [ if (test "${enableval}" = "yes" && test "${ac_cv_prog_cc_g}" = "yes"); then @@ -51,7 +51,7 @@ AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], fi ]) -AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], +AC_ARG_ENABLE(pie, AS_HELP_STRING([--enable-pie], [enable position independent executables flag]), [ if (test "${enableval}" = "yes" && test "${ac_cv_prog_cc_pie}" = "yes"); then @@ -61,19 +61,19 @@ AC_ARG_ENABLE(pie, AC_HELP_STRING([--enable-pie], ]) AC_ARG_ENABLE(hh2serial-gps, - AC_HELP_STRING([--enable-hh2serial-gps], [enable hh2serial GPS support]), + AS_HELP_STRING([--enable-hh2serial-gps], [enable hh2serial GPS support]), [enable_hh2serial_gps=${enableval}], [enable_hh2serial_gps="no"]) AM_CONDITIONAL(HH2SERIAL_GPS, test "${enable_hh2serial_gps}" != "no") AM_CONDITIONAL(HH2SERIAL_GPS_BUILTIN, test "${enable_hh2serial_gps}" = "builtin") AC_ARG_ENABLE(telephony, - AC_HELP_STRING([--enable-telephony], [enable Telephony support]), + AS_HELP_STRING([--enable-telephony], [enable Telephony support]), [enable_telephony=${enableval}], [enable_telephony="yes"]) AM_CONDITIONAL(TELEPHONY, test "${enable_telephony}" != "no") AM_CONDITIONAL(TELEPHONY_BUILTIN, test "${enable_telephony}" = "builtin") AC_ARG_ENABLE(tizen-ext, - AC_HELP_STRING([--enable-tizen-ext], [enable TIZEN extensions]), + AS_HELP_STRING([--enable-tizen-ext], [enable TIZEN extensions]), [if (test "${enableval}" = "yes"); then CFLAGS="$CFLAGS -DTIZEN_EXT" LIBS="$LIBS -lsmack" @@ -81,34 +81,34 @@ AC_ARG_ENABLE(tizen-ext, AM_CONDITIONAL(TIZEN_EXT, test "${enable-tizen-ext}" != "no") AC_ARG_ENABLE(tizen-ext-ins, - AC_HELP_STRING([--enable-tizen-ext-ins], [enable TIZEN extensions for INS]), + AS_HELP_STRING([--enable-tizen-ext-ins], [enable TIZEN extensions for INS]), [if (test "${enableval}" = "yes"); then CFLAGS="$CFLAGS -DTIZEN_EXT_INS" fi]) AM_CONDITIONAL(TIZEN_EXT_INS, test "${enable_tizen_ext_ins}" != "no") AC_ARG_ENABLE(tizen-ext-wifi-mesh, - AC_HELP_STRING([--enable-tizen-ext-wifi-mesh], [enable TIZEN extensions for Wi-Fi Mesh]), + AS_HELP_STRING([--enable-tizen-ext-wifi-mesh], [enable TIZEN extensions for Wi-Fi Mesh]), [CFLAGS="$CFLAGS -DTIZEN_EXT_WIFI_MESH"], [enable_tizen_ext_wifi_mesh="no"]) AM_CONDITIONAL(TIZEN_EXT_WIFI_MESH, test "${enable_tizen_ext_wifi_mesh}" != "no") AC_ARG_ENABLE(tizen-ext-eap-on-ethernet, - AC_HELP_STRING([--enable-tizen-ext-eap-on-ethernet], [enable TIZEN extensions for EAP on Ethernet]), + AS_HELP_STRING([--enable-tizen-ext-eap-on-ethernet], [enable TIZEN extensions for EAP on Ethernet]), [CFLAGS="$CFLAGS -DTIZEN_EXT_EAP_ON_ETHERNET"], [enable_tizen_ext_eap_on_ethernet="no"]) AM_CONDITIONAL(TIZEN_EXT_EAP_ON_ETHERNET, test "${enable_tizen_ext_eap_on_ethernet}" != "no") AC_ARG_ENABLE(tizen-maintain-online, - AC_HELP_STRING([--enable-tizen-maintain-online], [enable TIZEN extensions]), + AS_HELP_STRING([--enable-tizen-maintain-online], [enable TIZEN extensions]), [if (test "${enableval}" = "yes"); then CFLAGS="$CFLAGS -DTIZEN_MAINTAIN_ONLINE" LIBS="$LIBS -lsmack" fi]) -AC_ARG_WITH(openconnect, AC_HELP_STRING([--with-openconnect=PROGRAM], +AC_ARG_WITH(openconnect, AS_HELP_STRING([--with-openconnect=PROGRAM], [specify location of openconnect binary]), [path_openconnect=${withval}]) AC_ARG_ENABLE(openconnect, - AC_HELP_STRING([--enable-openconnect], [enable openconnect support]), + AS_HELP_STRING([--enable-openconnect], [enable openconnect support]), [enable_openconnect=${enableval}], [enable_openconnect="no"]) if (test "${enable_openconnect}" != "no"); then if (test -z "${path_openconnect}"); then @@ -126,11 +126,11 @@ fi AM_CONDITIONAL(OPENCONNECT, test "${enable_openconnect}" != "no") AM_CONDITIONAL(OPENCONNECT_BUILTIN, test "${enable_openconnect}" = "builtin") -AC_ARG_WITH(openvpn, AC_HELP_STRING([--with-openvpn=PROGRAM], +AC_ARG_WITH(openvpn, AS_HELP_STRING([--with-openvpn=PROGRAM], [specify location of openvpn binary]), [path_openvpn=${withval}]) AC_ARG_ENABLE(openvpn, - AC_HELP_STRING([--enable-openvpn], [enable openvpn support]), + AS_HELP_STRING([--enable-openvpn], [enable openvpn support]), [enable_openvpn=${enableval}], [enable_openvpn="no"]) if (test "${enable_openvpn}" != "no"); then if (test -z "${path_openvpn}"); then @@ -146,11 +146,11 @@ fi AM_CONDITIONAL(OPENVPN, test "${enable_openvpn}" != "no") AM_CONDITIONAL(OPENVPN_BUILTIN, test "${enable_openvpn}" = "builtin") -AC_ARG_WITH(ipsec, AC_HELP_STRING([--with-ipsec=PROGRAM], +AC_ARG_WITH(ipsec, AS_HELP_STRING([--with-ipsec=PROGRAM], [specify location of ipsec binary]), [path_ipsec=${withval}]) AC_ARG_ENABLE(ipsec, - AC_HELP_STRING([--enable-ipsec], [enable ipsec support]), + AS_HELP_STRING([--enable-ipsec], [enable ipsec support]), [enable_ipsec=${enableval}], [enable_ipsec="no"]) if (test "${enable_ipsec}" != "no"); then PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.28, dummy=yes, @@ -170,11 +170,11 @@ fi AM_CONDITIONAL(IPSEC, test "${enable_ipsec}" != "no") AM_CONDITIONAL(IPSEC_BUILTIN, test "${enable_ipsec}" = "builtin") -AC_ARG_WITH(vpnc, AC_HELP_STRING([--with-vpnc=PROGRAM], +AC_ARG_WITH(vpnc, AS_HELP_STRING([--with-vpnc=PROGRAM], [specify location of vpnc binary]), [path_vpnc=${withval}]) AC_ARG_ENABLE(vpnc, - AC_HELP_STRING([--enable-vpnc], [enable vpnc support]), + AS_HELP_STRING([--enable-vpnc], [enable vpnc support]), [enable_vpnc=${enableval}], [enable_vpnc="no"]) if (test "${enable_vpnc}" != "no"); then if (test -z "${path_vpnc}"); then @@ -190,11 +190,11 @@ fi AM_CONDITIONAL(VPNC, test "${enable_vpnc}" != "no") AM_CONDITIONAL(VPNC_BUILTIN, test "${enable_vpnc}" = "builtin") -AC_ARG_WITH(l2tp, AC_HELP_STRING([--with-l2tp=PROGRAM], +AC_ARG_WITH(l2tp, AS_HELP_STRING([--with-l2tp=PROGRAM], [specify location of l2tp binary]), [path_l2tp=${withval}]) AC_ARG_ENABLE(l2tp, - AC_HELP_STRING([--enable-l2tp], [enable l2tp support]), + AS_HELP_STRING([--enable-l2tp], [enable l2tp support]), [enable_l2tp=${enableval}], [enable_l2tp="no"]) if (test "${enable_l2tp}" != "no"); then if (test -z "${path_pppd}"); then @@ -215,11 +215,11 @@ fi AM_CONDITIONAL(L2TP, test "${enable_l2tp}" != "no") AM_CONDITIONAL(L2TP_BUILTIN, test "${enable_l2tp}" = "builtin") -AC_ARG_WITH(pptp, AC_HELP_STRING([--with-pptp=PROGRAM], +AC_ARG_WITH(pptp, AS_HELP_STRING([--with-pptp=PROGRAM], [specify location of pptp binary]), [path_pptp=${withval}]) AC_ARG_ENABLE(pptp, - AC_HELP_STRING([--enable-pptp], [enable pptp support]), + AS_HELP_STRING([--enable-pptp], [enable pptp support]), [enable_pptp=${enableval}], [enable_pptp="no"]) if (test "${enable_pptp}" != "no"); then if (test -z "${path_pppd}"); then @@ -258,23 +258,23 @@ AC_CHECK_FUNC(signalfd, dummy=yes, AC_CHECK_LIB(dl, dlopen, dummy=yes, AC_MSG_ERROR(dynamic linking loader is required)) -AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm], +AC_ARG_ENABLE(iospm, AS_HELP_STRING([--enable-iospm], [enable Intel OSPM support]), [enable_iospm=${enableval}]) AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes") AC_ARG_ENABLE(tist, - AC_HELP_STRING([--enable-tist], [enable TI Shared Transport support]), + AS_HELP_STRING([--enable-tist], [enable TI Shared Transport support]), [enable_tist=${enableval}], [enable_tist="no"]) AM_CONDITIONAL(TIST, test "${enable_tist}" != "no") AM_CONDITIONAL(TIST_BUILTIN, test "${enable_tist}" = "builtin") AC_ARG_ENABLE(session-policy-local, - AC_HELP_STRING([--enable-session-policy-local], [enable local file Session policy configuration support]), + AS_HELP_STRING([--enable-session-policy-local], [enable local file Session policy configuration support]), [enable_session_policy_local=${enableval}], [enable_session_policy_local="no"]) AM_CONDITIONAL(SESSION_POLICY_LOCAL, test "${enable_session_policy_local}" != "no") AM_CONDITIONAL(SESSION_POLICY_LOCAL_BUILTIN, test "${enable_session_policy_local}" = "builtin") -AC_ARG_WITH(stats-max-file-size, AC_HELP_STRING([--with-stats-max-file-size=SIZE], +AC_ARG_WITH(stats-max-file-size, AS_HELP_STRING([--with-stats-max-file-size=SIZE], [Maximal size of a statistics round robin file]), [stats_max_file_size=${withval}]) @@ -315,7 +315,7 @@ PKG_CHECK_MODULES(DLOG, dlog, dummy=yes, AC_SUBST(DLOG_CFLAGS) AC_SUBST(DLOG_LIBS) -AC_ARG_WITH(dbusconfdir, AC_HELP_STRING([--with-dbusconfdir=PATH], +AC_ARG_WITH(dbusconfdir, AS_HELP_STRING([--with-dbusconfdir=PATH], [path to D-Bus config directory]), [path_dbusconf=${withval}], [path_dbusconf="`$PKG_CONFIG --variable=sysconfdir dbus-1`"]) if (test -z "${path_dbusconf}"); then @@ -325,7 +325,7 @@ else fi AC_SUBST(DBUS_CONFDIR) -AC_ARG_WITH(dbusdatadir, AC_HELP_STRING([--with-dbusdatadir=PATH], +AC_ARG_WITH(dbusdatadir, AS_HELP_STRING([--with-dbusdatadir=PATH], [path to D-Bus data directory]), [path_dbusdata=${withval}], [path_dbusdata="`$PKG_CONFIG --variable=datadir dbus-1`"]) if (test -z "${path_dbusdata}"); then @@ -335,7 +335,7 @@ else fi AC_SUBST(DBUS_DATADIR) -AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR], +AC_ARG_WITH([systemdunitdir], AS_HELP_STRING([--with-systemdunitdir=DIR], [path to systemd service directory]), [path_systemdunit=${withval}], [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"]) if (test -n "${path_systemdunit}"); then @@ -344,7 +344,7 @@ if (test -n "${path_systemdunit}"); then fi AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}") -AC_ARG_WITH([tmpfilesdir], AC_HELP_STRING([--with-tmpfilesdir=DIR], +AC_ARG_WITH([tmpfilesdir], AS_HELP_STRING([--with-tmpfilesdir=DIR], [path to systemd tmpfiles.d directory]), [path_tmpfiles=${withval}], [path_tmpfiles="`$PKG_CONFIG --variable=tmpfilesdir systemd`"]) if (test -n "${path_tmpfiles}"); then @@ -352,7 +352,7 @@ if (test -n "${path_tmpfiles}"); then AC_SUBST(SYSTEMD_TMPFILESDIR) fi -AC_ARG_WITH(firewall, AC_HELP_STRING([--with-firewall=TYPE], +AC_ARG_WITH(firewall, AS_HELP_STRING([--with-firewall=TYPE], [specify which firewall type is used iptables or nftables [default=iptables]]), [firewall_type=${withval}], [firewall_type="iptables"]) @@ -390,16 +390,16 @@ if (test "${firewall_type}" = "nftables"); then fi AM_CONDITIONAL(NFTABLES, test "${found_nftables}" != "no") -AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], +AC_ARG_ENABLE(test, AS_HELP_STRING([--enable-test], [enable test/example scripts]), [enable_test=${enableval}]) AM_CONDITIONAL(TEST, test "${enable_test}" = "yes") -AC_ARG_ENABLE(nmcompat, AC_HELP_STRING([--enable-nmcompat], +AC_ARG_ENABLE(nmcompat, AS_HELP_STRING([--enable-nmcompat], [enable Network Manager support]), [enable_nmcompat=${enableval}], [enable_nmcompat="no"]) AM_CONDITIONAL(NMCOMPAT, test "${enable_nmcompat}" != "no") -AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit], +AC_ARG_ENABLE(polkit, AS_HELP_STRING([--enable-polkit], [enable PolicyKit support]), [enable_polkit=${enableval}], [enable_polkit="no"]) if (test "${enable_polkit}" != "no"); then @@ -412,83 +412,83 @@ if (test "${enable_polkit}" != "no"); then fi AM_CONDITIONAL(POLKIT, test "${enable_polkit}" != "no") -AC_ARG_ENABLE(selinux, AC_HELP_STRING([--enable-selinux], +AC_ARG_ENABLE(selinux, AS_HELP_STRING([--enable-selinux], [enable selinux support]), [enable_selinux=${enableval}], [enable_selinux="no"]) AM_CONDITIONAL(SELINUX, test "${enable_selinux}" != "no") -AC_ARG_ENABLE(loopback, AC_HELP_STRING([--disable-loopback], +AC_ARG_ENABLE(loopback, AS_HELP_STRING([--disable-loopback], [disable loopback support]), [enable_loopback=${enableval}]) AM_CONDITIONAL(LOOPBACK, test "${enable_loopback}" != "no") -AC_ARG_ENABLE(ethernet, AC_HELP_STRING([--disable-ethernet], +AC_ARG_ENABLE(ethernet, AS_HELP_STRING([--disable-ethernet], [disable Ethernet support]), [enable_ethernet=${enableval}]) AM_CONDITIONAL(ETHERNET, test "${enable_ethernet}" != "no") -AC_ARG_ENABLE(wireguard, AC_HELP_STRING([--disable-wireguard], +AC_ARG_ENABLE(wireguard, AS_HELP_STRING([--disable-wireguard], [disable Wireguard support]), [enable_wireguard=${enableval}]) AM_CONDITIONAL(WIREGUARD, test "${enable_wireguard}" != "no") AM_CONDITIONAL(WIREGUARD_BUILTIN, test "${enable_wireguard}" = "builtin") -AC_ARG_ENABLE(gadget, AC_HELP_STRING([--disable-gadget], +AC_ARG_ENABLE(gadget, AS_HELP_STRING([--disable-gadget], [disable USB Gadget support]), [enable_gadget=${enableval}]) AM_CONDITIONAL(GADGET, test "${enable_gadget}" != "no") -AC_ARG_ENABLE(wifi, AC_HELP_STRING([--disable-wifi], +AC_ARG_ENABLE(wifi, AS_HELP_STRING([--disable-wifi], [disable WiFi support]), [enable_wifi=${enableval}]) AM_CONDITIONAL(WIFI, test "${enable_wifi}" != "no") -AC_ARG_ENABLE(iwd, AC_HELP_STRING([--enable-iwd], +AC_ARG_ENABLE(iwd, AS_HELP_STRING([--enable-iwd], [enable iwd support]), [enable_iwd=${enableval}]) AM_CONDITIONAL(IWD, test "${enable_iwd}" = "yes") -AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--disable-bluetooth], +AC_ARG_ENABLE(bluetooth, AS_HELP_STRING([--disable-bluetooth], [disable Bluetooth support]), [enable_bluetooth=${enableval}]) AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" != "no") -AC_ARG_ENABLE(ofono, AC_HELP_STRING([--disable-ofono], +AC_ARG_ENABLE(ofono, AS_HELP_STRING([--disable-ofono], [disable oFono support]), [enable_ofono=${enableval}]) AM_CONDITIONAL(OFONO, test "${enable_ofono}" != "no") -AC_ARG_ENABLE(dundee, AC_HELP_STRING([--disable-dundee], +AC_ARG_ENABLE(dundee, AS_HELP_STRING([--disable-dundee], [disable dundee support (Bluetooth DUN)]), [enable_dundee=${enableval}]) AM_CONDITIONAL(DUNDEE, test "${enable_dundee}" != "no") -AC_ARG_ENABLE(pacrunner, AC_HELP_STRING([--disable-pacrunner], +AC_ARG_ENABLE(pacrunner, AS_HELP_STRING([--disable-pacrunner], [disable PACrunner support]), [enable_pacrunner=${enableval}]) AM_CONDITIONAL(PACRUNNER, test "${enable_pacrunner}" != "no") -AC_ARG_ENABLE(neard, AC_HELP_STRING([--disable-neard], +AC_ARG_ENABLE(neard, AS_HELP_STRING([--disable-neard], [disable Neard support]), [enable_neard=${enableval}]) AM_CONDITIONAL(NEARD, test "${enable_neard}" != "no") -AC_ARG_ENABLE(wispr, AC_HELP_STRING([--disable-wispr], +AC_ARG_ENABLE(wispr, AS_HELP_STRING([--disable-wispr], [disable WISPr support]), [enable_wispr=${enableval}]) AM_CONDITIONAL(WISPR, test "${enable_wispr}" != "no") -AC_ARG_ENABLE(backtrace, AC_HELP_STRING([--disable-backtrace], +AC_ARG_ENABLE(backtrace, AS_HELP_STRING([--disable-backtrace], [disable backtrace support]), [enable_backtrace=${enableval}]) AM_CONDITIONAL(BACKTRACE, test "${enable_backtrace}" != "no") -AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools], +AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools], [disable testing tools]), [enable_tools=${enableval}]) AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no") -AC_ARG_ENABLE(stats, AC_HELP_STRING([--disable-stats], +AC_ARG_ENABLE(stats, AS_HELP_STRING([--disable-stats], [disable statistics round robin file generation]), [enable_stats=${enableval}]) AM_CONDITIONAL(STATS, test "${enable_stats}" != "no") @@ -507,7 +507,7 @@ fi AC_SUBST(IPTABLES_SAVE) AC_SUBST(IP6TABLES_SAVE) -AC_ARG_ENABLE(client, AC_HELP_STRING([--disable-client], +AC_ARG_ENABLE(client, AS_HELP_STRING([--disable-client], [disable command line client]), [enable_client=${enableval}]) AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no") @@ -535,7 +535,7 @@ if (test "${enable_wifi}" != "no"); then $PATH:/bin:/usr/bin) fi -AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], +AC_ARG_ENABLE(datafiles, AS_HELP_STRING([--disable-datafiles], [don't install configuration and data files]), [enable_datafiles=${enableval}]) AM_CONDITIONAL(DATAFILES, test "${enable_datafiles}" != "no") @@ -554,7 +554,7 @@ AM_CONDITIONAL(VPN, test "${enable_openconnect}" != "no" -o \ "${enable_wireguard}" != "no") AC_MSG_CHECKING(which DNS backend to use) -AC_ARG_WITH(dns-backend, AC_HELP_STRING([--with-dns-backend=TYPE], +AC_ARG_WITH(dns-backend, AS_HELP_STRING([--with-dns-backend=TYPE], [specify which DNS backend to use: internal or systemd-resolved [default=internal]]), [dns_backend=${withval}], [dns_backend="internal"]) diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index fea0958..915ffb9 100755 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -3260,8 +3260,9 @@ static void bss_compute_security(struct g_supplicant_bss *bss) #endif #if defined TIZEN_EXT - if (bss->keymgmt & G_SUPPLICANT_KEYMGMT_SAE | - bss->keymgmt & G_SUPPLICANT_KEYMGMT_FT_SAE) + if (bss->keymgmt & + (G_SUPPLICANT_KEYMGMT_SAE | + G_SUPPLICANT_KEYMGMT_FT_SAE)) bss->sae = TRUE; if (bss->keymgmt & G_SUPPLICANT_KEYMGMT_OWE) bss->owe = TRUE; diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 766f8e4..a011627 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -57,6 +57,11 @@ #include #endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ +#if defined TIZEN_EXT +#include "connman.h" +#include "dbus.h" +#endif + static bool eth_tethering = false; struct ethernet_data { diff --git a/plugins/loopback.c b/plugins/loopback.c index 3809d8f..d0ed626 100755 --- a/plugins/loopback.c +++ b/plugins/loopback.c @@ -63,14 +63,14 @@ static void _create_hostname(void) fp = fopen(WIFI_MAC, "r"); if(!fp){ connman_error("Failed to get current hostname"); - strncpy(system_hostname, dev_id, strlen(dev_id)); + strncpy(system_hostname, dev_id, sizeof(system_hostname) - 1); return; } rv = fgets(wifi_mac, HOST_NAME_MAX, fp); if(!rv){ connman_error("Failed to get current hostname"); - strncpy(system_hostname, dev_id, strlen(dev_id)); + strncpy(system_hostname, dev_id, sizeof(system_hostname) - 1); fclose(fp); return; } diff --git a/plugins/wifi.c b/plugins/wifi.c index 3662a50..5ffbd4e 100755 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -33,6 +33,10 @@ #include #include +#if defined TIZEN_EXT +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #ifndef IFF_LOWER_UP #define IFF_LOWER_UP 0x10000 #endif @@ -2208,7 +2212,7 @@ static void start_roaming(struct wifi_data *wifi) connman_network_get_strength(network))) return; - for (bssid_list; bssid_list; bssid_list = bssid_list->next) { + for (; bssid_list; bssid_list = bssid_list->next) { struct g_connman_bssids *bssid = bssid_list->data; if (check_bss_condition(bssid->frequency, @@ -2802,7 +2806,12 @@ static int get_latest_connections(int max_ssids, g_key_file_free(keyfile); continue; } +#if defined TIZEN_EXT + + util_iso8601_to_timeval(str, (struct timeval *)&modified); +#else util_iso8601_to_timeval(str, &modified); +#endif g_free(str); ssid = g_key_file_get_string(keyfile, @@ -3069,7 +3078,7 @@ static int wifi_specific_scan(enum connman_service_type type, count = 0; for (list = specific_scan_list; list; list = list->next) { - freq = (int)list->data; + freq = GPOINTER_TO_INT(list->data); scan_params->freqs[count] = freq; DBG("scan_params->freqs[%d]: %d", count, scan_params->freqs[count]); diff --git a/src/connman.h b/src/connman.h index eccccbb..9d99596 100755 --- a/src/connman.h +++ b/src/connman.h @@ -598,6 +598,13 @@ void __connman_technology_notify_regdom_by_device(struct connman_device *device, int result, const char *alpha2); #if defined TIZEN_EXT +void __connman_technology_notify_mac_policy_by_device(struct connman_device *device, + int result, unsigned int policy); +void __connman_technology_notify_preassoc_mac_policy_by_device(struct connman_device *device, + int result, unsigned int policy); +void __connman_technology_notify_random_mac_lifetime_by_device(struct connman_device *device, + int result, unsigned int lifetime); + enum bssid_type { CHECK_BSSID = 0, GET_BSSID = 1, diff --git a/src/dnsproxy.c b/src/dnsproxy.c index 18dc648..0cdd42c 100755 --- a/src/dnsproxy.c +++ b/src/dnsproxy.c @@ -1843,7 +1843,11 @@ static char *uncompress(int16_t field_count, char *start, char *end, ulen = strlen(name) + 1; if ((uptr + ulen) > uncomp_end) goto out; +#if defined TIZEN_EXT + memcpy(uptr, name, ulen); +#else strncpy(uptr, name, ulen); +#endif debug("pos %d ulen %d left %d name %s", pos, ulen, (int)(uncomp_end - (uptr + ulen)), uptr); diff --git a/src/service.c b/src/service.c index 6d317c1..2437901 100755 --- a/src/service.c +++ b/src/service.c @@ -31,6 +31,10 @@ #include #include +#if defined TIZEN_EXT +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + #include #include #include @@ -475,6 +479,10 @@ static const char *security2string(enum connman_service_security security) #endif case CONNMAN_SERVICE_SECURITY_8021X: return "ieee8021x"; +#if defined TIZEN_EXT + default: + break; +#endif } return NULL; @@ -3391,12 +3399,17 @@ static void append_security(DBusMessageIter *iter, void *user_data) break; #if defined TIZEN_EXT case CONNMAN_SERVICE_SECURITY_OWE: + case CONNMAN_SERVICE_SECURITY_DPP: #endif case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: case CONNMAN_SERVICE_SECURITY_WEP: case CONNMAN_SERVICE_SECURITY_8021X: break; +#if defined TIZEN_EXT + default: + break; +#endif } if (service->wps_advertizing) { @@ -5115,7 +5128,7 @@ void connman_service_set_internet_connection(struct connman_service *service, if (service->is_internet_connection != internet_connection) { service->is_internet_connection = internet_connection; - g_get_current_time(&service->modified); + g_get_current_time((GTimeVal *)&service->modified); service_save(service); } } @@ -5509,6 +5522,7 @@ int __connman_service_check_passphrase(enum connman_service_security security, #if defined TIZEN_EXT case CONNMAN_SERVICE_SECURITY_OWE: case CONNMAN_SERVICE_SECURITY_DPP: + default: #endif break; } @@ -10170,6 +10184,10 @@ static int service_connect(struct connman_service *service) return -ENOKEY; break; +#if defined TIZEN_EXT + default: + break; +#endif } break; } @@ -10196,6 +10214,10 @@ static int service_connect(struct connman_service *service) case CONNMAN_SERVICE_SECURITY_8021X: prepare_8021x(service); break; +#if defined TIZEN_EXT + default: + break; +#endif } if (__connman_stats_service_register(service) == 0) { @@ -11254,7 +11276,7 @@ sorting: need_save |= update_last_connected_bssid(service); need_save |= update_assoc_reject(service); if (need_save) { - g_get_current_time(&service->modified); + g_get_current_time((GTimeVal *)&service->modified); service_ext_save(service); need_sort = true; }