[Title] modify to the call be barred before the call list set

[Desc.] W/A for call list control issue

Change-Id: I9a381b415b3f5048df51d188e0fcb3b3d68302cc
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --git a/packaging/vmodemd-emul.spec b/packaging/vmodemd-emul.spec
index 9c996f4..cbb26dd 100644 (file)
--- a/packaging/vmodemd-emul.spec
+++ b/packaging/vmodemd-emul.spec
@@ -1,6 +1,6 @@
 #git:slp/pkgs/v/vmodem-daemon-emulator
 Name: vmodemd-emul
-Version: 0.2.46
+Version: 0.2.47
 Release: 1
 Summary: Modem Emulator
 Group: System/ModemEmulator

diff --git a/vmodem/server/server_tx_call.c b/vmodem/server/server_tx_call.c
index 7d72673..6db7a30 100644 (file)
--- a/vmodem/server/server_tx_call.c
+++ b/vmodem/server/server_tx_call.c
@@ -372,6 +372,19 @@ int server_tx_call_incoming_noti( LXT_MESSAGE * packet ) //
 
        TRACE(MSGL_VGSM_INFO, "\n");
 
+       if(!resp_entry)
+               TRACE(MSGL_VGSM_INFO, "CB entry is NULL!!!\n");
+       else {
+               for(i=0; i<resp_entry[0].count; i++) {
+                       TRACE(MSGL_VGSM_INFO,"i : %d,  type : %d\n", i, resp_entry[i].type);
+                       if(resp_entry[i].type == 4 && resp_entry[i].ss_mode == 3) { // 'All incoming calls' has set
+                               TRACE(MSGL_VGSM_ERR, "Incoming Call Barring is set \n");
+                               callback_callist();
+                               return -1;
+                       }
+               }
+       }
+
        get_current_state_machine( &state );
        if( ( state.state_type == STATE_CALL_WAITING_OUTGOING ) ||
                        ( state.state_type == STATE_CALL_WAITING_INCOMING ) )
@@ -440,18 +453,6 @@ int server_tx_call_incoming_noti( LXT_MESSAGE * packet ) //
        //090314
        callback_callist();
 
-       if(!resp_entry)
-               TRACE(MSGL_VGSM_INFO, "CB entry is NULL!!!\n");
-       else {
-               for(i=0; i<resp_entry[0].count; i++) {
-                       TRACE(MSGL_VGSM_INFO,"i : %d,  type : %d\n", i, resp_entry[i].type);
-                       if(resp_entry[i].type == 4 && resp_entry[i].ss_mode == 3) { // 'All incoming calls' has set
-                               TRACE(MSGL_VGSM_INFO, "Incoming Call Barring is set \n");
-                               return -1;
-                       }
-               }
-       }
-
        char* number_type;
        if(number[0] == '+')
                number_type = "129";