kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gsmopen: fix FS-4181 , catch gsmlib exceptions

This commit is contained in:
Giovanni Maruzzelli 2012-05-03 15:22:15 +02:00
parent a10f01f10c
commit 1666292025
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/endpoints/mod_gsmopen/gsmopen_protocol.cpp
View File

@ -1569,6 +1569,7 @@ int gsmopen_serial_read_AT(private_t *tech_pvt, int look_for_ack, int timeout_us
} }
} }
/* if we are reading an sms message from memory, put the line into the sms buffer if the line is not "OK" or "ERROR" */ /* if we are reading an sms message from memory, put the line into the sms buffer if the line is not "OK" or "ERROR" */
if (tech_pvt->reading_sms_msg > 1 && at_ack == -1) { if (tech_pvt->reading_sms_msg > 1 && at_ack == -1) {
int c; int c;
@ -1667,6 +1668,7 @@ int gsmopen_serial_read_AT(private_t *tech_pvt, int look_for_ack, int timeout_us
#ifdef WANT_GSMLIB #ifdef WANT_GSMLIB
try{
char content2[1000]; char content2[1000];
SMSMessageRef sms; SMSMessageRef sms;
//MessageType messagetype; //MessageType messagetype;
@ -1712,6 +1714,10 @@ int gsmopen_serial_read_AT(private_t *tech_pvt, int look_for_ack, int timeout_us
//servicecentretimestamp = sms->serviceCentreTimestamp(); //servicecentretimestamp = sms->serviceCentreTimestamp();
//sender_recipient_address = sms->address(); //sender_recipient_address = sms->address();
} catch (GsmException &ge)
{
ERRORA("GsmException= |||%s|||\n", GSMOPEN_P_LOG, ge.what());
}
#endif // WANT_GSMLIB #endif // WANT_GSMLIB
@ -2745,6 +2751,7 @@ int gsmopen_sendsms(private_t *tech_pvt, char *dest, char *text)
if (tech_pvt->no_ucs2 || tech_pvt->sms_pdu_not_supported == 0) { if (tech_pvt->no_ucs2 || tech_pvt->sms_pdu_not_supported == 0) {
#ifdef WANT_GSMLIB #ifdef WANT_GSMLIB
try{
SMSMessageRef smsMessage; SMSMessageRef smsMessage;
memset(mesg_test, '\0', sizeof(mesg_test)); memset(mesg_test, '\0', sizeof(mesg_test));
@ -2818,6 +2825,11 @@ int gsmopen_sendsms(private_t *tech_pvt, char *dest, char *text)
//servicecentretimestamp = sms->serviceCentreTimestamp(); //servicecentretimestamp = sms->serviceCentreTimestamp();
//sender_recipient_address = sms->address(); //sender_recipient_address = sms->address();
#endif // NOTDEF #endif // NOTDEF
} catch (GsmException &ge)
{
ERRORA("GsmException= |||%s|||\n", GSMOPEN_P_LOG, ge.what());
}
#else // WANT_GSMLIB #else // WANT_GSMLIB
ERRORA("tech_pvt->no_ucs2 || tech_pvt->sms_pdu_not_supported == 0 && no WANT_GSMLIB\n", GSMOPEN_P_LOG); ERRORA("tech_pvt->no_ucs2 || tech_pvt->sms_pdu_not_supported == 0 && no WANT_GSMLIB\n", GSMOPEN_P_LOG);