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

Merge f04bbfcaac into 5cb74797fe

This commit is contained in:
Nadin Zajimovic 2025-01-17 16:41:26 +00:00 committed by GitHub
parent 5cb74797fe f04bbfcaac
commit 1a323a9f29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -6645,6 +6645,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sofia_load)
switch_goto_status(SWITCH_STATUS_TERM, err); switch_goto_status(SWITCH_STATUS_TERM, err);
} }
if (switch_event_reserve_subclass(MY_EVENT_ACK_REQUEST) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", MY_EVENT_ACK_REQUEST);
switch_goto_status(SWITCH_STATUS_TERM, err);
}
switch_find_local_ip(mod_sofia_globals.guess_ip, sizeof(mod_sofia_globals.guess_ip), &mod_sofia_globals.guess_mask, AF_INET); switch_find_local_ip(mod_sofia_globals.guess_ip, sizeof(mod_sofia_globals.guess_ip), &mod_sofia_globals.guess_mask, AF_INET);
in.s_addr = mod_sofia_globals.guess_mask; in.s_addr = mod_sofia_globals.guess_mask;
switch_set_string(mod_sofia_globals.guess_mask_str, inet_ntoa(in)); switch_set_string(mod_sofia_globals.guess_mask_str, inet_ntoa(in));
@ -6864,6 +6869,7 @@ void mod_sofia_shutdown_cleanup(void) {
switch_event_free_subclass(MY_EVENT_REGISTER); switch_event_free_subclass(MY_EVENT_REGISTER);
switch_event_free_subclass(MY_EVENT_GATEWAY_ADD); switch_event_free_subclass(MY_EVENT_GATEWAY_ADD);
switch_event_free_subclass(MY_EVENT_BYE_RESPONSE); switch_event_free_subclass(MY_EVENT_BYE_RESPONSE);
switch_event_free_subclass(MY_EVENT_ACK_REQUEST);
switch_console_del_complete_func("::sofia::list_profiles"); switch_console_del_complete_func("::sofia::list_profiles");
switch_console_set_complete("del sofia"); switch_console_set_complete("del sofia");

1
src/mod/endpoints/mod_sofia/mod_sofia.h
View File

@ -108,6 +108,7 @@ typedef struct private_object private_object_t;
#define MY_EVENT_INTERCEPTED "sofia::intercepted" #define MY_EVENT_INTERCEPTED "sofia::intercepted"
#define MY_EVENT_BYE_RESPONSE "sofia::bye_response" #define MY_EVENT_BYE_RESPONSE "sofia::bye_response"
#define MY_EVENT_ACK_REQUEST "sofia::ack_request"
#define MULTICAST_EVENT "multicast::event" #define MULTICAST_EVENT "multicast::event"
#define SOFIA_REPLACES_HEADER "_sofia_replaces_" #define SOFIA_REPLACES_HEADER "_sofia_replaces_"

7
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -1669,6 +1669,7 @@ static void our_sofia_event_callback(nua_event_t event,
{ {
if (channel && sip) { if (channel && sip) {
const char *r_sdp = NULL; const char *r_sdp = NULL;
switch_event_t *event;
sofia_glue_store_session_id(session, profile, sip, 0); sofia_glue_store_session_id(session, profile, sip, 0);
if (sip->sip_payload && sip->sip_payload->pl_data) { if (sip->sip_payload && sip->sip_payload->pl_data) {
@ -1749,6 +1750,12 @@ static void our_sofia_event_callback(nua_event_t event,
} }
if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_ACK_REQUEST) == SWITCH_STATUS_SUCCESS) {
switch_channel_event_set_data(channel, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(session));
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "ack_received", "true");
switch_event_fire(&event);
}
} }
} }