- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2432 - in freeswitch/trunk/src/mod: codecs/mod_g726 endpoints/mod_sofia
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Tue Aug 29 17:07:24 2006 New Revision: 2432 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: g726 work Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Tue Aug 29 17:07:24 2006 @@ -34,20 +34,27 @@ static const char modname[] = "mod_g726"; +typedef struct { + g726_state context; + uint8_t flag; + uint8_t bytes; +} g726_handle_t; + static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { int encoding, decoding; - g726_state *context = NULL; + g726_handle_t *handle; encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(g726_state))))) { + if (!(encoding || decoding) || (!(handle = switch_core_alloc(codec->memory_pool, sizeof(*handle))))) { return SWITCH_STATUS_FALSE; } else { - g726_init_state(context); - codec->private_info = context; + g726_init_state(&handle->context); + codec->private_info = handle; + handle->bytes = codec->implementation->encoded_bytes_per_frame / (codec->implementation->microseconds_per_frame / 1000); return SWITCH_STATUS_SUCCESS; } } @@ -75,7 +82,8 @@ unsigned int *flag) { - g726_state *context = codec->private_info; + g726_handle_t *handle = codec->private_info; + g726_state *context = &handle->context; uint32_t len = codec->implementation->bytes_per_frame; uint32_t elen = codec->implementation->encoded_bytes_per_frame; encoder_t encoder; @@ -112,17 +120,17 @@ uint32_t loops = decoded_data_len / (sizeof(*ddp)); for (x = 0; x < loops && new_len < *encoded_data_len; x++) { - int sample = encoder(*ddp, AUDIO_ENCODING_LINEAR, context); - *edp = sample; - edp++; - + if (handle->flag & 0x80) { + edp[new_len++] = ((handle->flag & 0xf) << handle->bytes) | encoder(*ddp, AUDIO_ENCODING_LINEAR, context); + handle->flag = 0; + } else { + handle->flag = 0x80 | encoder(*ddp, AUDIO_ENCODING_LINEAR, context); + } ddp++; - new_len++; } if (new_len <= *encoded_data_len) { - printf("encode %d->%d %d\n", decoded_data_len, elen, new_len / 2); - *encoded_data_len = new_len / 2; + *encoded_data_len = new_len; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer overflow!!! %u >= %u\n", new_len, *encoded_data_len); return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Aug 29 17:07:24 2006 @@ -590,27 +590,17 @@ } } - - - -static switch_status_t activate_rtp(private_object_t *tech_pvt) +static switch_status_t tech_set_codec(private_object_t *tech_pvt) { - int bw, ms; switch_channel_t *channel; - const char *err = NULL; - switch_rtp_flag_t flags; - - assert(tech_pvt != NULL); - - channel = switch_core_session_get_channel(tech_pvt->session); - assert(channel != NULL); - assert(tech_pvt->codecs[tech_pvt->codec_index] != NULL); - if (switch_rtp_ready(tech_pvt->rtp_session)) { + if (tech_pvt->read_codec.implementation) { return SWITCH_STATUS_SUCCESS; } + channel = switch_core_session_get_channel(tech_pvt->session); + assert(channel != NULL); if (switch_core_codec_init(&tech_pvt->read_codec, tech_pvt->rm_encoding, @@ -648,7 +638,31 @@ switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); } } + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t activate_rtp(private_object_t *tech_pvt) +{ + int bw, ms; + switch_channel_t *channel; + const char *err = NULL; + switch_rtp_flag_t flags; + switch_status_t status; + + assert(tech_pvt != NULL); + + channel = switch_core_session_get_channel(tech_pvt->session); + assert(channel != NULL); + + + if (switch_rtp_ready(tech_pvt->rtp_session)) { + return SWITCH_STATUS_SUCCESS; + } + + if ((status = tech_set_codec(tech_pvt)) != SWITCH_STATUS_SUCCESS) { + return status; + } bw = tech_pvt->read_codec.implementation->bits_per_second; ms = tech_pvt->read_codec.implementation->microseconds_per_frame; @@ -993,7 +1007,7 @@ tech_pvt = switch_core_session_get_private(session); assert(tech_pvt != NULL); - + if (!switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); @@ -1006,7 +1020,6 @@ nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, //SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); - //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } } break; @@ -1157,6 +1170,9 @@ } if (match) { + if (tech_set_codec(tech_pvt) != SWITCH_STATUS_SUCCESS) { + match = 0; + } break; } }

1 0

[commit] r2431 - freeswitch/trunk/src/mod/codecs/mod_g726
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: brian Date: Tue Aug 29 16:31:01 2006 New Revision: 2431 Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: in progress Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Tue Aug 29 16:31:01 2006 @@ -38,12 +38,12 @@ const switch_codec_settings_t *codec_settings) { int encoding, decoding; - struct g726_state_s *context = NULL; + g726_state *context = NULL; encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g726_state_s))))) { + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(g726_state))))) { return SWITCH_STATUS_FALSE; } else { g726_init_state(context); @@ -59,71 +59,152 @@ return SWITCH_STATUS_SUCCESS; } -#define define_encoder(func, coder, datalen)\ -static switch_status_t func(switch_codec_t *codec,\ - switch_codec_t *other_codec,\ - void *decoded_data,\ -\ - uint32_t decoded_data_len,\ - uint32_t decoded_rate,\ - void *encoded_data,\ -\ - uint32_t *encoded_data_len,\ - uint32_t *encoded_rate,\ - unsigned int *flag)\ -{\ - struct g726_state_s *context = codec->private_info;\ -\ - if (!context) {\ - return SWITCH_STATUS_FALSE;\ - }\ -\ - if (decoded_data_len % datalen == 0) {\ - coder(*(int *)decoded_data , AUDIO_ENCODING_LINEAR, context);\ - }\ -\ - return SWITCH_STATUS_SUCCESS;\ -}\ +typedef int (*encoder_t)(int, int, g726_state *); +typedef int (*decoder_t)(int, int, g726_state *); -#define define_decoder(func, coder, datalen)\ -static switch_status_t func(switch_codec_t *codec,\ - switch_codec_t *other_codec,\ - void *encoded_data,\ -\ - uint32_t encoded_data_len,\ - uint32_t encoded_rate,\ - void *decoded_data,\ -\ - uint32_t *decoded_data_len,\ - uint32_t *decoded_rate,\ - unsigned int *flag)\ -{\ - struct g726_state_s *context = codec->private_info;\ -\ - if (!context) {\ - return SWITCH_STATUS_FALSE;\ - }\ -\ - if (encoded_data_len % datalen == 0) {\ - coder(*(int *)encoded_data, AUDIO_ENCODING_LINEAR, context);\ -}\ -\ - return SWITCH_STATUS_SUCCESS;\ -}\ +static switch_status_t switch_g726_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, -define_encoder(switch_g726_16k_encode, g726_16_encoder, 160) -define_decoder(switch_g726_16k_decode, g726_16_decoder, 40) + uint32_t decoded_data_len, + uint32_t decoded_rate, + void *encoded_data, -define_encoder(switch_g726_24k_encode, g726_24_encoder, 160) -define_decoder(switch_g726_24k_decode, g726_24_decoder, 60) + uint32_t *encoded_data_len, + uint32_t *encoded_rate, + unsigned int *flag) +{ -define_encoder(switch_g726_32k_encode, g726_32_encoder, 160) -define_decoder(switch_g726_32k_decode, g726_32_decoder, 80) + g726_state *context = codec->private_info; + uint32_t len = codec->implementation->bytes_per_frame; + uint32_t elen = codec->implementation->encoded_bytes_per_frame; + encoder_t encoder; -define_encoder(switch_g726_40k_encode, g726_40_encoder, 160) -define_decoder(switch_g726_40k_decode, g726_40_decoder, 100) + switch(elen) { + case 100: + encoder = g726_40_encoder; + break; + case 80: + encoder = g726_32_encoder; + break; + case 60: + encoder = g726_24_encoder; + break; + case 40: + encoder = g726_16_encoder; + break; + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid Encoding Size %d!\n", elen); + return SWITCH_STATUS_FALSE; + break; + } + if (!context) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n"); + return SWITCH_STATUS_FALSE; + } + if (decoded_data_len % len == 0) { + uint32_t new_len = 0; + int16_t *ddp = decoded_data; + int8_t *edp = encoded_data; + int x; + uint32_t loops = decoded_data_len / (sizeof(*ddp)); + + for (x = 0; x < loops && new_len < *encoded_data_len; x++) { + int sample = encoder(*ddp, AUDIO_ENCODING_LINEAR, context); + *edp = sample; + edp++; + + ddp++; + new_len++; + } + + if (new_len <= *encoded_data_len) { + printf("encode %d->%d %d\n", decoded_data_len, elen, new_len / 2); + *encoded_data_len = new_len / 2; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer overflow!!! %u >= %u\n", new_len, *encoded_data_len); + return SWITCH_STATUS_FALSE; + } + } + + return SWITCH_STATUS_SUCCESS; +} + + + +static switch_status_t switch_g726_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + + uint32_t encoded_data_len, + uint32_t encoded_rate, + void *decoded_data, + + uint32_t *decoded_data_len, + uint32_t *decoded_rate, + unsigned int *flag) +{ + + g726_state *context = codec->private_info; + uint32_t len = codec->implementation->bytes_per_frame; + uint32_t elen = codec->implementation->encoded_bytes_per_frame; + decoder_t decoder; + + switch(elen) { + case 40: + decoder = g726_40_decoder; + break; + case 32: + decoder = g726_32_decoder; + break; + case 24: + decoder = g726_24_decoder; + break; + case 16: + decoder = g726_16_decoder; + break; + default: + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid Encoding Size!\n"); + return SWITCH_STATUS_FALSE; + break; + } + + if (!context) { + return SWITCH_STATUS_FALSE; + + } + + + if (encoded_data_len % elen == 0) { + int loops = (int) encoded_data_len / elen; + char *edp = encoded_data; + int16_t *ddp = decoded_data; + int x; + uint32_t new_len = 0; + + for (x = 0; x < loops && new_len < *decoded_data_len; x++) { + *(int16_t *)ddp = decoder(*(int *)edp, AUDIO_ENCODING_LINEAR, context); + ddp += len; + edp += elen; + new_len += len; + } + + if (new_len <= *decoded_data_len) { + *decoded_data_len = new_len; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "buffer overflow!!!\n"); + return SWITCH_STATUS_FALSE; + } + } + + return SWITCH_STATUS_SUCCESS; + +} + + + /* Registration */ static const switch_codec_implementation_t g726_16k_implementation = { @@ -131,17 +212,17 @@ /*.ianacode */ 2, /*.iananame */ "G726-16", /*.samples_per_second */ 8000, - /*.bits_per_second */ 16000, + /*.bits_per_second */ 8000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 40, - /*.encoded_bytes_per_frame */ 10, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 40, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, /*.init */ switch_g726_init, - /*.encode */ switch_g726_16k_encode, - /*.decode */ switch_g726_16k_decode, + /*.encode */ switch_g726_encode, + /*.decode */ switch_g726_decode, /*.destroy */ switch_g726_destroy, }; @@ -151,17 +232,17 @@ /*.ianacode */ 2, /*.iananame */ "G726-24", /*.samples_per_second */ 8000, - /*.bits_per_second */ 24000, + /*.bits_per_second */ 12075, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 60, - /*.encoded_bytes_per_frame */ 10, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 60, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, /*.init */ switch_g726_init, - /*.encode */ switch_g726_24k_encode, - /*.decode */ switch_g726_24k_decode, + /*.encode */ switch_g726_encode, + /*.decode */ switch_g726_decode, /*.destroy */ switch_g726_destroy, }; @@ -170,17 +251,17 @@ /*.ianacode */ 2, /*.iananame */ "G726-32", /*.samples_per_second */ 8000, - /*.bits_per_second */ 32000, + /*.bits_per_second */ 16000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 80, - /*.encoded_bytes_per_frame */ 10, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 80, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, /*.init */ switch_g726_init, - /*.encode */ switch_g726_32k_encode, - /*.decode */ switch_g726_32k_decode, + /*.encode */ switch_g726_encode, + /*.decode */ switch_g726_decode, /*.destroy */ switch_g726_destroy, }; @@ -188,18 +269,18 @@ /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 2, /*.iananame */ "G726-40", - /*.samples_per_second */ 8000, - /*.bits_per_second */ 40000, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 20000, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 100, - /*.encoded_bytes_per_frame */ 10, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 100, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, /*.init */ switch_g726_init, - /*.encode */ switch_g726_40k_encode, - /*.decode */ switch_g726_40k_decode, + /*.encode */ switch_g726_encode, + /*.decode */ switch_g726_decode, /*.destroy */ switch_g726_destroy, };

1 0

[commit] r2430 - in freeswitch/trunk/src: include mod/event_handlers/mod_event_socket
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Tue Aug 29 16:27:43 2006 New Revision: 2430 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix event_socket bugs Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Aug 29 16:27:43 2006 @@ -61,7 +61,7 @@ !strcasecmp(expr, "true") ||\ atoi(expr))) ? SWITCH_TRUE : SWITCH_FALSE -#define SWITCH_STATUS_IS_BREAK(x) (x || x == SWITCH_STATUS_BREAK || x == 730035 || x == 35) +#define SWITCH_STATUS_IS_BREAK(x) (x == SWITCH_STATUS_BREAK || x == 730035 || x == 35) /*! \brief Return a printable name of a switch_priority_t Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Tue Aug 29 16:27:43 2006 @@ -31,7 +31,6 @@ */ #include <switch.h> #define CMD_BUFLEN 1024 * 1000 -#define IS_BREAK(x) ((int)x || SWITCH_STATUS_BREAK || (int)x == 730035 || (int)x == 35) static const char modname[] = "mod_event_socket"; static char *MARKER = "1"; @@ -68,6 +67,7 @@ static struct { switch_socket_t *sock; switch_mutex_t *mutex; + switch_mutex_t *sock_mutex; listener_t *listeners; uint8_t ready; } listen_list; @@ -152,26 +152,29 @@ static void close_socket(switch_socket_t **sock) { - + switch_mutex_lock(listen_list.sock_mutex); if (*sock) { apr_socket_shutdown(*sock, APR_SHUTDOWN_READWRITE); switch_socket_close(*sock); *sock = NULL; } + switch_mutex_unlock(listen_list.sock_mutex); } SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void) { listener_t *l; + close_socket(&listen_list.sock); + switch_mutex_lock(listen_list.mutex); for (l = listen_list.listeners; l; l = l->next) { close_socket(&l->sock); } switch_mutex_unlock(listen_list.mutex); - close_socket(&listen_list.sock); + return SWITCH_STATUS_SUCCESS; } @@ -646,7 +649,7 @@ } -/* Create a thread for the conference and launch it */ +/* Create a thread for the socket and launch it */ static void launch_listener_thread(listener_t *listener) { switch_thread_t *thread; @@ -718,8 +721,9 @@ } switch_mutex_init(&listen_list.mutex, SWITCH_MUTEX_NESTED, pool); - + switch_mutex_init(&listen_list.sock_mutex, SWITCH_MUTEX_NESTED, pool); + for(;;) { rv = switch_sockaddr_info_get(&sa, prefs.ip, APR_INET, prefs.port, 0, pool); if (rv) goto fail; @@ -767,11 +771,12 @@ listener->sock = inbound_socket; listener->pool = listener_pool; + listener_pool = NULL; listener->format = EVENT_FORMAT_PLAIN; - switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener_pool); - switch_core_hash_init(&listener->event_hash, listener_pool); - + switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); + switch_core_hash_init(&listener->event_hash, listener->pool); launch_listener_thread(listener); + } close_socket(&listen_list.sock);

1 0

[commit] r2428 - freeswitch/trunk/w32/Library
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: mikej Date: Tue Aug 29 14:16:22 2006 New Revision: 2428 Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: tweak debug info destination Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Tue Aug 29 14:16:22 2006 @@ -76,7 +76,7 @@ AdditionalLibraryDirectories=""$(InputDir)..\..\libs\apr\$(OutDir)";"$(InputDir)..\..\libs\sqlite\$(OutDir) DLL";"$(InputDir)..\..\libs\apr-util\$(OutDir)";"$(InputDir)..\..\libs\apr-iconv\$(OutDir)";"$(InputDir)..\..\libs\libresample\win";"$(InputDir)..\..\libs\srtp\$(OutDir)"" AddModuleNamesToAssembly="" GenerateDebugInformation="true" - ProgramDatabaseFile="$(OutDir)/FreeSwitchCore.pdb" + ProgramDatabaseFile="$(SolutionDir)$(OutDir)/FreeSwitch.pdb" SubSystem="2" OptimizeReferences="0" EnableCOMDATFolding="0"

1 0

[commit] r2427 - freeswitch/trunk/conf
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: brian Date: Tue Aug 29 12:31:55 2006 New Revision: 2427 Modified: freeswitch/trunk/conf/freeswitch.xml Log: add sofia to default config file Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue Aug 29 12:31:55 2006 @@ -102,7 +102,28 @@ <param name="all" value="DEBUG"/> </mappings> </configuration> - + <configuration name="sofia.conf" description="sofia Endpoint"> + <profile name="test"> + <param name="debug" value="1"/> + <param name="rfc2833-pt" value="101"/> + <param name="sip-port" value="5060"/> + <param name="dialplan" value="XML"/> + <param name="dtmf-duration" value="100"/> + <param name="codec-prefs" value="PCMU@20i"/> + <param name="codec-ms" value="20"/> + <param name="use-rtp-timer" value="true"/> + <param name="rtp-ip" value="192.168.1.20"/> + <param name="sip-ip" value="192.168.1.20"/> +  +  +  +  +  +  +  +  + </profile> + </configuration> <configuration name="syslog.conf" description="Syslog Logger">

1 0

[commit] r2425 - in freeswitch/trunk/src: . include
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Tue Aug 29 11:17:06 2006 New Revision: 2425 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c Log: add some events Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Tue Aug 29 11:17:06 2006 @@ -559,6 +559,8 @@ SWITCH_EVENT_DTMF - DTMF was sent SWITCH_EVENT_MESSAGE - A Basic Message SWITCH_EVENT_CODEC - Codec Change + SWITCH_EVENT_PROGRESS - Early Media + SWITCH_EVENT_OUTGOING - Outgoing Channel SWITCH_EVENT_ALL - All events at once </pre> @@ -573,6 +575,8 @@ SWITCH_EVENT_CHANNEL_EXECUTE, SWITCH_EVENT_CHANNEL_BRIDGE, SWITCH_EVENT_CHANNEL_UNBRIDGE, + SWITCH_EVENT_CHANNEL_PROGRESS, + SWITCH_EVENT_CHANNEL_OUTGOING, SWITCH_EVENT_API, SWITCH_EVENT_LOG, SWITCH_EVENT_INBOUND_CHAN, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue Aug 29 11:17:06 2006 @@ -877,7 +877,7 @@ switch_core_session_message_t msg; char *uuid = switch_core_session_get_uuid(channel->session); switch_status_t status; - + assert(channel != NULL); if (channel->state >= CS_HANGUP) { @@ -893,8 +893,14 @@ status = switch_core_session_message_send(uuid, &msg); if (status == SWITCH_STATUS_SUCCESS) { + switch_event_t *event; + switch_log_printf(SWITCH_CHANNEL_ID_LOG, (char *) file, func, line, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name); switch_channel_set_flag(channel, CF_EARLY_MEDIA); + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PROGRESS) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(channel, event); + switch_event_fire(&event); + } } return status; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Aug 29 11:17:06 2006 @@ -1075,6 +1075,8 @@ if (*new_session) { switch_caller_profile_t *profile = NULL, *peer_profile = NULL, *cloned_profile = NULL; switch_channel_t *peer_channel = NULL; + switch_event_t *event; + switch_channel_t *new_channel = switch_core_session_get_channel(*new_session); if (session && channel) { profile = switch_channel_get_caller_profile(channel); @@ -1094,6 +1096,11 @@ switch_channel_set_originatee_caller_profile(channel, cloned_profile); } } + } + + if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_OUTGOING) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(new_channel, event); + switch_event_fire(&event); } } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Tue Aug 29 11:17:06 2006 @@ -99,6 +99,8 @@ "CHANNEL_EXECUTE", "CHANNEL_BRIDGE", "CHANNEL_UNBRIDGE", + "CHANNEL_PROGRESS", + "CHANNEL_OUTGOING", "API", "LOG", "INBOUND_CHAN",

1 0

[commit] r2422 - in freeswitch/trunk: build src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Mon Aug 28 22:42:27 2006 New Revision: 2422 Modified: freeswitch/trunk/build/checkversion.sh freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: WIP Modified: freeswitch/trunk/build/checkversion.sh ============================================================================== --- freeswitch/trunk/build/checkversion.sh (original) +++ freeswitch/trunk/build/checkversion.sh Mon Aug 28 22:42:27 2006 @@ -1,5 +1,9 @@ #!/bin/sh +if [ -f .noversion ] ; then + exit +fi + if eval test x${1} = xforce ; then rm -f .version fi Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 22:42:27 2006 @@ -724,7 +724,9 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); if (tech_pvt->nh) { - nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + nua_respond(tech_pvt->nh, SIP_200_OK, + //SIPTAG_CONTACT(tech_pvt->contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); } } @@ -1001,7 +1003,9 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "183 SDP:\n%s\n", tech_pvt->local_sdp_str); - nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); + nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, + //SIPTAG_CONTACT(tech_pvt->contact), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } } @@ -1241,7 +1245,9 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, + //SIPTAG_CONTACT(tech_pvt->contact), + TAG_END()); break; case nua_callstate_completing: nua_ack(nh, TAG_END()); @@ -1270,12 +1276,13 @@ switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); - //nua_respond(nh, SIP_100_TRYING, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); return; } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, + //SIPTAG_CONTACT(tech_pvt->contact), + TAG_END()); break; case nua_callstate_early: break; @@ -1314,7 +1321,9 @@ } } switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); - nua_respond(nh, SIP_488_NOT_ACCEPTABLE, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); + nua_respond(nh, SIP_488_NOT_ACCEPTABLE, + //SIPTAG_CONTACT(tech_pvt->contact), + TAG_END()); break; case nua_callstate_terminating: break; @@ -1366,6 +1375,8 @@ snprintf(username, sizeof(username), "%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); attach_private(session, profile, tech_pvt, username); + + snprintf(username, sizeof(username), "sip:%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE(username), NULL); channel = switch_core_session_get_channel(session);

1 0

[commit] r2421 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Mon Aug 28 21:27:23 2006 New Revision: 2421 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 21:27:23 2006 @@ -110,6 +110,7 @@ char *extsipip; char *username; char *url; + char *sipdomain; int sip_port; char *codec_string; char *codec_order[SWITCH_MAX_CODECS]; @@ -1250,11 +1251,9 @@ sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_session_t *sdp; uint8_t match = 0; - - tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); - + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { match = negotiate_sdp(session, sdp); @@ -1367,6 +1366,7 @@ snprintf(username, sizeof(username), "%s@%s", (char *) from->a_url->url_user, (char *) from->a_url->url_host); attach_private(session, profile, tech_pvt, username); + tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE(username), NULL); channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); @@ -1538,10 +1538,11 @@ TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(profile->nua, - NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), - NUTAG_AUTOALERT(0)); + NUTAG_AUTOALERT(0), + SIPTAG_SUPPORTED_STR("100rel, precondition") + ); for (node = profile->aliases; node; node = node->next) { @@ -1549,16 +1550,12 @@ event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(node->url), - NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), - NUTAG_AUTOANSWER(0), - NUTAG_AUTOALERT(0), TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua, NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), NUTAG_AUTOANSWER(0), + SIPTAG_SUPPORTED_STR("100rel, precondition"), NUTAG_AUTOALERT(0)); } @@ -1655,6 +1652,8 @@ profile->rtpip = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "sip-ip")) { profile->sipip = switch_core_strdup(profile->pool, val); + } else if (!strcmp(var, "sip-domain")) { + profile->sipdomain = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "ext-sip-ip")) { profile->extsipip = switch_core_strdup(profile->pool, val); } else if (!strcmp(var, "username")) { @@ -1709,6 +1708,9 @@ profile->dialplan = switch_core_strdup(profile->pool, "default"); } + if (!profile->sipdomain) { + profile->sipdomain = switch_core_strdup(profile->pool, profile->sipip); + } snprintf(url, sizeof(url), "sip:%s:%d", profile->sipip, profile->sip_port); profile->url = switch_core_strdup(profile->pool, url);

1 0

[commit] r2420 - in freeswitch/trunk/src: . include
by Freeswitch SVN 29 Aug '06

29 Aug '06

Author: anthm Date: Mon Aug 28 21:13:38 2006 New Revision: 2420 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_ivr.c Log: tweaks Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Aug 28 21:13:38 2006 @@ -89,6 +89,8 @@ struct switch_core_thread_session { /*! status of the thread */ int running; + /*! mutex */ + switch_mutex_t *mutex; /*! array of void pointers to pass mutiple data objects */ void *objs[SWITCH_MAX_CORE_THREAD_SESSION_OBJS]; /*! a pointer to a memory pool if the thread has it's own pool */ Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 28 21:13:38 2006 @@ -979,7 +979,7 @@ switch_channel_set_flag(chan_a, CF_BRIDGED); - while (data->running > 0 && his_thread->running > 0) { + while (switch_channel_ready(chan_a) && data->running > 0 && his_thread->running > 0) { switch_channel_state_t b_state = switch_channel_get_state(chan_b); switch_status_t status; switch_event_t *event; @@ -987,7 +987,9 @@ switch (b_state) { case CS_HANGUP: case CS_DONE: + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); continue; default: break; @@ -1024,7 +1026,9 @@ if (input_callback) { if (input_callback(session_a, dtmf, SWITCH_INPUT_TYPE_DTMF, user_data, 0) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s ended call via DTMF\n", switch_channel_get_name(chan_a)); + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); break; } } @@ -1049,13 +1053,18 @@ if (SWITCH_READ_ACCEPTABLE(status)) { if (status != SWITCH_STATUS_BREAK) { if (switch_core_session_write_frame(session_b, read_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write: %s Bad Frame....[%u] Bubye!\n", switch_channel_get_name(chan_b), read_frame->datalen); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "write: %s Bad Frame....[%u] Bubye!\n", + switch_channel_get_name(chan_b), read_frame->datalen); + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); } } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "read: %s Bad Frame.... Bubye!\n", switch_channel_get_name(chan_a)); + switch_mutex_lock(data->mutex); data->running = -1; + switch_mutex_unlock(data->mutex); } //switch_yield(1000); @@ -1066,11 +1075,12 @@ msg.from = __FILE__; switch_core_session_receive_message(session_a, &msg); - data->running = 0; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BRIDGE THREAD DONE [%s]\n", switch_channel_get_name(chan_a)); switch_channel_clear_flag(chan_a, CF_BRIDGED); + switch_mutex_lock(data->mutex); data->running = 0; + switch_mutex_unlock(data->mutex); return NULL; } @@ -1625,6 +1635,7 @@ other_audio_thread->objs[4] = session_data; other_audio_thread->objs[5] = this_audio_thread; other_audio_thread->running = 5; + switch_mutex_init(&other_audio_thread->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); this_audio_thread->objs[0] = peer_session; this_audio_thread->objs[1] = session; @@ -1633,6 +1644,7 @@ this_audio_thread->objs[4] = peer_session_data; this_audio_thread->objs[5] = other_audio_thread; this_audio_thread->running = 2; + switch_mutex_init(&this_audio_thread->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(peer_session)); switch_channel_add_state_handler(peer_channel, &audio_bridge_peer_state_handlers); @@ -1675,17 +1687,25 @@ this_audio_thread->objs[3] = NULL; this_audio_thread->objs[4] = NULL; this_audio_thread->objs[5] = NULL; - this_audio_thread->running = 2; + switch_mutex_lock(this_audio_thread->mutex); + this_audio_thread->running = 0; + switch_mutex_unlock(this_audio_thread->mutex); - if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) < CS_HANGUP) { switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL); switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); } switch_channel_clear_flag(caller_channel, CF_ORIGINATOR); - other_audio_thread->running = 0; - + + if (other_audio_thread->running > 0) { + switch_mutex_lock(other_audio_thread->mutex); + other_audio_thread->running = -1; + switch_mutex_unlock(other_audio_thread->mutex); + while (other_audio_thread->running) { + switch_yield(1000); + } + } switch_core_session_rwunlock(peer_session); } else {

1 0

[commit] r2419 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 28 Aug '06

28 Aug '06

Author: anthm Date: Mon Aug 28 19:50:10 2006 New Revision: 2419 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_rtp.c Log: fix stupidness Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 28 19:50:10 2006 @@ -723,7 +723,6 @@ set_local_sdp(tech_pvt); activate_rtp(tech_pvt); if (tech_pvt->nh) { - tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); nua_respond(tech_pvt->nh, SIP_200_OK, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP:\n%s\n", tech_pvt->local_sdp_str); } @@ -995,10 +994,12 @@ if (!switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Asked to send early media by %s\n", msg->from); + /* Transmit 183 Progress with SDP */ tech_choose_port(tech_pvt); set_local_sdp(tech_pvt); activate_rtp(tech_pvt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "183 SDP:\n%s\n", tech_pvt->local_sdp_str); nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT(tech_pvt->contact), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); //nua_respond(tech_pvt->nh, SIP_200_OK, SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), TAG_END()); } @@ -1251,6 +1252,9 @@ uint8_t match = 0; + tech_pvt->contact = sip_contact_create(tech_pvt->home, URL_STRING_MAKE("sip:1000@208.64.200.40"), NULL); + + if (tech_pvt->num_codecs) { if ((sdp = sdp_session(parser))) { match = negotiate_sdp(session, sdp); @@ -1267,7 +1271,7 @@ switch_channel_set_state(channel, CS_INIT); switch_set_flag_locked(tech_pvt, TFLAG_READY); switch_core_session_thread_launch(session); - //nua_respond(nh, SIP_180_RINGING, TAG_END()); + //nua_respond(nh, SIP_100_TRYING, SIPTAG_CONTACT(tech_pvt->contact), TAG_END()); return; } } @@ -1531,10 +1535,15 @@ event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ NUTAG_URL(profile->url), - NUTAG_EARLY_MEDIA(1), - SIPTAG_SUPPORTED_STR("100rel, precondition"), TAG_END()); /* Last tag should always finish the sequence */ + nua_set_params(profile->nua, + NUTAG_EARLY_MEDIA(1), + SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0)); + + for (node = profile->aliases; node; node = node->next) { node->nua = nua_create(profile->s_root, /* Event loop */ event_callback, /* Callback for processing events */ @@ -1542,8 +1551,16 @@ NUTAG_URL(node->url), NUTAG_EARLY_MEDIA(1), SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0), TAG_END()); /* Last tag should always finish the sequence */ + nua_set_params(node->nua, + NUTAG_EARLY_MEDIA(1), + SIPTAG_SUPPORTED_STR("100rel, precondition"), + NUTAG_AUTOANSWER(0), + NUTAG_AUTOALERT(0)); + } su_root_run(profile->s_root); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Aug 28 19:50:10 2006 @@ -1678,7 +1678,7 @@ this_audio_thread->running = 2; - if (!switch_channel_test_flag(peer_channel, CF_TRANSFER)) { + if (!switch_channel_test_flag(peer_channel, CF_TRANSFER) && switch_channel_get_state(peer_channel) < CS_HANGUP) { switch_core_session_kill_channel(peer_session, SWITCH_SIG_KILL); switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING); } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Aug 28 19:50:10 2006 @@ -547,7 +547,7 @@ SWITCH_DECLARE(uint8_t) switch_rtp_ready(switch_rtp_t *rtp_session) { - return switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO) ? 1 : 0; + return (rtp_session != NULL && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_IO)) ? 1 : 0; } SWITCH_DECLARE(void) switch_rtp_destroy(switch_rtp_t **rtp_session)

1 0