From 85d3428372c5818d1016fee8cc1c9c2c2bd0e87d Mon Sep 17 00:00:00 2001 From: Moises Silva Date: Mon, 12 Jul 2010 16:12:07 -0400 Subject: [PATCH 1/2] freetdm: fix custom old ss7 data --- .../src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c index 42090710b1..b5121b995b 100644 --- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c +++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c @@ -1031,6 +1031,10 @@ tryagain: 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.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)) { ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)event->calling_name); From 60af226890a190ad3aa25ab46eff9e1d0e7e6938 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 12 Jul 2010 15:37:07 -0500 Subject: [PATCH 2/2] deal with empty param to serialize() --- libs/esl/src/esl_oop.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/esl/src/esl_oop.cpp b/libs/esl/src/esl_oop.cpp index 1b6629c066..231950f892 100644 --- a/libs/esl/src/esl_oop.cpp +++ b/libs/esl/src/esl_oop.cpp @@ -355,7 +355,7 @@ const char *ESLevent::serialize(const char *format) return ""; } - if (!strcasecmp(format, "json")) { + if (format && !strcasecmp(format, "json")) { esl_event_serialize_json(event, &serialized_string); return serialized_string; }