From 83896558428997aea4e4247ca78ae99a0d0bfccb Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Fri, 24 Jan 2014 17:09:12 +0900 Subject: [PATCH 2/6] Initial NITZ plugin upload Change-Id: I3e32feaf714a940b71503de3b51cd1df4b6e60e2 --- AUTHORS | 0 CMakeLists.txt | 45 +++ LICENSE | 203 ++++++++++++ packaging/tel-plugin-nitz.spec | 44 +++ src/citylist.c | 733 +++++++++++++++++++++++++++++++++++++++++ src/citylist.h | 39 +++ src/common.h | 45 +++ src/desc-nitz.c | 100 ++++++ src/time_update.c | 167 ++++++++++ src/time_update.h | 26 ++ tel-plugin-nitz.manifest | 5 + 11 files changed, 1407 insertions(+) create mode 100644 AUTHORS create mode 100644 CMakeLists.txt create mode 100644 LICENSE create mode 100644 packaging/tel-plugin-nitz.spec create mode 100644 src/citylist.c create mode 100644 src/citylist.h create mode 100644 src/common.h create mode 100644 src/desc-nitz.c create mode 100644 src/time_update.c create mode 100644 src/time_update.h create mode 100644 tel-plugin-nitz.manifest diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..1fd0b76 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,45 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +PROJECT(nitz-plugin C) + +# INCLUDE(FindPkgConfig) +SET(PREFIX ${CMAKE_INSTALL_PREFIX}) +SET(EXEC_PREFIX "\${prefix}") +SET(LIBDIR "\${prefix}/lib") +SET(INCLUDEDIR "\${prefix}/include") + +# Set required packages +INCLUDE(FindPkgConfig) +pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 tcore vconf sysman) + +FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +ENDFOREACH(flag) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/) + +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wextra -fvisibility=hidden -fPIC") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter -Wno-missing-field-initializers -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align") + +ADD_DEFINITIONS("-DFEATURE_TLOG_DEBUG") +ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"NITZ\"") +ADD_DEFINITIONS("-DPLUGIN_VERSION=${VERSION}") +ADD_DEFINITIONS("-DEXPORT_API=__attribute__((visibility(\"default\")))") + +MESSAGE(${CMAKE_C_FLAGS}) +MESSAGE(${pkgs_LDFLAGS}) + +SET(SRCS + src/desc-nitz.c + src/time_update.c + src/citylist.c +) + +# library build +ADD_LIBRARY(nitz-plugin SHARED ${SRCS}) +TARGET_LINK_LIBRARIES(nitz-plugin ${pkgs_LDFLAGS}) +SET_TARGET_PROPERTIES(nitz-plugin PROPERTIES PREFIX "" OUTPUT_NAME nitz-plugin) + +# install +INSTALL(TARGETS nitz-plugin + LIBRARY DESTINATION lib/telephony/plugins) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d6fbf45 --- /dev/null +++ b/LICENSE @@ -0,0 +1,203 @@ +Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec new file mode 100644 index 0000000..38a07fd --- /dev/null +++ b/packaging/tel-plugin-nitz.spec @@ -0,0 +1,44 @@ +%define major 0 +%define minor 1 +%define patchlevel 19 +Name: tel-plugin-nitz +Summary: nitz plugin for telephony +Version: %{major}.%{minor}.%{patchlevel} +Release: 1 +Group: System/Libraries +License: Apache +Source0: tel-plugin-nitz-%{version}.tar.gz +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: cmake +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(tcore) +BuildRequires: pkgconfig(vconf) +BuildRequires: pkgconfig(sysman) + +%description +nitz plugin for telephony + +%prep +%setup -q + +%build +versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}] +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=$versionint +make %{?jobs:-j%jobs} + +%post +/sbin/ldconfig + +%postun -p /sbin/ldconfig + +%install +rm -rf %{buildroot} +%make_install + +%files +%manifest tel-plugin-nitz.manifest +%defattr(-,root,root,-) +#%doc COPYING +%{_libdir}/telephony/plugins/* diff --git a/src/citylist.c b/src/citylist.c new file mode 100644 index 0000000..68de04b --- /dev/null +++ b/src/citylist.c @@ -0,0 +1,733 @@ +/* + * tel-plugin-nitz + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include + +#include + +#include "common.h" +#include "citylist.h" + +static NITZ_MCC_TZFILE_MAP nitz_table_mcc_tzfile[] = +{ + { 202, "GR", -1, +2, +1, "Europe/Athens" }, // Greece -- Athens + { 204, "NL", -1, +1, +1, "Europe/Amsterdam" }, // Netherlands -- Amsterdam + { 206, "BE", -1, +1, +1, "Europe/Brussels" }, // Belgium -- Brussels + { 208, "FR", -1, +1, +1, "Europe/Paris" }, // France -- Paris + { 212, "MC", -1, +1, +1, "Europe/Monaco" }, // Monaco -- Monaco + { 213, "AD", -1, +1, +1, "Europe/Andorra" }, // Andorra -- Andorra la Vella + + { 214, "ES", 0, +1, +1, "Europe/Madrid" }, // Spain -- Madrid + { 214, "ES", 1, +1, +1, "Africa/Ceuta" }, // + { 214, "ES", 2, 0, +1, "Atlantic/Canary" }, // + + { 216, "HU", -1, 0, 0, "Europe/Budapest" }, // Hungary -- Budapest + { 218, "BA", -1, 0, 0, "Europe/Sarajevo" }, // Bosnia and Herzegovina -- Sarajevo + { 219, "HR", -1, 0, 0, "Europe/Zagreb" }, // Croatia -- Zagreb + { 220, "RS", -1, 0, 0, "Europe/Belgrade" }, // Serbia -- Belgrade + { 222, "IT", -1, 0, 0, "Europe/Rome" }, // Italy -- Rome + { 225, "VA", -1, 0, 0, "Europe/Vatican" }, + { 226, "RO", -1, 0, 0, "Europe/Bucharest" }, // Romania -- Bucharest + { 228, "CH", -1, 0, 0, "Europe/Zurich" }, // Switzerland -- Bern + { 230, "CZ", -1, 0, 0, "Europe/Prague" }, // Czech Republic -- Prague + { 231, "SK", -1, 0, 0, "Europe/Bratislava" }, // Slovak Republic -- Bratislava + { 232, "AT", -1, 0, 0, "Europe/Vienna" }, // Austria -- Vienna + { 234, "GB", -1, 0, 0, "Europe/London" }, // United Kingdom -- London + { 235, "GB", -1, 0, 0, "Europe/London" }, // United Kingdom -- London + { 238, "DK", -1, 0, 0, "Europe/Copenhagen" }, // Denmark -- Copenhagen + { 240, "SE", -1, 0, 0, "Europe/Stockholm" }, // Sweden -- Stockholm + { 242, "NO", -1, 0, 0, "Europe/Oslo" }, // Norway -- Oslo + { 244, "FI", -1, 0, 0, "Europe/Helsinki" }, // Finland -- Helsinki + { 246, "LT", -1, 0, 0, "Europe/Vilnius" }, // Lithuania -- Vilnius + { 247, "LV", -1, 0, 0, "Europe/Riga" }, // Latvia -- Riga + { 248, "EE", -1, 0, 0, "Europe/Tallinn" }, // Estonia -- Tallinn + + { 250, "RU", 0, +3, +1, "Europe/Moscow" }, // Russia -- Moscow+00 + { 250, "RU", 1, +2, +1, "Europe/Kaliningrad" }, // Russia -- Moscow-01 + { 250, "RU", 2, +3, +1, "Europe/Volgograd" }, // Russia -- Moscow+00 + { 250, "RU", 3, +3, +1, "Europe/Samara" }, // Russia -- Moscow + { 250, "RU", 4, +5, +1, "Asia/Yekaterinburg" }, // Russia -- Moscow+02 + { 250, "RU", 5, +6, +1, "Asia/Omsk" }, // Russia -- Moscow+03 + { 250, "RU", 6, +6, +1, "Asia/Novosibirsk" }, // Russia -- Moscow+03 + { 250, "RU", 7, +6, +1, "Asia/Novokuznetsk" }, // Russia -- Moscow+03 + { 250, "RU", 8, +7, +1, "Asia/Krasnoyarsk" }, // Russia -- Moscow+04 + { 250, "RU", 9, +8, +1, "Asia/Irkutsk" }, // Russia -- Moscow+05 + { 250, "RU", 10, +9, +1, "Asia/Yakutsk" }, // Russia -- Moscow+06 + { 250, "RU", 11, +10, +1, "Asia/Vladivostok" }, // Russia -- Moscow+07 + { 250, "RU", 12, +10, +1, "Asia/Sakhalin" }, // Russia -- Moscow+07 + { 250, "RU", 13, +11, +1, "Asia/Magadan" }, // Russia -- Moscow+08 + { 250, "RU", 14, +11, +1, "Asia/Kamchatka" }, // Russia -- Moscow+08 + { 250, "RU", 15, +11, +1, "Asia/Anadyr" }, // Russia -- Moscow+08 + + { 255, "UA", 0, +2, +1, "Europe/Kiev" }, // Ukraine -- Kiev + { 255, "UA", 1, +2, +1, "Europe/Uzhgorod" }, // Ukraine -- + { 255, "UA", 2, +2, +1, "Europe/Zaporozhye" }, // Ukraine -- + { 255, "UA", 3, +2, +1, "Europe/Simferopol" }, // Ukraine -- + + { 257, "BY", -1, 0, 0, "Europe/Minsk" }, // Belarus Republic -- Minsk + { 259, "MD", -1, 0, 0, "Europe/Chisinau" }, // Moldova -- Kishinev(Chisinau) + { 260, "PL", -1, 0, 0, "Europe/Warsaw" }, // Poland -- Warsaw + { 262, "DE", -1, 0, 0, "Europe/Berlin" }, // Germany -- Berlin + { 266, "GI", -1, 0, 0, "Europe/Gibraltar" }, // Gibraltar -- Gibraltar + + { 268, "PT", 0, +0, +1, "Europe/Lisbon" }, // Portugal -- Lisbon + { 268, "PT", 1, +0, +1, "Atlantic/Madeira" }, // + { 268, "PT", 2, -1, +1, "Atlantic/Azores" }, // + + { 270, "LU", -1, 0, 0, "Europe/Luxembourg" }, // Luxembourg -- Luxembourg + { 272, "IE", -1, 0, 0, "Europe/Dublin" }, // Ireland -- Dublin + { 274, "IS", -1, 0, 0, "Atlantic/Reykjavik" }, // Iceland -- Reykjavik + { 276, "AL", -1, 0, 0, "Europe/Tirane" }, // Albania -- Tirane + { 278, "MT", -1, 0, 0, "Europe/Malta" }, // Malta -- Valletta + { 280, "CY", -1, 0, 0, "Asia/Nicosia" }, // Cyprus -- Nicosia + { 282, "GE", -1, 0, 0, "Asia/Tbilisi" }, // Georgia -- Tbilisi + { 283, "AM", -1, 0, 0, "Asia/Yerevan" }, // Armenia -- Yerevan + { 284, "BG", -1, 0, 0, "Europe/Sofia" }, // Bulgaria -- Sofia + { 286, "TR", -1, 0, 0, "Europe/Istanbul" }, // Turkey -- Ankara + { 288, "FO", -1, 0, 0, "Atlantic/Faroe" }, // Faroe Islands -- Torshavn + + { 290, "GL", 0, -3, +1, "America/Godthab" }, // Greenland -- Nuuk /*!*/ + { 290, "GL", 1, +0, +0, "America/Danmarkshavn" }, // + { 290, "GL", 2, -1, +1, "America/Scoresbysund" }, // + { 290, "GL", 3, -4, +1, "America/Thule" }, // + + { 292, "SM", -1, 0, 0, "Europe/San_Marino" }, // San Marino -- San Marino + { 293, "SI", -1, 0, 0, "Europe/Ljubljana" }, // Slovenia -- Ljubljana + { 294, "MK", -1, 0, 0, "Europe/Skopje" }, // Macedonia -- Skopje + { 295, "LI", -1, 0, 0, "Europe/Vaduz" }, // Liechtenstein -- Vaduz + { 297, "ME", -1, 0, 0, "Europe/Podgorica" }, // Montenegro -- Podgorica + + { 302, "CA", 0, -4, +1, "America/St_Johns" }, // + { 302, "CA", 1, -4, +1, "America/Halifax" }, // + { 302, "CA", 2, -4, +1, "America/Glace_Bay" }, // + { 302, "CA", 3, -4, +1, "America/Moncton" }, // + { 302, "CA", 4, -4, +1, "America/Goose_Bay" }, // + { 302, "CA", 5, -4, +0, "America/Blanc-Sablon" }, // + { 302, "CA", 6, -5, +1, "America/Montreal" }, // + { 302, "CA", 7, -5, +1, "America/Toronto" }, //Canada -- Ottawa /*!*/ + { 302, "CA", 8, -5, +1, "America/Nipigon" }, // + { 302, "CA", 9, -5, +1, "America/Thunder_Bay" }, // + { 302, "CA", 10, -5, +1, "America/Iqaluit" }, // + { 302, "CA", 11, -5, +1, "America/Pangnirtung" }, // + { 302, "CA", 12, -6, +1, "America/Resolute" }, // + { 302, "CA", 13, -6, +1, "America/Atikokan" }, // + { 302, "CA", 14, -6, +1, "America/Rankin_Inlet" }, // + { 302, "CA", 15, -6, +1, "America/Winnipeg" }, // + { 302, "CA", 16, -6, +1, "America/Rainy_River" }, // + { 302, "CA", 17, -6, +0, "America/Regina" }, // + { 302, "CA", 18, -8, +1, "America/Swift_Current" }, // + { 302, "CA", 19, -7, +1, "America/Edmonton" }, // + { 302, "CA", 20, -7, +1, "America/Cambridge_Bay" }, // + { 302, "CA", 21, -7, +1, "America/Yellowknife" }, // + { 302, "CA", 22, -7, +1, "America/Inuvik" }, // + { 302, "CA", 23, -7, +0, "America/Dawson_Creek" }, // + { 302, "CA", 24, -8, +1, "America/Vancouver" }, // + { 302, "CA", 25, -8, +1, "America/Whitehorse" }, // + { 302, "CA", 26, -8, +1, "America/Dawson" }, // + + { 308, "PM", -1, 0, 0, "America/Miquelon" }, // Saint Pierre and Miquelon -- Saint-Pierre + + { 310, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 310, "US", 1, -5, +1, "America/Detroit" }, // + { 310, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 310, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 310, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 310, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 310, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 310, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 310, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 310, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 310, "US", 10, -6, +1, "America/Chicago" }, // + { 310, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 310, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 310, "US", 13, -6, +1, "America/Menominee" }, // + { 310, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 310, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 310, "US", 16, -7, +1, "America/Denver" }, // + { 310, "US", 17, -7, +1, "America/Boise" }, // + { 310, "US", 18, -7, +1, "America/Shiprock" }, // + { 310, "US", 19, -7, +0, "America/Phoenix" }, // + { 310, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 310, "US", 21, -9, +1, "America/Anchorage" }, // = Alaska + { 310, "US", 22, -9, +1, "America/Juneau" }, // + { 310, "US", 23, -9, +1, "America/Yakutat" }, // + { 310, "US", 24, -9, +1, "America/Nome" }, // + { 310, "US", 25, -10, +1, "America/Adak" }, // + { 310, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 311, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 311, "US", 1, -5, +1, "America/Detroit" }, // + { 311, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 311, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 311, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 311, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 311, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 311, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 311, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 311, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 311, "US", 10, -6, +1, "America/Chicago" }, // + { 311, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 311, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 311, "US", 13, -6, +1, "America/Menominee" }, // + { 311, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 311, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 311, "US", 16, -7, +1, "America/Denver" }, // + { 311, "US", 17, -7, +1, "America/Boise" }, // + { 311, "US", 18, -7, +1, "America/Shiprock" }, // + { 311, "US", 19, -7, +0, "America/Phoenix" }, // + { 311, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 311, "US", 21, -9, +1, "America/Anchorage" }, // + { 311, "US", 22, -9, +1, "America/Juneau" }, // + { 311, "US", 23, -9, +1, "America/Yakutat" }, // + { 311, "US", 24, -9, +1, "America/Nome" }, // + { 311, "US", 25, -10, +1, "America/Adak" }, // + { 311, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 312, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 312, "US", 1, -5, +1, "America/Detroit" }, // + { 312, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 312, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 312, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 312, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 312, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 312, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 312, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 312, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 312, "US", 10, -6, +1, "America/Chicago" }, // + { 312, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 312, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 312, "US", 13, -6, +1, "America/Menominee" }, // + { 312, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 312, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 312, "US", 16, -7, +1, "America/Denver" }, // + { 312, "US", 17, -7, +1, "America/Boise" }, // + { 312, "US", 18, -7, +1, "America/Shiprock" }, // + { 312, "US", 19, -7, +0, "America/Phoenix" }, // + { 312, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 312, "US", 21, -9, +1, "America/Anchorage" }, // + { 312, "US", 22, -9, +1, "America/Juneau" }, // + { 312, "US", 23, -9, +1, "America/Yakutat" }, // + { 312, "US", 24, -9, +1, "America/Nome" }, // + { 312, "US", 25, -10, +1, "America/Adak" }, // + { 312, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 313, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 313, "US", 1, -5, +1, "America/Detroit" }, // + { 313, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 313, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 313, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 313, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 313, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 313, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 313, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 313, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 313, "US", 10, -6, +1, "America/Chicago" }, // + { 313, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 313, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 313, "US", 13, -6, +1, "America/Menominee" }, // + { 313, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 313, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 313, "US", 16, -7, +1, "America/Denver" }, // + { 313, "US", 17, -7, +1, "America/Boise" }, // + { 313, "US", 18, -7, +1, "America/Shiprock" }, // + { 313, "US", 19, -7, +0, "America/Phoenix" }, // + { 313, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 313, "US", 21, -9, +1, "America/Anchorage" }, // + { 313, "US", 22, -9, +1, "America/Juneau" }, // + { 313, "US", 23, -9, +1, "America/Yakutat" }, // + { 313, "US", 24, -9, +1, "America/Nome" }, // + { 313, "US", 25, -10, +1, "America/Adak" }, // + { 313, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 314, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 314, "US", 1, -5, +1, "America/Detroit" }, // + { 314, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 314, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 314, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 314, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 314, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 314, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 314, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 314, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 314, "US", 10, -6, +1, "America/Chicago" }, // + { 314, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 314, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 314, "US", 13, -6, +1, "America/Menominee" }, // + { 314, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 314, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 314, "US", 16, -7, +1, "America/Denver" }, // + { 314, "US", 17, -7, +1, "America/Boise" }, // + { 314, "US", 18, -7, +1, "America/Shiprock" }, // + { 314, "US", 19, -7, +0, "America/Phoenix" }, // + { 314, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 314, "US", 21, -9, +1, "America/Anchorage" }, // + { 314, "US", 22, -9, +1, "America/Juneau" }, // + { 314, "US", 23, -9, +1, "America/Yakutat" }, // + { 314, "US", 24, -9, +1, "America/Nome" }, // + { 314, "US", 25, -10, +1, "America/Adak" }, // + { 314, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 315, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 315, "US", 1, -5, +1, "America/Detroit" }, // + { 315, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 315, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 315, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 315, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 315, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 315, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 315, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 315, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 315, "US", 10, -6, +1, "America/Chicago" }, // + { 315, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 315, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 315, "US", 13, -6, +1, "America/Menominee" }, // + { 315, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 315, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 315, "US", 16, -7, +1, "America/Denver" }, // + { 315, "US", 17, -7, +1, "America/Boise" }, // + { 315, "US", 18, -7, +1, "America/Shiprock" }, // + { 315, "US", 19, -7, +0, "America/Phoenix" }, // + { 315, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 315, "US", 21, -9, +1, "America/Anchorage" }, // + { 315, "US", 22, -9, +1, "America/Juneau" }, // + { 315, "US", 23, -9, +1, "America/Yakutat" }, // + { 315, "US", 24, -9, +1, "America/Nome" }, // + { 315, "US", 25, -10, +1, "America/Adak" }, // + { 315, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 316, "US", 0, -5, +1, "America/New_York" }, // U.S.A /*!*/ + { 316, "US", 1, -5, +1, "America/Detroit" }, // + { 316, "US", 2, -5, +1, "America/Kentucky/Louisville" }, // + { 316, "US", 3, -5, +1, "America/Kentucky/Monticello" }, // + { 316, "US", 4, -5, +1, "America/Indiana/Indianapolis" }, // + { 316, "US", 5, -5, +1, "America/Indiana/Vincennes" }, // + { 316, "US", 6, -5, +1, "America/Indiana/Winamac" }, // + { 316, "US", 7, -5, +1, "America/Indiana/Marengo" }, // + { 316, "US", 8, -5, +1, "America/Indiana/Petersburg" }, // + { 316, "US", 9, -5, +1, "America/Indiana/Vevay" }, // + { 316, "US", 10, -6, +1, "America/Chicago" }, // + { 316, "US", 11, -6, +1, "America/Indiana/Tell_City" }, // + { 316, "US", 12, -6, +1, "America/Indiana/Knox" }, // + { 316, "US", 13, -6, +1, "America/Menominee" }, // + { 316, "US", 14, -6, +1, "America/North_Dakota/Center" }, // + { 316, "US", 15, -6, +1, "America/North_Dakota/New_Salem" }, // + { 316, "US", 16, -7, +1, "America/Denver" }, // + { 316, "US", 17, -7, +1, "America/Boise" }, // + { 316, "US", 18, -7, +1, "America/Shiprock" }, // + { 316, "US", 19, -7, +0, "America/Phoenix" }, // + { 316, "US", 20, -8, +1, "America/Los_Angeles" }, // + { 316, "US", 21, -9, +1, "America/Anchorage" }, // + { 316, "US", 22, -9, +1, "America/Juneau" }, // + { 316, "US", 23, -9, +1, "America/Yakutat" }, // + { 316, "US", 24, -9, +1, "America/Nome" }, // + { 316, "US", 25, -10, +1, "America/Adak" }, // + { 316, "US", 26, -10, +0, "Pacific/Honolulu" }, // + + { 330, "PR", -1, 0, 0, "America/Puerto_Rico" }, // Puerto Rico -- San Juan + { 332, "VI", -1, 0, 0, "America/St_Thomas" }, // United States Virgin Islands -- Charlotte Amalie /*!*/ + + { 334, "MX", 0, -6, +1, "America/Mexico_City" }, // Mexico -- Mexico City + { 334, "MX", 1, -6, +1, "America/Cancun" }, // + { 334, "MX", 2, -6, +1, "America/Merida" }, // + { 334, "MX", 3, -6, +1, "America/Monterrey" }, // + { 334, "MX", 4, -6, +1, "America/Matamoros" }, // + { 334, "MX", 5, -7, +1, "America/Mazatlan" }, // + { 334, "MX", 6, -7, +1, "America/Chihuahua" }, // + { 334, "MX", 7, -6, +1, "America/Ojinaga" }, // + { 334, "MX", 8, -7, +0, "America/Hermosillo" }, // + { 334, "MX", 9, -8, +1, "America/Tijuana" }, // + { 334, "MX", 10, -6, +1, "America/Santa_Isabel" }, // + { 334, "MX", 11, -7, +1, "America/Bahia_Banderas" }, // + + { 338, "JM", -1, 0, 0, "America/Jamaica" }, // Jamaica -- Kingston + { 340, "GP", -1, 0, 0, "America/Guadeloupe" }, // Guadeloupe(france) -- Basse-Terre + { 340, "MQ", -1, 0, 0, "America/Martinique" }, + { 342, "BB", -1, 0, 0, "America/Barbados" }, // Barbados -- Bridgetown + { 344, "AG", -1, 0, 0, "America/Antigua" }, // Antigua & Barbuda -- Saint John's + { 346, "KY", -1, 0, 0, "America/Cayman" }, // Cayman Islands -- George Town + { 348, "VG", -1, 0, 0, "America/Tortola" }, // British Virgin Islands -- Road Town + { 350, "BM", -1, 0, 0, "Atlantic/Bermuda" }, // Bermuda -- Hamilton + { 352, "GD", -1, 0, 0, "America/Grenada" }, // Grenada -- Saint George's + { 354, "MS", -1, 0, 0, "America/Montserrat" }, // Montserrat(UK) -- Plymouth + { 356, "KN", -1, 0, 0, "America/St_Kitts" }, // Saint Kitts and Nevis -- Basseterre + { 358, "LC", -1, 0, 0, "America/St_Lucia" }, // Saint Lucia -- Castries + { 360, "VC", -1, 0, 0, "America/St_Vincent" }, // Saint Vincent and the Grenadines -- Kingstown + { 362, "AN", -1, 0, 0, "America/Curacao" }, // Netherlands Antilles -- Willemstad + { 363, "AW", -1, 0, 0, "America/Aruba" }, // Aruba(netherlands) -- Oranjestad + { 364, "BS", -1, 0, 0, "America/Nassau" }, // Bahamas -- Nassau + { 365, "AI", -1, 0, 0, "America/Antigua" }, // Anguilla -- The Valley + { 366, "DM", -1, 0, 0, "America/Dominica" }, // Dominica -- Roseau + { 368, "CU", -1, 0, 0, "America/Havana" }, // Cuba -- Havana + { 370, "DO", -1, 0, 0, "America/Santo_Domingo" }, // Dominican Republic -- Santo Domingo + { 372, "HT", -1, 0, 0, "America/Port-au-Prince" }, // Haiti -- Port au Prince //world + { 374, "TT", -1, 0, 0, "America/Port_of_Spain" }, // Trinidad and Tobago -- Port of Spain + { 376, "TC", -1, 0, 0, "America/Grand_Turk" }, // Turks & Caicos islands(UK) -- Cockburn Town + { 400, "AZ", -1, 0, 0, "Asia/Baku" }, // Azerbaijan -- Baku + + { 401, "KZ", 0, +6, +0, "Asia/Almaty" }, + { 401, "KZ", 1, +5, +0, "Asia/Qyzylorda" }, + { 401, "KZ", 2, +5, +0, "Asia/Aqtobe" }, + { 401, "KZ", 3, +5, +0, "Asia/Aqtau" }, + { 401, "KZ", 4, +5, +0, "Asia/Oral" }, + + { 402, "BT", -1, 0, 0, "Asia/Thimphu" }, // Bhutan -- Thimphu + { 404, "IN", -1, 0, 0, "Asia/Kolkata" }, // India - New Delhi + { 405, "IN", -1, 0, 0, "Asia/Kolkata" }, // India - New Delhi + { 410, "PK", -1, 0, 0, "Asia/Karachi" }, // Pakistan -- Islamabad + { 412, "AF", -1, 0, 0, "Asia/Kabul" }, // Afghanistan -- Kabul + { 413, "LK", -1, 0, 0, "Asia/Colombo" }, // Sri Lanka -- Colombo + { 414, "MM", -1, 0, 0, "Asia/Rangoon" }, // Myanmar -- Rangoon (Yangon) + { 415, "LB", -1, 0, 0, "Asia/Beirut" }, // Lebanon -- Beirut + { 416, "JO", -1, 0, 0, "Asia/Amman" }, // Jordan -- Amman + { 417, "SY", -1, 0, 0, "Asia/Damascus" }, // Syria -- Damascus + { 418, "IQ", -1, 0, 0, "Asia/Baghdad" }, // Iraq -- Baghdad + { 419, "KW", -1, 0, 0, "Asia/Kuwait" }, // Kuwait -- Kuwait City + { 420, "SA", -1, 0, 0, "Asia/Riyadh" }, // Saudi Arabia -- Riyadh + { 421, "YE", -1, 0, 0, "Asia/Aden" }, // Yemen -- Sanaa /*!*/ + { 422, "OM", -1, 0, 0, "Asia/Muscat" }, // Oman -- Muscat + { 423, "PS", -1, 0, 0, "Asia/Gaza" }, + { 424, "AE", -1, 0, 0, "Asia/Dubai" }, // United Arab Emirates -- Abu Dhabi /*!*/ + { 425, "IL", -1, 0, 0, "Asia/Jerusalem" }, // Israel -- Tel Aviv /*!*/ + { 426, "BH", -1, 0, 0, "Asia/Bahrain" }, // Bahrain -- Manama + { 427, "QA", -1, 0, 0, "Asia/Qatar" }, // Qatar -- Doha + + { 428, "MN", 0, +8, +0, "Asia/Ulaanbaatar" }, // Mongolia -- Ulaanbaatar + { 428, "MN", 1, +7, +0, "Asia/Hovd" }, // + { 428, "MN", 2, +8, +0, "Asia/Choibalsan" }, // + + { 429, "NP", -1, 0, 0, "Asia/Kathmandu" }, // Nepal -- Kathmandu + { 430, "AE", -1, 0, 0, "Asia/Dubai" }, // Abu Dhabi + { 431, "AE", -1, 0, 0, "Asia/Dubai" }, // Dubai + { 432, "IR", -1, 0, 0, "Asia/Tehran" }, // Iran -- Tehran + + { 434, "UZ", 0, +5, +0, "Asia/Samarkand" }, // Uzbekistan -- Samarkand + { 434, "UZ", 1, +5, +0, "Asia/Tashkent" }, // Uzbekistan -- Tashkent + + { 436, "TJ", -1, 0, 0, "Asia/Dushanbe" }, // Tajikistan -- Dushanbe + { 437, "KG", -1, 0, 0, "Asia/Bishkek" }, // Kyrgyzstan -- Bishkek + { 438, "TM", -1, 0, 0, "Asia/Ashgabat" }, // Turkmenistan -- Ashgabat + { 440, "JP", -1, 0, 0, "Asia/Tokyo" }, // Japan -- Tokyo + { 441, "JP", -1, 0, 0, "Asia/Tokyo" }, + { 450, "KR", -1, 0, 0, "Asia/Seoul" }, // South Korea -- Seoul + { 452, "VN", -1, 0, 0, "Asia/Ho_Chi_Minh" }, // Vietnam -- Hanoi + { 454, "HK", -1, 0, 0, "Asia/Hong_Kong" }, // Hong Kong - Hong Kong + { 455, "MO", -1, 0, 0, "Asia/Macau" }, // Macau(PRC) -- ??? + { 456, "KH", -1, 0, 0, "Asia/Phnom_Penh" }, // Cambodia -- Phnom Penh + { 457, "LA", -1, 0, 0, "Asia/Vientiane" }, // Laos -- Vientiane + + { 460, "CN", 0, +8, +0, "Asia/Shanghai" }, // China -- Beijing /*!*/ + { 460, "CN", 1, +8, +0, "Asia/Harbin" }, // + { 460, "CN", 2, +8, +0, "Asia/Chongqing" }, // + { 460, "CN", 3, +8, +0, "Asia/Urumqi" }, // + { 460, "CN", 4, +8, +0, "Asia/Kashgar" }, // + + { 466, "TW", -1, 0, 0, "Asia/Taipei" }, // Taiwan -- Taipei + { 467, "KP", -1, 0, 0, "Asia/Pyongyang" }, // North Korea -- Pyongyang + { 470, "BD", -1, 0, 0, "Asia/Dhaka" }, // Bangladesh -- Dhaka + { 472, "MV", -1, 0, 0, "Indian/Maldives" }, // Maldives -- Male + + { 502, "MY", 0, +8, +0, "Asia/Kuala_Lumpur" },// Malaysia -- Kuala Lumpur + { 502, "MY", 1, +8, +0, "Asia/Kuching" }, // + + { 505, "AU", 0, +10, +1, "Australia/Sydney" }, // Australia -- Canberra (n-project: Sydney) /*!*/ + { 505, "AU", 1, +10, +1, "Australia/Lord_Howe" }, // +10:30, +00:30 /*!*/ + { 505, "AU", 2, +10, +1, "Australia/Hobart" }, // + { 505, "AU", 3, +10, +1, "Australia/Currie" }, // + { 505, "AU", 4, +10, +1, "Australia/Melbourne" }, // + { 505, "AU", 5, +10, +1, "Australia/Broken_Hill" }, // + { 505, "AU", 6, +10, +0, "Australia/Brisbane" }, // + { 505, "AU", 7, +10, +0, "Australia/Lindeman" }, // + { 505, "AU", 8, +9, +1, "Australia/Adelaide" }, // +09:30, +01:00 + { 505, "AU", 9, +9, +0, "Australia/Darwin" }, // +09:30, +0 + { 505, "AU", 10, +8, +0, "Australia/Perth" }, // + { 505, "AU", 11, +8, +0, "Australia/Eucla" }, // +08:45 + + { 510, "ID", 0, +7, +0, "Asia/Jakarta" }, // Indonesia -- Jakarta + { 510, "ID", 1, +7, +0, "Asia/Pontianak" }, // + { 510, "ID", 2, +8, +0, "Asia/Makassar" }, // + { 510, "ID", 3, +9, +0, "Asia/Jayapura" }, // + + { 514, "TL", -1, 0, 0, "Asia/Dili" }, // Timor -- Dili + { 515, "PH", -1, 0, 0, "Asia/Manila" }, // Philippines -- Manila + { 520, "TH", -1, 0, 0, "Asia/Bangkok" }, // Thailand -- Bangkok + { 525, "SG", -1, 0, 0, "Asia/Singapore" }, // Singapore -- Singapore + { 528, "BN", -1, 0, 0, "Asia/Brunei" }, // Brunei Darussalam -- Bandar Seri Begawan + + { 530, "NZ", 0, +12, +1, "Pacific/Auckland" },// New Zealand -- Wellington /*!*/ + { 530, "NZ", 1, +12, +1, "Pacific/Chatham" }, // +12:45, +01:00 + + { 534, "MP", -1, 0, 0, "Pacific/Saipan" }, // Northern Mariana Islands (US) + { 535, "GU", -1, 0, 0, "Pacific/Guam" }, // Guam (US) + { 536, "NR", -1, 0, 0, "Pacific/Nauru" }, // Nauru + { 537, "PG", -1, 0, 0, "Pacific/Port_Moresby" }, // Papua New Guinea -- Port Moresby + { 539, "TO", -1, 0, 0, "Pacific/Tongatapu" }, // Tonga -- Nuku'alofa /*!*/ + { 540, "SB", -1, 0, 0, "Pacific/Guadalcanal" },// Solomon -- Honiara /*!*/ + { 541, "VU", -1, 0, 0, "Pacific/Efate" }, // Vanuatu -- Port Vila /*!*/ + { 542, "FJ", -1, 0, 0, "Pacific/Fiji" }, // Fiji -- Suva + { 543, "WF", -1, 0, 0, "Pacific/Wallis" }, // Wallis and Futuna (France) + { 544, "AS", -1, 0, 0, "Pacific/Pago_Pago" }, // American Samoa(US) -- Pago Pago + + { 545, "KI", 0, +12, +0, "Pacific/Tarawa" }, //Kiribati -- Tarawa Atoll + { 545, "KI", 1, +11, +0, "Pacific/Enderbury" }, // + { 545, "KI", 2, +14, +0, "Pacific/Kiritimati" }, // + + { 546, "NC", -1, 0, 0, "Pacific/Noumea" }, // New Caledonia(France) -- Noumea + + { 547, "PF", 0, -10, +0, "Pacific/Tahiti" }, // French Polynesia(France) -- Papeete + { 547, "PF", 1, -9, +0, "Pacific/Marquesas" },// + { 547, "PF", 2, -9, +0, "Pacific/Gambier" }, // + + { 548, "CK", -1, 0, 0, "Pacific/Rarotonga" }, // Cook Islands(NZ) -- Avarua /*!*/ + { 549, "WS", -1, 0, 0, "Pacific/Apia" }, // Samoa -- Apia + + { 550, "FM", 0, +11, +0, "Pacific/Pohnpei" }, // Micronesia -- Palikir + { 550, "FM", 1, +10, +0, "Pacific/Chuuk" }, // Truk + { 550, "FM", 2, +11, +0, "Pacific/Kosrae" }, // + + { 551, "MH", 0, +12, +0, "Pacific/Majuro" }, // Marshall Islands + { 551, "MH", 1, +12, +0, "Pacific/Kwajalein" },// + + { 552, "PW", -1, 0, 0, "Pacific/Palau" }, // Palau -- Ngerulmud + { 602, "EG", -1, 0, 0, "Africa/Cairo" }, // Cairo -- Cairo + { 603, "DZ", -1, 0, 0, "Africa/Algiers" }, // Algeri -- Algiers + { 604, "MA", -1, 0, 0, "Africa/Casablanca" }, // Morocco -- Rabat /*!*/ + { 605, "TN", -1, 0, 0, "Africa/Tunis" }, // Tunisia -- Tunis + { 606, "LY", -1, 0, 0, "Africa/Tripoli" }, // Libya -- Tripoli + { 607, "GM", -1, 0, 0, "Africa/Banjul" }, // Gambia -- Banjul + { 608, "SN", -1, 0, 0, "Africa/Dakar" }, // Senegal -- Dakar + { 609, "MR", -1, 0, 0, "Africa/Nouakchott" }, // Mauritania -- Nouakchott + { 610, "ML", -1, 0, 0, "Africa/Bamako" }, // Mali -- Bamako + { 611, "GN", -1, 0, 0, "Africa/Conakry" }, // Guinea -- Conakry + { 612, "CI", -1, 0, 0, "Africa/Abidjan" }, // lvory coast -- Yamoussoukro /*!*/ + { 613, "BF", -1, 0, 0, "Africa/Ouagadougou" }, // Burkina faso -- Ouagadougou + { 614, "NE", -1, 0, 0, "Africa/Niamey" }, // Niger -- Niamey + { 615, "TG", -1, 0, 0, "Africa/Lome" }, // Togo -- Lome + { 616, "BJ", -1, 0, 0, "Africa/Porto-Novo" }, // Benin -- Porto-Novo (n-project: Cotonou) + { 617, "MU", -1, 0, 0, "Indian/Mauritius" }, // Mauritius -- Port Louis (n-project: Plaisance-PlaineMagnien) + { 618, "LR", -1, 0, 0, "Africa/Monrovia" }, // Liberia -- Monrovia + { 619, "SL", -1, 0, 0, "Africa/Freetown" }, // Sierra leone -- Freetown + { 620, "GH", -1, 0, 0, "Africa/Accra" }, // Ghana -- Accra + { 621, "NG", -1, 0, 0, "Africa/Lagos" }, // Nigeria -- Abuja /*!*/ + { 622, "TD", -1, 0, 0, "Africa/Ndjamena" }, // Chad -- N'Djamena + { 623, "CF", -1, 0, 0, "Africa/Bangui" }, // Central african republic -- Bangui + { 624, "CM", -1, 0, 0, "Africa/Douala" }, // Cameroon -- Yaounde /*!*/ + { 625, "CV", -1, 0, 0, "Atlantic/Cape_Verde" },// Cape verde -- Praia (n-project: IlhaDoSal) + { 626, "ST", -1, 0, 0, "Africa/Sao_Tome" }, // Sao tome and principe -- Sao Tome + { 627, "GQ", -1, 0, 0, "Africa/Malabo" }, // Equatorial guinea -- Malabo + { 628, "GA", -1, 0, 0, "Africa/Libreville" }, // Gabon -- Libreville + { 629, "CG", -1, 0, 0, "Africa/Brazzaville" }, // Republic of the congo -- Brazzaville + + { 630, "CD", 0, +1, +0, "Africa/Kinshasa" }, // Democratic republic of the congo -- Kinshasa + { 630, "CD", 1, +2, +0, "Africa/Lubumbashi" },// + + { 631, "AO", -1, 0, 0, "Africa/Luanda" }, // Angola -- Luanda + { 632, "GW", -1, 0, 0, "Africa/Bissau" }, // Guinea-bissau -- Bissau + { 633, "SC", -1, 0, 0, "Indian/Mahe" }, // Seychelles -- Victoria /*!*/ + { 634, "SD", -1, 0, 0, "Africa/Khartoum" }, // Sudan -- Khartoum + { 635, "RW", -1, 0, 0, "Africa/Kigali" }, // Rwanda -- Kigali + { 636, "ET", -1, 0, 0, "Africa/Addis_Ababa" }, // Ethiopia -- Addis Ababa + { 637, "SO", -1, 0, 0, "Africa/Mogadishu" }, // Somalia -- Mogadishu + { 638, "DJ", -1, 0, 0, "Africa/Djibouti" }, // Djibouti -- Djibouti + { 639, "KE", -1, 0, 0, "Africa/Nairobi" }, // Kenya -- Nairobi + { 640, "TZ", -1, 0, 0, "Africa/Dar_es_Salaam" }, // Tanzania -- Dar es Salaam + { 641, "UG", -1, 0, 0, "Africa/Kampala" }, // Uganda -- Kampala (n-project: Entebbe) + { 642, "BI", -1, 0, 0, "Africa/Bujumbura" }, // Burundi -- Bujumbura + { 643, "MZ", -1, 0, 0, "Africa/Maputo" }, // Mozambique -- Maputo + { 645, "ZM", -1, 0, 0, "Africa/Lusaka" }, // Zambia -- Lusaka + { 646, "MG", -1, 0, 0, "Indian/Antananarivo" },// Madagascar -- Antananarivo + { 647, "RE", -1, 0, 0, "Indian/Reunion" }, // Reunion (France) -- no capital + { 648, "ZW", -1, 0, 0, "Africa/Harare" }, // Zimbabwe -- Harare + { 649, "NA", -1, 0, 0, "Africa/Windhoek" }, // Namibia -- Windhoek + { 650, "MW", -1, 0, 0, "Africa/Blantyre" }, // Malawi -- Lilongwe /*!*/ + { 651, "LS", -1, 0, 0, "Africa/Maseru" }, // Lesotho -- Maseru + { 652, "BW", -1, 0, 0, "Africa/Gaborone" }, // Botswana -- Gaborone + { 653, "SZ", -1, 0, 0, "Africa/Mbabane" }, // Swaziland -- Mbabane + { 654, "KM", -1, 0, 0, "Indian/Comoro" }, // Comoros -- Moroni + { 655, "ZA", -1, 0, 0, "Africa/Johannesburg" },// South africa -- Pretoria (administrative); Cape Town (legislative); Bloemfontein (judiciary) + { 657, "ER", -1, 0, 0, "Africa/Asmara" }, // Eritrea + { 702, "BZ", -1, 0, 0, "America/Belize" }, // Belize -- Belmopan + { 704, "GT", -1, 0, 0, "America/Guatemala" }, // Guatemala -- Guatemala City + { 706, "SV", -1, 0, 0, "America/El_Salvador" },// El salvador -- San Salvador + { 708, "HN", -1, 0, 0, "America/Tegucigalpa" },// Honduras -- Tegucigalpa + { 710, "NI", -1, 0, 0, "America/Managua" }, // Nicaragua -- Managua + { 712, "CR", -1, 0, 0, "America/Costa_Rica" }, // Costa rica -- San Jose + { 714, "PA", -1, 0, 0, "America/Panama" }, // Panama -- Panama City + { 716, "PE", -1, 0, 0, "America/Lima" }, // Peru -- Lima + + { 722, "AR", 0, -3, +0, "America/Argentina/Buenos_Aires" }, // Argentina -- Buenos Aires + { 722, "AR", 1, -3, +0, "America/Argentina/Cordoba" }, // + { 722, "AR", 2, -3, +0, "America/Argentina/Salta" }, // + { 722, "AR", 3, -3, +0, "America/Argentina/Jujuy" }, // + { 722, "AR", 4, -3, +0, "America/Argentina/Tucuman" }, // + { 722, "AR", 5, -3, +0, "America/Argentina/Catamarca" }, // + { 722, "AR", 6, -3, +0, "America/Argentina/La_Rioja" }, // + { 722, "AR", 7, -3, +0, "America/Argentina/San_Juan" }, // + { 722, "AR", 8, -3, +0, "America/Argentina/Mendoza" }, // + { 722, "AR", 9, -3, +0, "America/Argentina/San_Luis" }, // + { 722, "AR", 10, -3, +0, "America/Argentina/Rio_Gallegos" }, // + { 722, "AR", 11, -3, +0, "America/Argentina/Ushuaia" }, // + + { 724, "BR", 0, -3, +1, "America/Sao_Paulo" }, // Brazil -- Brasilia /*!*/ + { 724, "BR", 1, -2, +0, "America/Noronha" }, // + { 724, "BR", 2, -3, +0, "America/Belem" }, // + { 724, "BR", 3, -3, +0, "America/Fortaleza" }, // + { 724, "BR", 4, -3, +0, "America/Recife" }, // + { 724, "BR", 5, -3, +0, "America/Araguaina" }, // + { 724, "BR", 6, -3, +0, "America/Maceio" }, // + { 724, "BR", 7, -3, +0, "America/Bahia" }, // + { 724, "BR", 8, -4, +1, "America/Campo_Grande" }, // + { 724, "BR", 9, -4, +1, "America/Cuiaba" }, // + { 724, "BR", 10, -4, +0, "America/Santarem" }, // + { 724, "BR", 11, -4, +0, "America/Porto_Velho" }, // + { 724, "BR", 12, -4, +0, "America/Boa_Vista" }, // + { 724, "BR", 13, -4, +0, "America/Manaus" }, // + { 724, "BR", 14, -4, +0, "America/Eirunepe" }, // + { 724, "BR", 15, -4, +0, "America/Rio_Branco" }, // + + { 730, "CL", 0, -4, +1, "America/Santiago" }, // Chile -- Santiago + { 730, "CL", 1, -6, +1, "Pacific/Easter" }, // + + { 734, "VE", -1, 0, 0, "America/Caracas" }, // Venezuela -- Caracas + { 736, "BO", -1, 0, 0, "America/La_Paz" }, // Bolivia -- La Paz (administrative); Sucre (judicial) + { 738, "GY", -1, 0, 0, "America/Guyana" }, // Guyana -- Georgetown + + { 740, "EC", 0, -5, +0, "America/Guayaquil" },// Ecuador -- Quito /*!*/ + { 740, "EC", 1, -6, +0, "Pacific/Galapagos" },// + + { 742, "GF", -1, 0, 0, "America/Cayenne" }, // French Guiana (France) + { 744, "PY", -1, 0, 0, "America/Asuncion" }, // Paraguay -- Asuncion + { 746, "SR", -1, 0, 0, "America/Paramaribo" }, // Suriname -- Paramaribo + { 748, "UY", -1, 0, 0, "America/Montevideo" }, // Uruguay -- Montevideo + { 750, "FK", -1, 0, 0, "Atlantic/Stanley" }, // Falkland Islands (Malvinas) + + { -1, NULL, -1, -1, -1, NULL }, +}; + +/* + * FIXME: need to check exceptional timezone + */ +static NITZ_MCC_TZFILE_MAP *nitz_find_tzinfo_by_mcc_timezone(int mcc, int tz, int dst, int dst_valid) +{ + NITZ_MCC_TZFILE_MAP *t = NULL; + int calc_tz = 0; + + dbg("Request mcc: [%d], tz: [%d], dst: [%d], dst_valid: [%d]", + mcc, tz, dst, dst_valid); + filelog("Find tzfinfo - multi timezone (mcc = %d)", mcc); + filelog("+- wanted tz: %d, dst: %d, dst_valid: %d", tz, dst, dst_valid); + + t = nitz_table_mcc_tzfile; + while (1) { + if (t->mcc == -1) + return NULL; + + if (t->mcc == mcc) { + calc_tz = t->std_timezone * 60; + dbg("mcc(%d) matched!! [tz=%d, dst=%d, calc_tz=%d, city=%s]", mcc, t->std_timezone, t->dst, calc_tz, t->city); + + filelog("+- tz: %d (%d), dst: %d, calc_tz: %d, city: %s", + t->std_timezone, t->std_timezone*60, t->dst, calc_tz, t->city); + + if (dst && dst_valid) { + if (!t->dst) + goto CONT; + + calc_tz += t->dst * 60; + } + + if (calc_tz == tz) + return t; + } +CONT: + t++; + } + + return NULL; +} + +static NITZ_MCC_TZFILE_MAP *nitz_find_tzinfo_by_mcc(int mcc) +{ + NITZ_MCC_TZFILE_MAP *t = NULL; + + if (mcc < 0) + return NULL; + + t = nitz_table_mcc_tzfile; + while (1) { + if (t->mcc == -1) + return NULL; + + if (t->mcc == mcc) + return t; + + t++; + } + + return NULL; +} + +static gboolean nitz_is_multi_timezone(NITZ_MCC_TZFILE_MAP *m) +{ + if (m->id == -1) + return FALSE; + + return TRUE; +} + +NITZ_MCC_TZFILE_MAP *nitz_find_tzinfo(int mcc, int gmtoff, int dstoff, int isdst) +{ + NITZ_MCC_TZFILE_MAP *m; + + m = nitz_find_tzinfo_by_mcc(mcc); + if (nitz_is_multi_timezone(m)) { + dbg("Multi timezone"); + m = nitz_find_tzinfo_by_mcc_timezone(mcc, gmtoff, dstoff, isdst); + } + + return m; +} + +int nitz_self_check_tzfile(void) +{ + NITZ_MCC_TZFILE_MAP *t = NULL; + struct stat file_info; + char buf[255] = {0,}; + int ret = TRUE; + + t = nitz_table_mcc_tzfile; + while (1) { + if (t->mcc == -1) + return ret; + + /* check tzfile */ + snprintf (buf, 255, "/usr/share/zoneinfo/%s", t->city); + if (stat(buf, &file_info) == -1) { + filelog("file not exist!! [mcc=%d, tz=%3d, %s]", t->mcc, t->std_timezone, buf); + ret = FALSE; + } + + t++; + } + + return ret; +} diff --git a/src/citylist.h b/src/citylist.h new file mode 100644 index 0000000..d3d42ac --- /dev/null +++ b/src/citylist.h @@ -0,0 +1,39 @@ +/* + * tel-plugin-nitz + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __NITZ_CITYLIST_H__ +#define __NITZ_CITYLIST_H__ + +/* + * http://en.wikipedia.org/wiki/List_of_mobile_country_codes + * http://worldtimeengine.com + */ + +typedef struct { + int mcc; + char *country; /* iso3166 */ + int id; /* id for city name (multi timezone in one country) */ + int std_timezone; + int dst; + char *city; /* timezone city filename */ +} NITZ_MCC_TZFILE_MAP; + +NITZ_MCC_TZFILE_MAP *nitz_find_tzinfo(int mcc, int gmtoff, int dstoff, int isdst); +int nitz_self_check_tzfile(void); + +#endif diff --git a/src/common.h b/src/common.h new file mode 100644 index 0000000..118ab04 --- /dev/null +++ b/src/common.h @@ -0,0 +1,45 @@ +/* + * tel-plugin-nitz + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __NITZ_COMMON_H__ +#define __NITZ_COMMON_H__ + +#include +#include +#include + +/* filelog */ +#ifndef NITZ_LOG_FILE +#define NITZ_LOG_FILE "/opt/var/log/nitz.log" +#endif + +#ifndef NITZ_LOG_FUNC +#define NITZ_LOG_FUNC fprintf +#endif + +#define filelog(fmt, args...) { \ + FILE *fp = fopen(NITZ_LOG_FILE, "a"); \ + dbg(fmt, ##args); \ + if (fp) { \ + NITZ_LOG_FUNC(fp, fmt "\n", ##args); \ + fflush(fp); \ + fclose(fp); \ + } \ + } + +#endif diff --git a/src/desc-nitz.c b/src/desc-nitz.c new file mode 100644 index 0000000..db4ec9e --- /dev/null +++ b/src/desc-nitz.c @@ -0,0 +1,100 @@ +/* + * tel-plugin-nitz + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include "common.h" +#include "time_update.h" + +#ifndef PLUGIN_VERSION +#define PLUGIN_VERSION 1 +#endif + +static enum tcore_hook_return on_hook_network_timeinfo(Server *s, + CoreObject *source, + enum tcore_notification_command command, + unsigned int data_len, void *data, void *user_data) +{ + struct tnoti_network_timeinfo *timeinfo = data; + gboolean flag_auto_update = FALSE; + + filelog("NITZ !! (time(NULL) = %u)", (unsigned int)time(NULL)); + dbg("+- %04d-%02d-%02d %02d:%02d:%02d wday=%d", + timeinfo->year, timeinfo->month, timeinfo->day, + timeinfo->hour, timeinfo->minute, timeinfo->second, + timeinfo->wday); + dbg("+- GMT-offset:%d, DST-offset:%d, is_dst:%d", + timeinfo->gmtoff, timeinfo->dstoff, timeinfo->isdst); + + vconf_get_bool(VCONFKEY_SETAPPL_STATE_AUTOMATIC_TIME_UPDATE_BOOL, + &flag_auto_update); + if (flag_auto_update == FALSE) + dbg("manual time update mode"); + + nitz_time_update(timeinfo, flag_auto_update); + + return TCORE_HOOK_RETURN_CONTINUE; +} + +static gboolean on_load() +{ + dbg("Load!!!"); + + return TRUE; +} + +static gboolean on_init(TcorePlugin *p) +{ + Server *s; + + dbg("Init!!!"); + + s = tcore_plugin_ref_server(p); + if (s == NULL) + return FALSE; + + tcore_server_add_notification_hook(s, TNOTI_NETWORK_TIMEINFO, + on_hook_network_timeinfo, NULL); + + return TRUE; +} + +static void on_unload(TcorePlugin *p) +{ + dbg("Unload"); +} + +EXPORT_API struct tcore_plugin_define_desc plugin_define_desc = +{ + .name = "NITZ", + .priority = TCORE_PLUGIN_PRIORITY_MID, + .version = PLUGIN_VERSION, + .load = on_load, + .init = on_init, + .unload = on_unload +}; diff --git a/src/time_update.c b/src/time_update.c new file mode 100644 index 0000000..39e5e5d --- /dev/null +++ b/src/time_update.c @@ -0,0 +1,167 @@ +/* + * tel-plugin-nitz + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "common.h" +#include "time_update.h" +#include "citylist.h" + +#define BUF_SIZE 255 +#define PATH_LOCALTIME "/opt/etc/localtime" +#define PATH_ZONEINFO "/usr/share/zoneinfo" + +int nitz_apply_tzfile(const char *tzfilename, gboolean mode_auto) +{ + char buf[BUF_SIZE] = {0, }; + int ret; + + vconf_set_str(VCONFKEY_TELEPHONY_NITZ_ZONE, tzfilename); + + if (mode_auto == FALSE) + return 0; + + snprintf(buf, BUF_SIZE, "%s/%s", PATH_ZONEINFO, tzfilename); + + ret = sysman_set_timezone(buf); + filelog("set (%s) timezone file. ret=%d", buf, ret); + + sync(); + tzset(); + + filelog("+- Result: tzname=[%s, %s], timezone=%ld, daylight=%d", + tzname[0], tzname[1], timezone, daylight); + + return ret; +} + +long nitz_get_uptime() +{ + struct sysinfo info; + + if (sysinfo(&info) == 0) { + dbg("uptime: %ld secs", info.uptime); + return info.uptime; + } + + return 0; +} + +static gboolean update_time(const struct tnoti_network_timeinfo *ti, + gboolean mode_auto) +{ + struct tm tm_time; + time_t tt_gmt_nitz; + int ret; + + memset(&tm_time, 0, sizeof(struct tm)); + tm_time.tm_year = ti->year - 1900 + 2000; + tm_time.tm_mon = ti->month - 1; + tm_time.tm_mday = ti->day; + tm_time.tm_sec = ti->second; + tm_time.tm_min = ti->minute; + tm_time.tm_hour = ti->hour; + tm_time.tm_wday = ti->wday; + tm_time.tm_isdst = ti->dstoff; + + tt_gmt_nitz = timegm(&tm_time); + tt_gmt_nitz -= ti->gmtoff * 60; + dbg("NITZ GMT Time = %ld", tt_gmt_nitz); + + vconf_set_int(VCONFKEY_TELEPHONY_NITZ_GMT, tt_gmt_nitz); + vconf_set_int(VCONFKEY_TELEPHONY_NITZ_EVENT_GMT, nitz_get_uptime()); + + if (mode_auto == FALSE) { + return FALSE; + } + + /* + * - Apply system time (GMT) + */ + ret = sysman_set_datetime(tt_gmt_nitz); + if (ret < 0) { + filelog("sysman_set_datetime(%ld) failed. ret = %d", + tt_gmt_nitz, ret); + return FALSE; + } else { + filelog("sysman_set_datetime(%ld) success. ret = %d", + tt_gmt_nitz, ret); + } + + return TRUE; +} + +static gboolean update_timezone(const struct tnoti_network_timeinfo *ti, + gboolean mode_auto) +{ + int mcc; + char mcc_str[4]; + NITZ_MCC_TZFILE_MAP *m; + gboolean ret = FALSE; + + snprintf(mcc_str, 4, "%s", ti->plmn); + mcc = atoi(mcc_str); + dbg("MCC: [%d]", mcc); + + if (mcc >= 0) { + m = nitz_find_tzinfo(mcc, ti->gmtoff, ti->dstoff, ti->isdst); + if (m) { + dbg("Country: [%s] (ISO 3166)", m->country); + dbg("City: [%s]", m->city); + nitz_apply_tzfile(m->city, mode_auto); + ret = TRUE; + } else { + dbg("No search result"); + } + } + + return ret; +} + +gboolean nitz_time_update(const struct tnoti_network_timeinfo *time_info, + gboolean mode_auto) +{ + if (time_info->year == 0 + && time_info->month == 0 + && time_info->day == 0 + && time_info->hour == 0 + && time_info->minute == 0 + && time_info->second == 0) { + /* Timezone only */ + return update_timezone(time_info, mode_auto); + } + + update_time(time_info, mode_auto); + + return update_timezone(time_info, mode_auto); +} diff --git a/src/time_update.h b/src/time_update.h new file mode 100644 index 0000000..4736550 --- /dev/null +++ b/src/time_update.h @@ -0,0 +1,26 @@ +/* + * tel-plugin-nitz + * + * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __NITZ_TIME_H__ +#define __NITZ_TIME_H__ + +int nitz_apply_tzfile(const char *tzfilename, gboolean mode_auto); +long nitz_get_uptime(); +gboolean nitz_time_update(const struct tnoti_network_timeinfo *time_info, gboolean mode_auto); + +#endif diff --git a/tel-plugin-nitz.manifest b/tel-plugin-nitz.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/tel-plugin-nitz.manifest @@ -0,0 +1,5 @@ + + + + + -- 2.7.4 From 01e6a847a2db0f118655307956292b595a5e02db Mon Sep 17 00:00:00 2001 From: Dongchul Lim Date: Mon, 7 Apr 2014 19:52:18 +0900 Subject: [PATCH 3/6] Initial refactoring merge Change-Id: I94046514307898cabf15b4758297d9c3f91ada29 --- AUTHORS | 0 packaging/tel-plugin-nitz.spec | 7 ++-- src/citylist.c | 2 +- src/desc-nitz.c | 83 +++++++++++++++++++++++++++++++++--------- src/time_update.c | 12 ++---- src/time_update.h | 2 +- 6 files changed, 75 insertions(+), 31 deletions(-) delete mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec index 38a07fd..bbe613a 100644 --- a/packaging/tel-plugin-nitz.spec +++ b/packaging/tel-plugin-nitz.spec @@ -1,6 +1,7 @@ -%define major 0 -%define minor 1 -%define patchlevel 19 +%define major 3 +%define minor 0 +%define patchlevel 1 + Name: tel-plugin-nitz Summary: nitz plugin for telephony Version: %{major}.%{minor}.%{patchlevel} diff --git a/src/citylist.c b/src/citylist.c index 68de04b..1e9b3c3 100644 --- a/src/citylist.c +++ b/src/citylist.c @@ -669,7 +669,7 @@ static NITZ_MCC_TZFILE_MAP *nitz_find_tzinfo_by_mcc(int mcc) { NITZ_MCC_TZFILE_MAP *t = NULL; - if (mcc < 0) + if (mcc <= 0) return NULL; t = nitz_table_mcc_tzfile; diff --git a/src/desc-nitz.c b/src/desc-nitz.c index db4ec9e..0aebedd 100644 --- a/src/desc-nitz.c +++ b/src/desc-nitz.c @@ -35,19 +35,17 @@ #define PLUGIN_VERSION 1 #endif -static enum tcore_hook_return on_hook_network_timeinfo(Server *s, - CoreObject *source, - enum tcore_notification_command command, - unsigned int data_len, void *data, void *user_data) +static TcoreHookReturn on_hook_network_timeinfo(TcorePlugin *source, + TcoreNotification command, + guint data_len, void *data, void *user_data) { - struct tnoti_network_timeinfo *timeinfo = data; + TelNetworkNitzInfoNoti *timeinfo = data; gboolean flag_auto_update = FALSE; - filelog("NITZ !! (time(NULL) = %u)", (unsigned int)time(NULL)); - dbg("+- %04d-%02d-%02d %02d:%02d:%02d wday=%d", + filelog("NITZ !! (time(NULL) = %u)", (guint)time(NULL)); + dbg("+- %04d-%02d-%02d %02d:%02d:%02d", timeinfo->year, timeinfo->month, timeinfo->day, - timeinfo->hour, timeinfo->minute, timeinfo->second, - timeinfo->wday); + timeinfo->hour, timeinfo->minute, timeinfo->second); dbg("+- GMT-offset:%d, DST-offset:%d, is_dst:%d", timeinfo->gmtoff, timeinfo->dstoff, timeinfo->isdst); @@ -61,32 +59,81 @@ static enum tcore_hook_return on_hook_network_timeinfo(Server *s, return TCORE_HOOK_RETURN_CONTINUE; } +static TcoreHookReturn on_hook_modem_plugin_added(Server *s, + TcoreServerNotification command, + guint data_len, void *data, void *user_data) +{ + TcorePlugin *modem_plugin; + + modem_plugin = (TcorePlugin *)data; + tcore_check_return_value_assert(NULL != modem_plugin, TCORE_HOOK_RETURN_STOP_PROPAGATION); + + tcore_plugin_add_notification_hook(modem_plugin, TCORE_NOTIFICATION_NETWORK_TIMEINFO, + on_hook_network_timeinfo, NULL); + + return TCORE_HOOK_RETURN_CONTINUE; +} + +static TcoreHookReturn on_hook_modem_plugin_removed(Server *s, + TcoreServerNotification command, + guint data_len, void *data, void *user_data) +{ + TcorePlugin *modem_plugin; + + modem_plugin = (TcorePlugin *)data; + tcore_check_return_value_assert(NULL != modem_plugin, TCORE_HOOK_RETURN_STOP_PROPAGATION); + + tcore_plugin_remove_notification_hook(modem_plugin, TCORE_NOTIFICATION_NETWORK_TIMEINFO, + on_hook_network_timeinfo); + + return TCORE_HOOK_RETURN_CONTINUE; +} + static gboolean on_load() { dbg("Load!!!"); - return TRUE; } -static gboolean on_init(TcorePlugin *p) +static gboolean on_init(TcorePlugin *plugin) { Server *s; + GSList *list = NULL; + TcorePlugin *modem_plugin; - dbg("Init!!!"); + tcore_check_return_value_assert(NULL != plugin, FALSE); - s = tcore_plugin_ref_server(p); - if (s == NULL) - return FALSE; + dbg("Init!!!"); - tcore_server_add_notification_hook(s, TNOTI_NETWORK_TIMEINFO, + s = tcore_plugin_ref_server(plugin); + list = tcore_server_get_modem_plugin_list(s); + while (list) { /* Process for pre-loaded Modem Plug-in */ + modem_plugin = list->data; + if ( NULL != modem_plugin) + tcore_plugin_add_notification_hook(modem_plugin, TCORE_NOTIFICATION_NETWORK_TIMEINFO, on_hook_network_timeinfo, NULL); - + list = g_slist_next(list); + } + g_slist_free(list); + + /* Register for post-loaded Modem Plug-ins */ + tcore_server_add_notification_hook(s, TCORE_SERVER_NOTIFICATION_ADDED_MODEM_PLUGIN, + on_hook_modem_plugin_added, NULL); + tcore_server_add_notification_hook(s, TCORE_SERVER_NOTIFICATION_REMOVED_MODEM_PLUGIN, + on_hook_modem_plugin_removed, NULL); return TRUE; } -static void on_unload(TcorePlugin *p) +static void on_unload(TcorePlugin *plugin) { + Server *s; + + tcore_check_return_assert(NULL != plugin); dbg("Unload"); + + s = tcore_plugin_ref_server(plugin); + tcore_server_remove_notification_hook(s, on_hook_modem_plugin_added); + tcore_server_remove_notification_hook(s, on_hook_modem_plugin_removed); } EXPORT_API struct tcore_plugin_define_desc plugin_define_desc = diff --git a/src/time_update.c b/src/time_update.c index 39e5e5d..2d6ae70 100644 --- a/src/time_update.c +++ b/src/time_update.c @@ -77,8 +77,7 @@ long nitz_get_uptime() return 0; } -static gboolean update_time(const struct tnoti_network_timeinfo *ti, - gboolean mode_auto) +static gboolean update_time(const TelNetworkNitzInfoNoti *ti, gboolean mode_auto) { struct tm tm_time; time_t tt_gmt_nitz; @@ -91,7 +90,6 @@ static gboolean update_time(const struct tnoti_network_timeinfo *ti, tm_time.tm_sec = ti->second; tm_time.tm_min = ti->minute; tm_time.tm_hour = ti->hour; - tm_time.tm_wday = ti->wday; tm_time.tm_isdst = ti->dstoff; tt_gmt_nitz = timegm(&tm_time); @@ -121,8 +119,7 @@ static gboolean update_time(const struct tnoti_network_timeinfo *ti, return TRUE; } -static gboolean update_timezone(const struct tnoti_network_timeinfo *ti, - gboolean mode_auto) +static gboolean update_timezone(const TelNetworkNitzInfoNoti *ti, gboolean mode_auto) { int mcc; char mcc_str[4]; @@ -133,7 +130,7 @@ static gboolean update_timezone(const struct tnoti_network_timeinfo *ti, mcc = atoi(mcc_str); dbg("MCC: [%d]", mcc); - if (mcc >= 0) { + if (mcc > 0) { m = nitz_find_tzinfo(mcc, ti->gmtoff, ti->dstoff, ti->isdst); if (m) { dbg("Country: [%s] (ISO 3166)", m->country); @@ -148,8 +145,7 @@ static gboolean update_timezone(const struct tnoti_network_timeinfo *ti, return ret; } -gboolean nitz_time_update(const struct tnoti_network_timeinfo *time_info, - gboolean mode_auto) +gboolean nitz_time_update(const TelNetworkNitzInfoNoti *time_info, gboolean mode_auto) { if (time_info->year == 0 && time_info->month == 0 diff --git a/src/time_update.h b/src/time_update.h index 4736550..a05cb1a 100644 --- a/src/time_update.h +++ b/src/time_update.h @@ -21,6 +21,6 @@ int nitz_apply_tzfile(const char *tzfilename, gboolean mode_auto); long nitz_get_uptime(); -gboolean nitz_time_update(const struct tnoti_network_timeinfo *time_info, gboolean mode_auto); +gboolean nitz_time_update(const TelNetworkNitzInfoNoti *time_info, gboolean mode_auto); #endif -- 2.7.4 From 297267649a383e78529f3f5755d763361f1fbcfa Mon Sep 17 00:00:00 2001 From: sharan m Date: Wed, 7 May 2014 18:14:33 +0530 Subject: [PATCH 4/6] Header files unification Change-Id: I2c496a4098445e12804746286cc0e09d9aca3023 --- CMakeLists.txt | 2 +- packaging/tel-plugin-nitz.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fd0b76..55c2a09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(INCLUDEDIR "\${prefix}/include") # Set required packages INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 tcore vconf sysman) +pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 tcore tel-headers vconf sysman) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec index bbe613a..1a6bfa5 100644 --- a/packaging/tel-plugin-nitz.spec +++ b/packaging/tel-plugin-nitz.spec @@ -15,6 +15,7 @@ BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(tcore) +BuildRequires: pkgconfig(tel-headers) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(sysman) -- 2.7.4 From 2f5eecf642ce36c553d57822469b63c97b3a278c Mon Sep 17 00:00:00 2001 From: Dongchul Lim Date: Tue, 17 Mar 2015 13:52:41 +0900 Subject: [PATCH 5/6] Code Sync up from tizen_2.4 Change-Id: Ic493283fb57dd52dd7abf65d1207d149a0dabf5e --- CMakeLists.txt | 2 +- LICENSE | 2 +- packaging/tel-plugin-nitz.spec | 10 ++--- src/citylist.c | 2 +- src/citylist.h | 2 +- src/common.h | 2 +- src/desc-nitz.c | 85 ++++++++++-------------------------------- src/time_update.c | 25 +++++++------ src/time_update.h | 4 +- 9 files changed, 44 insertions(+), 90 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55c2a09..9be36c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ SET(INCLUDEDIR "\${prefix}/include") # Set required packages INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 tcore tel-headers vconf sysman) +pkg_check_modules(pkgs REQUIRED glib-2.0 gio-2.0 tcore vconf deviced) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/LICENSE b/LICENSE index d6fbf45..8534b2c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. +Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. Apache License Version 2.0, January 2004 diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec index 1a6bfa5..c3544a0 100644 --- a/packaging/tel-plugin-nitz.spec +++ b/packaging/tel-plugin-nitz.spec @@ -1,7 +1,6 @@ -%define major 3 -%define minor 0 -%define patchlevel 1 - +%define major 0 +%define minor 1 +%define patchlevel 19 Name: tel-plugin-nitz Summary: nitz plugin for telephony Version: %{major}.%{minor}.%{patchlevel} @@ -15,9 +14,8 @@ BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(tcore) -BuildRequires: pkgconfig(tel-headers) BuildRequires: pkgconfig(vconf) -BuildRequires: pkgconfig(sysman) +BuildRequires: pkgconfig(deviced) %description nitz plugin for telephony diff --git a/src/citylist.c b/src/citylist.c index 1e9b3c3..76693e3 100644 --- a/src/citylist.c +++ b/src/citylist.c @@ -1,7 +1,7 @@ /* * tel-plugin-nitz * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/citylist.h b/src/citylist.h index d3d42ac..8e8bfaf 100644 --- a/src/citylist.h +++ b/src/citylist.h @@ -1,7 +1,7 @@ /* * tel-plugin-nitz * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/common.h b/src/common.h index 118ab04..ebab6d6 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,7 @@ /* * tel-plugin-nitz * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/desc-nitz.c b/src/desc-nitz.c index 0aebedd..341321b 100644 --- a/src/desc-nitz.c +++ b/src/desc-nitz.c @@ -1,7 +1,7 @@ /* * tel-plugin-nitz * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,17 +35,19 @@ #define PLUGIN_VERSION 1 #endif -static TcoreHookReturn on_hook_network_timeinfo(TcorePlugin *source, - TcoreNotification command, - guint data_len, void *data, void *user_data) +static enum tcore_hook_return on_hook_network_timeinfo(Server *s, + CoreObject *source, + enum tcore_notification_command command, + unsigned int data_len, void *data, void *user_data) { - TelNetworkNitzInfoNoti *timeinfo = data; + struct tnoti_network_timeinfo *timeinfo = data; gboolean flag_auto_update = FALSE; - filelog("NITZ !! (time(NULL) = %u)", (guint)time(NULL)); - dbg("+- %04d-%02d-%02d %02d:%02d:%02d", + filelog("NITZ !! (time(NULL) = %u)", (unsigned int)time(NULL)); + dbg("+- %04d-%02d-%02d %02d:%02d:%02d wday=%d", timeinfo->year, timeinfo->month, timeinfo->day, - timeinfo->hour, timeinfo->minute, timeinfo->second); + timeinfo->hour, timeinfo->minute, timeinfo->second, + timeinfo->wday); dbg("+- GMT-offset:%d, DST-offset:%d, is_dst:%d", timeinfo->gmtoff, timeinfo->dstoff, timeinfo->isdst); @@ -59,81 +61,32 @@ static TcoreHookReturn on_hook_network_timeinfo(TcorePlugin *source, return TCORE_HOOK_RETURN_CONTINUE; } -static TcoreHookReturn on_hook_modem_plugin_added(Server *s, - TcoreServerNotification command, - guint data_len, void *data, void *user_data) -{ - TcorePlugin *modem_plugin; - - modem_plugin = (TcorePlugin *)data; - tcore_check_return_value_assert(NULL != modem_plugin, TCORE_HOOK_RETURN_STOP_PROPAGATION); - - tcore_plugin_add_notification_hook(modem_plugin, TCORE_NOTIFICATION_NETWORK_TIMEINFO, - on_hook_network_timeinfo, NULL); - - return TCORE_HOOK_RETURN_CONTINUE; -} - -static TcoreHookReturn on_hook_modem_plugin_removed(Server *s, - TcoreServerNotification command, - guint data_len, void *data, void *user_data) -{ - TcorePlugin *modem_plugin; - - modem_plugin = (TcorePlugin *)data; - tcore_check_return_value_assert(NULL != modem_plugin, TCORE_HOOK_RETURN_STOP_PROPAGATION); - - tcore_plugin_remove_notification_hook(modem_plugin, TCORE_NOTIFICATION_NETWORK_TIMEINFO, - on_hook_network_timeinfo); - - return TCORE_HOOK_RETURN_CONTINUE; -} - static gboolean on_load() { dbg("Load!!!"); + return TRUE; } -static gboolean on_init(TcorePlugin *plugin) +static gboolean on_init(TcorePlugin *p) { Server *s; - GSList *list = NULL; - TcorePlugin *modem_plugin; - - tcore_check_return_value_assert(NULL != plugin, FALSE); dbg("Init!!!"); - s = tcore_plugin_ref_server(plugin); - list = tcore_server_get_modem_plugin_list(s); - while (list) { /* Process for pre-loaded Modem Plug-in */ - modem_plugin = list->data; - if ( NULL != modem_plugin) - tcore_plugin_add_notification_hook(modem_plugin, TCORE_NOTIFICATION_NETWORK_TIMEINFO, + s = tcore_plugin_ref_server(p); + if (s == NULL) + return FALSE; + + tcore_server_add_notification_hook(s, TNOTI_NETWORK_TIMEINFO, on_hook_network_timeinfo, NULL); - list = g_slist_next(list); - } - g_slist_free(list); - - /* Register for post-loaded Modem Plug-ins */ - tcore_server_add_notification_hook(s, TCORE_SERVER_NOTIFICATION_ADDED_MODEM_PLUGIN, - on_hook_modem_plugin_added, NULL); - tcore_server_add_notification_hook(s, TCORE_SERVER_NOTIFICATION_REMOVED_MODEM_PLUGIN, - on_hook_modem_plugin_removed, NULL); + return TRUE; } -static void on_unload(TcorePlugin *plugin) +static void on_unload(TcorePlugin *p) { - Server *s; - - tcore_check_return_assert(NULL != plugin); dbg("Unload"); - - s = tcore_plugin_ref_server(plugin); - tcore_server_remove_notification_hook(s, on_hook_modem_plugin_added); - tcore_server_remove_notification_hook(s, on_hook_modem_plugin_removed); } EXPORT_API struct tcore_plugin_define_desc plugin_define_desc = diff --git a/src/time_update.c b/src/time_update.c index 2d6ae70..29d1438 100644 --- a/src/time_update.c +++ b/src/time_update.c @@ -1,7 +1,7 @@ /* * tel-plugin-nitz * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,8 +31,7 @@ #include #include #include -#include - +#include #include "common.h" #include "time_update.h" #include "citylist.h" @@ -53,7 +52,7 @@ int nitz_apply_tzfile(const char *tzfilename, gboolean mode_auto) snprintf(buf, BUF_SIZE, "%s/%s", PATH_ZONEINFO, tzfilename); - ret = sysman_set_timezone(buf); + ret = deviced_set_timezone(buf); filelog("set (%s) timezone file. ret=%d", buf, ret); sync(); @@ -77,7 +76,8 @@ long nitz_get_uptime() return 0; } -static gboolean update_time(const TelNetworkNitzInfoNoti *ti, gboolean mode_auto) +static gboolean update_time(const struct tnoti_network_timeinfo *ti, + gboolean mode_auto) { struct tm tm_time; time_t tt_gmt_nitz; @@ -90,6 +90,7 @@ static gboolean update_time(const TelNetworkNitzInfoNoti *ti, gboolean mode_auto tm_time.tm_sec = ti->second; tm_time.tm_min = ti->minute; tm_time.tm_hour = ti->hour; + tm_time.tm_wday = ti->wday; tm_time.tm_isdst = ti->dstoff; tt_gmt_nitz = timegm(&tm_time); @@ -106,20 +107,21 @@ static gboolean update_time(const TelNetworkNitzInfoNoti *ti, gboolean mode_auto /* * - Apply system time (GMT) */ - ret = sysman_set_datetime(tt_gmt_nitz); + ret = deviced_set_datetime(tt_gmt_nitz); if (ret < 0) { - filelog("sysman_set_datetime(%ld) failed. ret = %d", + filelog("deviced_set_datetime(%ld) failed. ret = %d", tt_gmt_nitz, ret); return FALSE; } else { - filelog("sysman_set_datetime(%ld) success. ret = %d", + filelog("deviced_set_datetime(%ld) success. ret = %d", tt_gmt_nitz, ret); } return TRUE; } -static gboolean update_timezone(const TelNetworkNitzInfoNoti *ti, gboolean mode_auto) +static gboolean update_timezone(const struct tnoti_network_timeinfo *ti, + gboolean mode_auto) { int mcc; char mcc_str[4]; @@ -130,7 +132,7 @@ static gboolean update_timezone(const TelNetworkNitzInfoNoti *ti, gboolean mode_ mcc = atoi(mcc_str); dbg("MCC: [%d]", mcc); - if (mcc > 0) { + if (mcc >= 0) { m = nitz_find_tzinfo(mcc, ti->gmtoff, ti->dstoff, ti->isdst); if (m) { dbg("Country: [%s] (ISO 3166)", m->country); @@ -145,7 +147,8 @@ static gboolean update_timezone(const TelNetworkNitzInfoNoti *ti, gboolean mode_ return ret; } -gboolean nitz_time_update(const TelNetworkNitzInfoNoti *time_info, gboolean mode_auto) +gboolean nitz_time_update(const struct tnoti_network_timeinfo *time_info, + gboolean mode_auto) { if (time_info->year == 0 && time_info->month == 0 diff --git a/src/time_update.h b/src/time_update.h index a05cb1a..5c2f758 100644 --- a/src/time_update.h +++ b/src/time_update.h @@ -1,7 +1,7 @@ /* * tel-plugin-nitz * - * Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2000 - 2015 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,6 @@ int nitz_apply_tzfile(const char *tzfilename, gboolean mode_auto); long nitz_get_uptime(); -gboolean nitz_time_update(const TelNetworkNitzInfoNoti *time_info, gboolean mode_auto); +gboolean nitz_time_update(const struct tnoti_network_timeinfo *time_info, gboolean mode_auto); #endif -- 2.7.4 From f0cee9d72584d9e565129af955a8c17dd47d3f35 Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Tue, 24 Mar 2015 20:39:23 +0900 Subject: [PATCH 6/6] Fix for 64-bit build compatibility Change-Id: I1523725401dad2fa8d7e8edbe7cb02952a314daf Signed-off-by: Jiwan Kim --- CMakeLists.txt | 4 ++-- packaging/tel-plugin-nitz.spec | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9be36c3..8208729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT(nitz-plugin C) # INCLUDE(FindPkgConfig) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(INCLUDEDIR "\${prefix}/include") # Set required packages @@ -42,4 +42,4 @@ SET_TARGET_PROPERTIES(nitz-plugin PROPERTIES PREFIX "" OUTPUT_NAME nitz-plugin) # install INSTALL(TARGETS nitz-plugin - LIBRARY DESTINATION lib/telephony/plugins) + LIBRARY DESTINATION ${LIBDIR}/telephony/plugins) diff --git a/packaging/tel-plugin-nitz.spec b/packaging/tel-plugin-nitz.spec index c3544a0..ee8a996 100644 --- a/packaging/tel-plugin-nitz.spec +++ b/packaging/tel-plugin-nitz.spec @@ -25,7 +25,9 @@ nitz plugin for telephony %build versionint=$[%{major} * 1000000 + %{minor} * 1000 + %{patchlevel}] -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=$versionint +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DVERSION=$versionint make %{?jobs:-j%jobs} %post -- 2.7.4