merge with master

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3cc7e2e8f88a0ae692c179f2da2921e79d2ebce..41861e9f81ea30aba45b1b8310a14f63d1c84677 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,6 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 CONFIGURE_FILE(tapi.pc.in tapi.pc @ONLY)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/telephony-client)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tapi.pc DESTINATION lib/pkgconfig)
-INSTALL(TARGETS SLP-tapi DESTINATION lib COMPONENT Runtime)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tapi.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL(TARGETS SLP-tapi DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtime)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME libslp-tapi)

diff --git a/include/TelNetwork.h b/include/TelNetwork.h
index 36233f57abb89e9dc32dbd7523dce14e0d4b2154..d6b7f9c9fd43683058ffc557cf283611b1d88fc4 100644 (file)
--- a/include/TelNetwork.h
+++ b/include/TelNetwork.h
@@ -40,6 +40,7 @@ extern "C"
 
 #define TAPI_NETWORK_ORDER_MAX                                 5               /**< Maximum network order */
 #define TAPI_NETWORK_LIST_MAX                                  15              /**< Maximum network list */
+#define TAPI_NETWORK_PLMN_LEN_MAX                              6               /**< Maximum PLMN length*/
 #define TAPI_NETWORK_NAME_LEN_MAX                              40              /**< Maximum network name or PLMN name length*/
 #define TAPI_NETWORK_SPN_LEN_MAX                               20              /**< Maximum network service provider name length */
 #define TAPI_PREFERRED_PLMN_RECORDS_MAX                        150             /**< Maximum record length for preferred plmn list*/
@@ -315,7 +316,7 @@ typedef struct {
  */
 typedef struct {
        unsigned char Index; /**< Network Preferred Plmn list index */
-       char Plmn[7]; /**< Network Preferred Plmn */
+       char Plmn[TAPI_NETWORK_PLMN_LEN_MAX + 1]; /**< Network Preferred Plmn */
        char network_name[TAPI_NETWORK_NAME_LEN_MAX + 1]; /**< Network Name  */
        char service_provider_name[TAPI_NETWORK_NAME_LEN_MAX + 1]; /**< Service provider name */
        TelNetworkSystemType_t SystemType; /**< Network system type */
@@ -365,6 +366,7 @@ typedef struct {
        char network_name[TAPI_NETWORK_NAME_LEN_MAX + 1]; /**< Network Name  */
        char service_provider_name[TAPI_NETWORK_NAME_LEN_MAX + 1]; /**< Service provider name */
        unsigned int plmn_id; /**< PLMN ID */
+       char plmn[TAPI_NETWORK_PLMN_LEN_MAX + 1]; /**< PLMN ID */
        TelNetworkPlmnType_t type_of_plmn; /**< PLMN type */
        TelNetworkSystemType_t access_technology; /**< Access technology  */
 } TelNetworkIdentity_t;
@@ -407,7 +409,7 @@ typedef struct {
 
 typedef struct {
        TelNetworkSystemType_t act; /**< Access technology  */
-       char plmn[7];
+       char plmn[TAPI_NETWORK_PLMN_LEN_MAX + 1];
        int lac;
 } TelNetworkServing_t;
 
@@ -475,7 +477,7 @@ struct tel_noti_network_cell_info {
 
 struct tel_noti_network_change {
        TelNetworkSystemType_t act; /**< Access technology  */
-       char plmn[7];
+       char plmn[TAPI_NETWORK_PLMN_LEN_MAX + 1];
        int lac;
 };
 
@@ -490,11 +492,11 @@ struct tel_noti_network_time_info {
        int gmtoff;
        int dstoff;
        int isdst;
-       char plmn[7];
+       char plmn[TAPI_NETWORK_PLMN_LEN_MAX + 1];
 };
 
 struct  tel_noti_network_identity {
-       char plmn[7];
+       char plmn[TAPI_NETWORK_PLMN_LEN_MAX + 1];
        char short_name[17];
        char full_name[33];
 };

diff --git a/include/TelSim.h b/include/TelSim.h
index 547ea93ee73798803230555b7d8c04af376d3ef0..8fdaf5d97a510ce16246827e995fcf74d347ead9 100644 (file)
--- a/include/TelSim.h
+++ b/include/TelSim.h
@@ -792,7 +792,7 @@ typedef struct {
  * This data structure defines the data for the apdu.
  */
 typedef struct {
-       unsigned char apdu_len;
+       unsigned short apdu_len;
        unsigned char* apdu;
 } TelSimApdu_t;
 
@@ -800,7 +800,7 @@ typedef struct {
  * This data structure defines the data for the Response of sending apdu.
  */
 typedef struct {
-       unsigned char apdu_resp_len;
+       unsigned short apdu_resp_len;
        unsigned char apdu_resp[TAPI_SIM_APDU_MAX_LEN];
 } TelSimApduResp_t;
 
@@ -808,7 +808,7 @@ typedef struct {
  * This data structure defines the data for the Response of sending apdu.
  */
 typedef struct {
-       unsigned char atr_resp_len;
+       unsigned short atr_resp_len;
        unsigned char atr_resp[TAPI_SIM_APDU_MAX_LEN];
 } TelSimAtrResp_t;
 

diff --git a/packaging/libslp-tapi.spec b/packaging/libslp-tapi.spec
index 92a36d0b0923c49acc960bce8f726919134ace49..0c7112e8fc8319689a6a5633ce810b74a7acfa13 100644 (file)
--- a/packaging/libslp-tapi.spec
+++ b/packaging/libslp-tapi.spec
@@ -1,13 +1,10 @@
-#sbs-git:slp/pkgs/l/libslp-tapi libslp-tapi 0.1.1
 Name: libslp-tapi
 Summary: Telephony dbus client library
-Version: 0.6.59
+Version: 0.6.69
 Release:    1
 Group:      System/Libraries
-License:    Apache
+License:    Apache-2.0
 Source0:    libslp-tapi-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
@@ -31,7 +28,7 @@ Telephony client API library (devel)
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+%cmake .
 
 
 make %{?jobs:-j%jobs}
@@ -51,9 +48,7 @@ mkdir -p %{buildroot}/usr/share/license
 %files
 %manifest libslp-tapi.manifest
 %defattr(-,root,root,-)
-#%doc COPYING
 %{_libdir}/*.so.*
-#%{_bindir}/tapitest
 /usr/share/license/libslp-tapi
 
 %files devel

diff --git a/src/tapi_common.c b/src/tapi_common.c
index cdd8a7685bab3a9c37ba0971132b1995c60e6766..a76a172b2c6dddf2b2eedd47a4a9040e4c9d60a8 100644 (file)
--- a/src/tapi_common.c
+++ b/src/tapi_common.c
@@ -1177,8 +1177,9 @@ EXPORT_API TapiHandle* tel_init(const char *cp_name)
        GError *error = NULL;
        struct tapi_handle *handle;
        gchar *addr;
-
+#if !GLIB_CHECK_VERSION (2, 35, 3)
        g_type_init();
+#endif
 
        dbg("process info: env=%s, invocation=%s", getenv("_"), program_invocation_name);
 

diff --git a/src/tapi_network.c b/src/tapi_network.c
index b12021a745607a56fdcfff98e9d772c144ab08f0..6440014f422f1e275623409a14aca6bfbde62e1c 100644 (file)
--- a/src/tapi_network.c
+++ b/src/tapi_network.c
@@ -209,6 +209,7 @@ static void on_response_search_network(GObject *source_object, GAsyncResult *res
                while (g_variant_iter_loop(iter_row, "{sv}", &key, &value)) {
                        if (!g_strcmp0(key, "plmn")) {
                                list.network_list[i].plmn_id = atoi(g_variant_get_string(value, NULL));
+                               strncpy(list.network_list[i].plmn, g_variant_get_string(value, NULL), TAPI_NETWORK_PLMN_LEN_MAX);
                        }
                        if (!g_strcmp0(key, "act")) {
                                list.network_list[i].access_technology = _convert_act_to_systemtype(g_variant_get_int32(value));

diff --git a/src/tapi_sim.c b/src/tapi_sim.c
index d2cdaee371e60f9ac59af0a7a140df03dde4269e..f2d4c9ba4673e6d6416c16c62a3428662f97f6a2 100644 (file)
--- a/src/tapi_sim.c
+++ b/src/tapi_sim.c
@@ -1261,7 +1261,7 @@ static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res,
        GVariant *param_gv = NULL;
        GVariant *inner_gv = NULL;
        guchar rt_i;
-       int i = 0;
+       unsigned short i = 0;
 
        struct tapi_resp_data *evt_cb_data = user_data;
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
@@ -1295,12 +1295,11 @@ static void on_response_req_sim_apdu(GObject *source_object, GAsyncResult *res,
                r_apdu.apdu_resp[i] = rt_i;
                i++;
        }
-       r_apdu.apdu_resp_len = (unsigned char) i;
+       r_apdu.apdu_resp_len = i;
+       dbg("r_apdu.apdu_resp_len=[%d]", r_apdu.apdu_resp_len);
        g_variant_iter_free(iter);
        g_variant_unref(inner_gv);
        g_variant_unref(param_gv);
-       /*              for(i=0; i < (int)r_apdu.apdu_resp_len; i++)
-        dbg("apdu[%d][0x%02x]",i, r_apdu.apdu_resp[i]);*/
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &r_apdu, evt_cb_data->user_data);
@@ -1319,7 +1318,7 @@ static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, g
        GVariant *param_gv = NULL;
        GVariant *inner_gv = NULL;
        guchar rt_i;
-       int i = 0;
+       unsigned short i = 0;
 
        struct tapi_resp_data *evt_cb_data = user_data;
        TelSimAccessResult_t result = TAPI_SIM_ACCESS_SUCCESS;
@@ -1353,12 +1352,11 @@ static void on_response_req_sim_atr(GObject *source_object, GAsyncResult *res, g
                r_atr.atr_resp[i] = rt_i;
                i++;
        }
-       r_atr.atr_resp_len = (unsigned char) i;
+       r_atr.atr_resp_len = i;
+       dbg("r_atr.atr_resp_len=[%d]", r_atr.atr_resp_len);
        g_variant_iter_free(iter);
        g_variant_unref(inner_gv);
        g_variant_unref(param_gv);
-       /*              for(i=0; i < (int)r_atr.atr_resp_len; i++)
-        dbg("r_atr[%d][0x%02x]",i, r_atr.atr_resp[i]);*/
 
        if (evt_cb_data->cb_fn) {
                evt_cb_data->cb_fn(evt_cb_data->handle, result, &r_atr, evt_cb_data->user_data);