提交 69c15e0e authored 作者: Michael S Collins's avatar Michael S Collins

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

...@@ -355,7 +355,7 @@ const char *ESLevent::serialize(const char *format) ...@@ -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;
} }
......
...@@ -1031,6 +1031,10 @@ tryagain: ...@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论