mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-16 14:28:34 +00:00
Merge remote branch 'origin/master' into FS-3432
This commit is contained in:
commit
7e6018985c
145 files changed
+4670
-4514
No files matched your search
@@ -145,7 +145,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
|
||||
for (ap = app_log; ap; ap = ap->next) {
|
||||
bson_append_start_object(&cdr, "application");
|
||||
bson_append_string(&cdr, "app_name", ap->app);
|
||||
bson_append_string(&cdr, "app_data", ap->arg);
|
||||
bson_append_string(&cdr, "app_data", switch_str_nil(ap->arg));
|
||||
bson_append_long(&cdr, "app_stamp", ap->stamp);
|
||||
bson_append_finish_object(&cdr); /* application */
|
||||
}
|
||||
@@ -186,7 +186,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
|
||||
bson_append_bool(&cdr, "last_executed", 1);
|
||||
}
|
||||
bson_append_string(&cdr, "app_name", ap->application_name);
|
||||
bson_append_string(&cdr, "app_data", ap->application_data);
|
||||
bson_append_string(&cdr, "app_data", switch_str_nil(ap->application_data));
|
||||
bson_append_finish_object(&cdr);
|
||||
}
|
||||
|
||||
@@ -215,7 +215,7 @@ static switch_status_t my_on_reporting(switch_core_session_t *session)
|
||||
bson_append_bool(&cdr, "last_executed", 1);
|
||||
}
|
||||
bson_append_string(&cdr, "app_name", ap->application_name);
|
||||
bson_append_string(&cdr, "app_data", ap->application_data);
|
||||
bson_append_string(&cdr, "app_data", switch_str_nil(ap->application_data));
|
||||
bson_append_finish_object(&cdr);
|
||||
}
|
||||
|
||||
|
||||
@@ -857,7 +857,7 @@ static void listener_main_loop(listener_t *listener)
|
||||
|
||||
/* do we need the mutex when reading? */
|
||||
/*switch_mutex_lock(listener->sock_mutex); */
|
||||
status = ei_xreceive_msg_tmo(listener->sockfd, &msg, &buf, 10);
|
||||
status = ei_xreceive_msg_tmo(listener->sockfd, &msg, &buf, 100);
|
||||
/*switch_mutex_unlock(listener->sock_mutex); */
|
||||
|
||||
switch (status) {
|
||||
|
||||
@@ -1185,7 +1185,7 @@ static switch_status_t read_packet(listener_t *listener, switch_event_t **event,
|
||||
}
|
||||
count++;
|
||||
if (count == 1) {
|
||||
switch_event_create(event, SWITCH_EVENT_SOCKET_DATA);
|
||||
switch_event_create(event, SWITCH_EVENT_CLONE);
|
||||
switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Command", mbuf);
|
||||
} else if (cur) {
|
||||
char *var, *val;
|
||||
|
||||
@@ -213,7 +213,7 @@ static switch_status_t my_on_routing(switch_core_session_t *session)
|
||||
}
|
||||
*/
|
||||
|
||||
if ((signal_bond = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && !zstr(signal_bond)) {
|
||||
if ((signal_bond = switch_channel_get_partner_uuid(channel)) && !zstr(signal_bond)) {
|
||||
if (rc_avpair_add(rad_config, &send, PW_FS_OTHER_LEG_ID, (void*) signal_bond, -1, PW_FS_PEC) == NULL) {
|
||||
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "[mod_radius_cdr] Failed adding Freeswitch-Other-Leg-Id: %s\n", uuid_str);
|
||||
rc_destroy(rad_config);
|
||||
|
||||
Reference in new issue
Block a user