- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3206 - in freeswitch/trunk: libs src/mod/languages/mod_spidermonkey
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 16:05:16 2006 New Revision: 3206 Modified: freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Log: update Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Wed Oct 25 16:05:16 2006 @@ -49,5 +49,5 @@ cd nsprpub && CFLAGS=$cflags LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && CFLAGS=$cflags LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +cd ../js/src && CFLAGS=$cflags BUILD_OPT=$BUILD_OPT LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile Wed Oct 25 16:05:16 2006 @@ -1,6 +1,10 @@ # This is all used to make sure we use the right options during build and link. OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) +#VER=DBG +#BO=0 +VER=OPT +BO=1 # Attempt to differentiate between SunOS 5.4 and x86 5.4 OS_CPUARCH := $(shell uname -m) @@ -59,16 +63,16 @@ endif endif -CFLAGS += -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_DBG.OBJ +CFLAGS += -I$(BASE)/libs/mozilla/js/src -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/js/src -I$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -I$(OS_CONFIG)_$(VER).OBJ LDFLAGS +=-DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -Wall -Wno-format -g -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DHAVE_LOCALTIME_R -DX86_LINUX -DDEBUG -DDEBUG_root -DJS_THREADSAFE -I$(BASE)/libs/mozilla/nsprpub/dist/include/nspr -lteletone -OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_DBG.OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl -letpan +OBJS=$(BASE)/libs/mozilla/js/src/$(OS_CONFIG)_$(VER).OBJ/libjs.a $(BASE)/libs/mozilla/nsprpub/dist/lib/libnspr4.a -lcurl -letpan LINKER=$(CC) all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) depends: - MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX) + BUILD_OPT=$(BO) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) mozilla.tar.gz --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install curl-7.15.2.tar.gz --prefix=$(PREFIX) --without-libidn MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install libetpan-0.45.tar.gz --prefix=$(PREFIX)

1 0

[commit] r3205 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 14:49:34 2006 New Revision: 3205 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Oct 25 14:49:34 2006 @@ -1283,7 +1283,6 @@ if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - //terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } @@ -1299,6 +1298,7 @@ samples = frames * tech_pvt->read_codec.implementation->samples_per_frame; if (switch_rtp_write_frame(tech_pvt->rtp_session, frame, samples) < 0) { + terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } tech_pvt->timestamp_send += (int) samples;

1 0

[commit] r3204 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: mikej Date: Wed Oct 25 14:00:14 2006 New Revision: 3204 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: why malloc? 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 Wed Oct 25 14:00:14 2006 @@ -3626,7 +3626,7 @@ if(signal_ptr) { struct private_object *tech_pvt = NULL; switch_channel_t *channel = NULL; - char *dtmf_digit; + char dtmf_digit[2] = {0,0}; //Get the channel channel = switch_core_session_get_channel(session); @@ -3640,26 +3640,18 @@ //Barf if we didn't get it assert(tech_pvt != NULL); - //holder for the dtmf digit - dtmf_digit = malloc(sizeof(char) * 2); - //move signal_ptr where we need it (right past Signal=) signal_ptr = signal_ptr + 7; //put the digit somewhere we can muck with strncpy(dtmf_digit, signal_ptr, 1); - //End the string - *(dtmf_digit + 1) = '\0'; - //queue it up switch_channel_queue_dtmf(channel, dtmf_digit); //print debug info switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INFO DTMF(%s)\n", dtmf_digit); - //Give back the memory I borrowed - free(dtmf_digit); } else { //unknown info type sip_from_t const *from;

1 0

[commit] r3203 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 13:59:50 2006 New Revision: 3203 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix 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 Wed Oct 25 13:59:50 2006 @@ -3922,7 +3922,7 @@ if (authenticate->au_params) { for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { if ((realm = strstr(cur, "realm="))) { - realm += 7; + realm += 6; break; } }

1 0

[commit] r3201 - freeswitch/trunk/libs
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: mikej Date: Wed Oct 25 13:04:00 2006 New Revision: 3201 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: bad opt, wrong directory. Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Wed Oct 25 13:04:00 2006 @@ -49,5 +49,5 @@ cd nsprpub && CFLAGS=$cflags LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && CFLAGS=$cflags BUILD_OPT=1 LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +cd ../js/src && CFLAGS=$cflags LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a`

1 0

[commit] r3200 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: mikej Date: Wed Oct 25 13:00:57 2006 New Revision: 3200 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: only need realm on auth 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 Wed Oct 25 13:00:57 2006 @@ -3927,12 +3927,13 @@ } } } - } - if (!(scheme && realm)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); - return; + if (!(scheme && realm)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); + return; + } } + if (sofia_private) { if (sofia_private->oreg) {

1 0

[commit] r3199 - in freeswitch/trunk: libs libs/libdingaling/src src/include src/mod/asr_tts/mod_cepstral src/mod/endpoints/mod_dingaling
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 13:00:23 2006 New Revision: 3199 Modified: freeswitch/trunk/libs/libdingaling/src/config.h.in freeswitch/trunk/libs/mozilla.build.sh freeswitch/trunk/src/include/switch_am_config.h.in freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update Modified: freeswitch/trunk/libs/libdingaling/src/config.h.in ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/config.h.in (original) +++ freeswitch/trunk/libs/libdingaling/src/config.h.in Wed Oct 25 13:00:23 2006 @@ -106,5 +106,5 @@ /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Wed Oct 25 13:00:23 2006 @@ -49,5 +49,5 @@ cd nsprpub && CFLAGS=$cflags LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && CFLAGS=$cflags LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +cd ../js/src && CFLAGS=$cflags BUILD_OPT=1 LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` Modified: freeswitch/trunk/src/include/switch_am_config.h.in ============================================================================== --- freeswitch/trunk/src/include/switch_am_config.h.in (original) +++ freeswitch/trunk/src/include/switch_am_config.h.in Wed Oct 25 13:00:23 2006 @@ -124,5 +124,5 @@ /* Define to rpl_malloc if the replacement function should be used. */ #undef malloc -/* Define to `unsigned' if <sys/types.h> does not define. */ +/* Define to `unsigned int' if <sys/types.h> does not define. */ #undef size_t Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Wed Oct 25 13:00:23 2006 @@ -227,7 +227,7 @@ return SWITCH_STATUS_FALSE; } - swift_port_speak_text(cepstral->port, "<break time=\"600ms\"/>", 0, NULL, &cepstral->tts_stream, NULL); + swift_port_speak_text(cepstral->port, "<break time=\"400ms\"/>", 0, NULL, &cepstral->tts_stream, NULL); swift_port_speak_text(cepstral->port, text, 0, NULL, &cepstral->tts_stream, NULL); } Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Oct 25 13:00:23 2006 @@ -577,6 +577,12 @@ switch_channel_hangup(channel, cause); } + switch_mutex_lock(tech_pvt->flag_mutex); + switch_set_flag(tech_pvt, TFLAG_TERM); + switch_set_flag(tech_pvt, TFLAG_BYE); + switch_clear_flag(tech_pvt, TFLAG_IO); + switch_mutex_unlock(tech_pvt->flag_mutex); + *session = NULL; } @@ -1186,6 +1192,12 @@ return SWITCH_STATUS_FALSE; } + if (switch_test_flag(tech_pvt, TFLAG_BYE)) { + //terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); + return SWITCH_STATUS_FALSE; + } + + tech_pvt->read_frame.datalen = 0; switch_set_flag_locked(tech_pvt, TFLAG_READING); @@ -1241,10 +1253,6 @@ switch_clear_flag_locked(tech_pvt, TFLAG_READING); - if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); - return SWITCH_STATUS_FALSE; - } *frame = &tech_pvt->read_frame; return SWITCH_STATUS_SUCCESS; @@ -1275,7 +1283,7 @@ if (switch_test_flag(tech_pvt, TFLAG_BYE)) { - terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); + //terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); return SWITCH_STATUS_FALSE; } @@ -2560,11 +2568,6 @@ if (channel) { switch_channel_state_t state = switch_channel_get_state(channel); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s %u %d\n", switch_channel_get_name(channel), state, CS_INIT); - switch_mutex_lock(tech_pvt->flag_mutex); - switch_set_flag(tech_pvt, TFLAG_TERM); - switch_set_flag(tech_pvt, TFLAG_BYE); - switch_clear_flag(tech_pvt, TFLAG_IO); - switch_mutex_unlock(tech_pvt->flag_mutex); terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call\n"); goto done;

1 0

[commit] r3198 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 12:17:54 2006 New Revision: 3198 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Log: add pause in tts Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Wed Oct 25 12:17:54 2006 @@ -216,14 +216,6 @@ cepstral->tts_stream = NULL; - if (cepstral->audio_buffer) { - switch_byte_t data[1280]; - memset(data, 255, sizeof(data)); - switch_mutex_lock(cepstral->audio_lock); - switch_buffer_write(cepstral->audio_buffer, data, sizeof(data)); - switch_mutex_unlock(cepstral->audio_lock); - } - if (!strncasecmp(text, fp, len)) { text += len; if (switch_strlen_zero(text)) { @@ -234,6 +226,8 @@ if (switch_strlen_zero(text)) { return SWITCH_STATUS_FALSE; } + + swift_port_speak_text(cepstral->port, "<break time=\"600ms\"/>", 0, NULL, &cepstral->tts_stream, NULL); swift_port_speak_text(cepstral->port, text, 0, NULL, &cepstral->tts_stream, NULL); }

1 0

[commit] r3197 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 11:46:42 2006 New Revision: 3197 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: sip signalling Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Wed Oct 25 11:46:42 2006 @@ -1,6 +1,6 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) VERSION = sofia-sip-1.12 -TARBALL = sofia-sip-1.12.3.6.tar.gz +TARBALL = sofia-sip-1.12.3.5.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC) 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 Wed Oct 25 11:46:42 2006 @@ -3896,48 +3896,20 @@ outbound_reg_t *oreg = NULL; sip_www_authenticate_t const *authenticate = NULL; switch_core_session_t *session = sofia_private ? sofia_private->session : NULL; - - if (sofia_private) { - if (sofia_private->oreg) { - oreg = sofia_private->oreg; - } else if (profile) { - /* NOTE - this is a linked list, when nua_identity comes - we need to actually pick the right one... - */ - oreg = profile->registrations; - } - } - - + char const *realm = NULL; + char const *scheme = NULL; + int index; + char *cur; + if (session) { private_object_t *tech_pvt; if ((tech_pvt = switch_core_session_get_private(session)) && switch_test_flag(tech_pvt, TFLAG_REFER)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "received reply from refer\n"); - return; } } - - if (!oreg) { - if (sofia_private->oreg) { - nua_handle_destroy(nh); - } - return; - } - - if (status == 200) { - if (sofia_private->oreg) { - oreg->state = REG_STATE_REGISTER; - nua_handle_destroy(nh); - } - } else if (status == 401 || status == 407) { - char const *realm; - char const *scheme; - char authentication[256] = ""; - int ss_state; - + if (status == 401 || status == 407) { if (sip->sip_www_authenticate) { authenticate = sip->sip_www_authenticate; } else if (sip->sip_proxy_authenticate) { @@ -3946,26 +3918,67 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Missing Authenticate Header!\n"); return; } - - realm = (char const *) *authenticate->au_params; scheme = (char const *) authenticate->au_scheme; + if (authenticate->au_params) { + for(index = 0; (cur=(char*)authenticate->au_params[index]); index++) { + if ((realm = strstr(cur, "realm="))) { + realm += 7; + break; + } + } + } + } + + if (!(scheme && realm)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n"); + return; + } + + if (sofia_private) { + if (sofia_private->oreg) { + oreg = sofia_private->oreg; + } else if (profile) { + outbound_reg_t *oregp; + for (oregp = profile->registrations; oregp; oregp = oregp->next) { + if (!strcasecmp(oregp->register_scheme, scheme) && !strcasecmp(oregp->register_realm, realm)) { + oreg = oregp; + break; + } + } + } + } + + if (!oreg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Register handle to associate!\n"); + return; + } + + if (status == 200) { + oreg->state = REG_STATE_REGISTER; + } else if (authenticate) { + char authentication[256] = ""; + int ss_state; + + if (realm) { + snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, + oreg->register_username, + oreg->register_password); - snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, strstr(realm, "=") + 1, - oreg->register_username, - oreg->register_password); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", + profile->username, authentication); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", - profile->username, authentication); + ss_state = nua_callstate_authenticating; - ss_state = nua_callstate_authenticating; + tl_gets(tags, + NUTAG_CALLSTATE_REF(ss_state), + SIPTAG_WWW_AUTHENTICATE_REF(authenticate), + TAG_END()); - tl_gets(tags, - NUTAG_CALLSTATE_REF(ss_state), - SIPTAG_WWW_AUTHENTICATE_REF(authenticate), - TAG_END()); - - nua_authenticate(nh, NUTAG_AUTH(authentication), TAG_END()); + + + nua_authenticate(nh, SIPTAG_EXPIRES_STR(oreg->expires_str), NUTAG_AUTH(authentication), TAG_END()); + } } } @@ -4157,6 +4170,15 @@ } } + +static void unreg(sofia_profile_t *profile) +{ + outbound_reg_t *oregp; + for (oregp = profile->registrations; oregp; oregp = oregp->next) { + nua_handle_destroy(oregp->nh); + } +} + static void check_oreg(sofia_profile_t *profile, time_t now) { outbound_reg_t *oregp; @@ -4180,6 +4202,7 @@ oregp->sofia_private.oreg = oregp; nua_handle_bind(oregp->nh, &oregp->sofia_private); + nua_register(oregp->nh, SIPTAG_FROM_STR(oregp->register_from), SIPTAG_CONTACT_STR(oregp->register_from), @@ -4329,6 +4352,7 @@ su_root_step(profile->s_root, 1000); } + unreg(profile); su_home_deinit(profile->home); @@ -4579,7 +4603,6 @@ oreg->register_proxy = switch_core_strdup(oreg->pool, val); } else if (!strcmp(var, "register-frequency")) { oreg->expires_str = switch_core_strdup(oreg->pool, val); - oreg->freq = atoi(val); } } if (switch_strlen_zero(oreg->register_scheme)) { @@ -4609,9 +4632,6 @@ } oreg->freq = atoi(oreg->expires_str); - if (!oreg->freq) { - oreg->state = REG_STATE_REGED; - } oreg->next = profile->registrations; profile->registrations = oreg;

1 0

[commit] r3196 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '06

25 Oct '06

Author: anthm Date: Wed Oct 25 10:01:03 2006 New Revision: 3196 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: tidy up Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/Makefile Wed Oct 25 10:01:03 2006 @@ -1,6 +1,6 @@ OS_ARCH := $(subst /,_,$(shell uname -s | sed /\ /s//_/)) VERSION = sofia-sip-1.12 -TARBALL = sofia-sip-1.12.3.5.tar.gz +TARBALL = sofia-sip-1.12.3.6.tar.gz CFLAGS += -I. -I$(PREFIX)/include/$(VERSION) LDFLAGS += -lsofia-sip-ua LINKER=$(CC) 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 Wed Oct 25 10:01:03 2006 @@ -1142,16 +1142,18 @@ channel = switch_core_session_get_channel(session); assert(channel != NULL); - cause = switch_channel_get_cause(channel); - sip_cause = hangup_cause_to_sip(cause); - tech_pvt = (private_object_t *) switch_core_session_get_private(session); assert(tech_pvt != NULL); - deactivate_rtp(tech_pvt); + if (switch_test_flag(tech_pvt, TFLAG_BYE)) { + return SWITCH_STATUS_SUCCESS; + } - su_home_deinit(tech_pvt->home); + cause = switch_channel_get_cause(channel); + sip_cause = hangup_cause_to_sip(cause); + deactivate_rtp(tech_pvt); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n", switch_channel_get_name(channel), switch_channel_cause2str(cause), sip_cause); @@ -1190,6 +1192,11 @@ switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_clear_flag_locked(tech_pvt, TFLAG_IO); + + if (tech_pvt->home) { + su_home_deinit(tech_pvt->home); + tech_pvt->home = NULL; + } return SWITCH_STATUS_SUCCESS; }

1 0