release tizen_2.0 beta

[framework/telephony/tel-plugin-socket_communicator.git] / plugin / src / socket_sap.c

diff --git a/plugin/src/socket_sap.c b/plugin/src/socket_sap.c
index d5ab25b..c5fc59e 100644 (file)
--- a/plugin/src/socket_sap.c
+++ b/plugin/src/socket_sap.c
@@ -83,7 +83,7 @@ gboolean scomm_service_reqeust_sap(unsigned int ch_id, Communicator *c, TcorePlu
        }
 
        switch (cmd) {
-               case TAPI_SERVICE_SAP_CONNECT :{
+               case TAPI_SERVICE_SAP_REQ_CONNECT :{
                        struct treq_sap_req_connect req_conn = {0, };
                        gint g_max_size;
                        g_max_size = sipc_util_marshal_object_get_int(in_o, "max_size");
@@ -93,21 +93,21 @@ gboolean scomm_service_reqeust_sap(unsigned int ch_id, Communicator *c, TcorePlu
                }
                        break;
 
-               case TAPI_SERVICE_SAP_DISCONNECT: {
+               case TAPI_SERVICE_SAP_REQ_DISCONNECT: {
                        struct treq_sap_req_disconnect req_disconn;
                        tcore_user_request_set_data(ur, sizeof(struct treq_sap_req_disconnect), &req_disconn);
                        tcore_user_request_set_command(ur, TREQ_SAP_REQ_DISCONNECT);
                }
                        break;
 
-               case TAPI_SERVICE_SAP_GET_CONNECTSTATUS: {
+               case TAPI_SERVICE_SAP_REQ_STATUS: {
                        struct treq_sap_req_status req_status;
                        tcore_user_request_set_data(ur, sizeof(struct treq_sap_req_status), &req_status);
                        tcore_user_request_set_command(ur, TREQ_SAP_REQ_STATUS);
                }
                        break;
 
-               case TAPI_SERVICE_SAP_GET_ATR : {
+               case TAPI_SERVICE_SAP_REQ_ATR : {
                        struct treq_sap_req_atr req_atr;
                        tcore_user_request_set_data(ur, sizeof(struct treq_sap_req_atr), &req_atr);
                        tcore_user_request_set_command(ur, TREQ_SAP_REQ_ATR);
@@ -148,7 +148,7 @@ gboolean scomm_service_reqeust_sap(unsigned int ch_id, Communicator *c, TcorePlu
                }
                        break;
 
-               case TAPI_SERVICE_SAP_GET_READERSTATUS : {
+               case TAPI_SERVICE_SAP_REQ_CARDREADERSTATUS : {
                        struct treq_sap_req_cardreaderstatus req_reader;
                        tcore_user_request_set_data(ur, sizeof(struct treq_sap_req_cardreaderstatus), &req_reader);
                        tcore_user_request_set_command(ur, TREQ_SAP_REQ_CARDREADERSTATUS);
@@ -273,7 +273,6 @@ gboolean scomm_service_notification_sap(Communicator *comm, CoreObject *source,
        int ret = 0;
        gchar *out_d = NULL, *serial_d = NULL;
        struct custom_data *ctx = NULL;
-       sipc_server_t *s = NULL;
 
        struct _tapi_header hdr;
        struct _sipc_marshal_object* out_o = NULL;
@@ -286,28 +285,29 @@ gboolean scomm_service_notification_sap(Communicator *comm, CoreObject *source,
                return FALSE;
        }
 
-       s = ctx->sk_server;
        dbg("notification !!! (command = 0x%x, data_len = %d)", command, data_len);
 
        out_o = sipc_util_marshal_object_create();
 
        switch (command) {
-               case TNOTI_SAP_STATUS :
+               case TNOTI_SAP_STATUS:
                        dbg("notified sap_status[%d]", n_sap_status->status);
-                       sipc_util_marshal_object_add_data(out_o, "status", (void*)&n_sap_status->status, SIPC_MARSHAL_DATA_INT_TYPE);
+                       sipc_util_marshal_object_add_data(out_o, "status", (void*) &n_sap_status->status,
+                                       SIPC_MARSHAL_DATA_INT_TYPE);
                        break;
 
-               case TNOTI_SAP_DISCONNECT :
+               case TNOTI_SAP_DISCONNECT:
                        dbg("notified sap_disconnect type[%d]", n_sap_disconn->type);
-                       sipc_util_marshal_object_add_data(out_o, "type", (void*)&n_sap_disconn->type, SIPC_MARSHAL_DATA_INT_TYPE);
+                       sipc_util_marshal_object_add_data(out_o, "type", (void*) &n_sap_disconn->type, SIPC_MARSHAL_DATA_INT_TYPE);
                        break;
 
-               default :
-                       dbg("not handled command [%d] here",command);
+               default:
+                       dbg("unknown notification");
+                       return FALSE;
                        break;
        }
 
-       if(out_o){
+       if (out_o) {
                serial_d = sipc_util_marshal_object_serializer(out_o);
                hdr.data_len = strlen(serial_d);
                sipc_util_marshal_object_destory(out_o);
@@ -315,15 +315,15 @@ gboolean scomm_service_notification_sap(Communicator *comm, CoreObject *source,
 
        out_d = g_new0(char, sizeof(struct _tapi_header)+hdr.data_len);
        memcpy(out_d, &hdr, sizeof(struct _tapi_header));
-       if(serial_d){
-               memcpy(out_d+sizeof(struct _tapi_header), serial_d, hdr.data_len);
+       if (serial_d) {
+               memcpy(out_d + sizeof(struct _tapi_header), serial_d, hdr.data_len);
                g_free(serial_d);
        }
 
-       ret = sipc_server_broadcast(s, out_d, sizeof(struct _tapi_header)+hdr.data_len);
+       ret = sipc_server_broadcast(ctx->sk_server, out_d, sizeof(struct _tapi_header) + hdr.data_len);
        g_free(out_d);
 
-       if(ret < 0){
+       if (ret < 0) {
                return FALSE;
        }
        return TRUE;