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

Merge branch 'master' of git://git.freeswitch.org/freeswitch

This commit is contained in:
Michael S Collins 2010-07-12 17:38:25 -07:00
parent 88d6336f3d 60af226890
commit 69c15e0ed4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/esl/src/esl_oop.cpp
View File

@ -355,7 +355,7 @@ const char *ESLevent::serialize(const char *format)
return ""; return "";
} }
if (!strcasecmp(format, "json")) { if (format && !strcasecmp(format, "json")) {
esl_event_serialize_json(event, &serialized_string); esl_event_serialize_json(event, &serialized_string);
return serialized_string; return serialized_string;
} }

4
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
View File

@ -1031,6 +1031,10 @@ tryagain:
ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)event->calling.digits); ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)event->calling.digits);
ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)event->called.digits); ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)event->called.digits);
ftdm_set_string(ftdmchan->caller_data.rdnis.digits, (char *)event->rdnis.digits); ftdm_set_string(ftdmchan->caller_data.rdnis.digits, (char *)event->rdnis.digits);
if (event->custom_data_size) {
ftdm_set_string(ftdmchan->caller_data.raw_data, event->custom_data);
ftdmchan->caller_data.raw_data_len = event->custom_data_size;
}
if (strlen(event->calling_name)) { if (strlen(event->calling_name)) {
ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)event->calling_name); ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)event->calling_name);