From 0fd6c4ce62e99c923c05cc9d6189a1484c0645cb Mon Sep 17 00:00:00 2001 From: sungmin ha Date: Thu, 6 Sep 2012 18:04:31 +0900 Subject: [PATCH] modified end call bug when conference call --- debian/changelog | 8 ++++++++ debian/control | 2 +- packaging/vmodemd-emul.spec | 2 +- vmodem/server/server_common_call.c | 2 +- vmodem/server/server_tx_call.c | 7 ++++--- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4094f6a..4b0689a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vmodemd-emul (0.2.21) unstable; urgency=low + + * modified end call bug when conference call + * Git: slp/pkgs/v/vmodem-daemon-emulator + * Tag: vmodemd-emul_0.2.21 + + -- Sungmin Ha Thu, 06 Sep 2012 18:01:20 +0900 + vmodemd-emul (0.2.20) unstable; urgency=low * modified default call-waiting on diff --git a/debian/control b/debian/control index b0688f9..f452929 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: extra Maintainer: SungMin Ha ,Jihye Kim ,Yeongkyoon Lee Build-Depends: bison, flex, autoconf, gcc, debhelper, libglib2.0-dev, libxml2-dev, libvconf-dev -Standards-Version: 0.2.20 +Standards-Version: 0.2.21 Package: vmodemd-emul Architecture: i386 diff --git a/packaging/vmodemd-emul.spec b/packaging/vmodemd-emul.spec index b02481a..f6980e7 100644 --- 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.20 +Version: 0.2.21 Release: 1 Summary: Modem Emulator Group: System/ModemEmulator diff --git a/vmodem/server/server_common_call.c b/vmodem/server/server_common_call.c index be56206..083681b 100644 --- a/vmodem/server/server_common_call.c +++ b/vmodem/server/server_common_call.c @@ -88,7 +88,7 @@ void set_call_list_status( int call_id, int mpty, gsm_call_status_e_type stat ) { _ENTER(); - if( g_call_list.CallCount >= MAX_CALL_COUNT ) + if( g_call_list.CallCount > MAX_CALL_COUNT ) return; g_call_list.CallInfo[call_id].stat = stat; diff --git a/vmodem/server/server_tx_call.c b/vmodem/server/server_tx_call.c index 79b1243..26f5f2d 100644 --- a/vmodem/server/server_tx_call.c +++ b/vmodem/server/server_tx_call.c @@ -103,7 +103,7 @@ int server_tx_call_status(void) // it means call state. // find client id of incoming call & set active get_call_list(callList); for( i=0; iCallInfo[i].stat == GSM_CALL_STATUS_INCOMING ){ + if(callList->CallInfo[i].stat == GSM_CALL_STATUS_INCOMING || callList->CallInfo[i].stat == GSM_CALL_STATUS_WAITING){ log_msg(MSGL_VGSM_INFO,"call id(%d) is GSM_CALL_STATUS_INCOMING \n", i); set_call_id( i ); break; @@ -604,13 +604,14 @@ int server_tx_call_release_internal(int call_id) set_ss_state(SS_NONE); + log_msg(MSGL_VGSM_INFO,"deleted call id : %d \n", call_id); + delete_call_list( call_id ); + if( find_next_state( &next, STATE_FLAG_ALL ) ) { set_state_machine( next ); send_msg(); } - log_msg(MSGL_VGSM_INFO,"deleted call id : %d \n", call_id); - delete_call_list( call_id ); get_call_list(list); if(list){ packet.data = list; -- 2.7.4