January 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r7366 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Jan '08

26 Jan '08

Author: anthm Date: Fri Jan 25 22:56:40 2008 New Revision: 7366 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: fix all the bugs brought on by the guys who made me add t38 no-media passthru 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 Fri Jan 25 22:56:40 2008 @@ -333,7 +333,7 @@ SIPTAG_REASON_STR("SIP;cause=200;text=\"Call completed elsewhere\"")), TAG_END()); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause); - nua_respond(tech_pvt->nh, sip_cause, NULL, TAG_END()); + nua_respond(tech_pvt->nh, sip_cause, sip_status_phrase(sip_cause), TAG_END()); } } switch_set_flag(tech_pvt, TFLAG_BYE); @@ -984,9 +984,10 @@ reason = msg->string_arg; } else { if (!switch_strlen_zero(msg->string_arg)){ - code = atoi(msg->string_arg); - if ((reason = strchr(msg->string_arg, ' '))) { - reason++; + if ((code = atoi(msg->string_arg))) { + if ((reason = strchr(msg->string_arg, ' '))) { + reason++; + } } } } @@ -999,7 +1000,14 @@ code = 488; } - if (code == 407) { + if (!reason) { + reason = sip_status_phrase(code); + if (switch_strlen_zero(reason)) { + reason = "Because"; + } + } + + if (code == 407 && !msg->numeric_arg) { const char *to_uri = switch_channel_get_variable(channel, "sip_to_uri"); const char *to_host = reason; @@ -1009,7 +1017,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); - } else if (code == 484) { + } else if (code == 484 && msg->numeric_arg) { const char *to = switch_channel_get_variable(channel, "sip_to_uri"); const char *max_forwards = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Jan 25 22:56:40 2008 @@ -164,7 +164,8 @@ TFLAG_LATE_NEGOTIATION = (1 << 24), TFLAG_SDP = (1 << 25), TFLAG_VIDEO = (1 << 26), - TFLAG_TPORT_LOG = (1 << 27) + TFLAG_TPORT_LOG = (1 << 27), + TFLAG_SENT_UPDATE = (1 << 28) } TFLAGS; struct mod_sofia_globals { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Jan 25 22:56:40 2008 @@ -1308,12 +1308,17 @@ switch_channel_t *channel = switch_core_session_get_channel(session); const char *uuid; switch_core_session_t *other_session; - + if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { - if (status == 200 && !switch_channel_test_flag(channel, CF_ANSWERED) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { + private_object_t *tech_pvt = switch_core_session_get_private(session); + switch_assert(tech_pvt != NULL); + + if (!switch_test_flag(tech_pvt, TFLAG_SENT_UPDATE)) { return; } + switch_clear_flag_locked(tech_pvt, TFLAG_SENT_UPDATE); + if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE)) && (other_session = switch_core_session_locate(uuid))) { switch_core_session_message_t msg = { 0 }; @@ -1322,7 +1327,7 @@ msg.message_id = SWITCH_MESSAGE_INDICATE_RESPOND; msg.from = __FILE__; msg.numeric_arg = status; - msg.string_arg = phrase; + msg.string_arg = switch_core_session_strdup(other_session, phrase); switch_core_session_receive_message(other_session, &msg); switch_core_session_rwunlock(other_session); }

1 0

[Freeswitch-svn] [commit] r7365 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 26 Jan '08

26 Jan '08

Author: anthm Date: Fri Jan 25 20:53:42 2008 New Revision: 7365 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: prevent invalid state change 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 Fri Jan 25 20:53:42 2008 @@ -1808,7 +1808,9 @@ switch_channel_set_flag(nchannel, CF_OUTBOUND); switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND); switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); - switch_channel_set_state(nchannel, CS_INIT); + if (switch_channel_get_state(nchannel) == CS_NEW) { + switch_channel_set_state(nchannel, CS_INIT); + } tech_pvt->caller_profile = caller_profile; *new_session = nsession; cause = SWITCH_CAUSE_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Jan 25 20:53:42 2008 @@ -1530,7 +1530,9 @@ if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOMEDIA"); switch_set_flag_locked(tech_pvt, TFLAG_READY); - switch_channel_set_state(channel, CS_INIT); + if (switch_channel_get_state(channel) == CS_NEW) { + switch_channel_set_state(channel, CS_INIT); + } switch_set_flag(tech_pvt, TFLAG_SDP); goto done; } else { @@ -1553,7 +1555,9 @@ su_home_t *home = NULL; switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED"); switch_set_flag_locked(tech_pvt, TFLAG_READY); - switch_channel_set_state(channel, CS_INIT); + if (switch_channel_get_state(channel) == CS_NEW) { + switch_channel_set_state(channel, CS_INIT); + } switch_set_flag(tech_pvt, TFLAG_SDP); if (replaces_str) { home = su_home_new(sizeof(*home)); @@ -1748,7 +1752,9 @@ } if (switch_channel_get_state(channel) == CS_HIBERNATE) { switch_set_flag_locked(tech_pvt, TFLAG_READY); - switch_channel_set_state(channel, CS_INIT); + if (switch_channel_get_state(channel) == CS_NEW) { + switch_channel_set_state(channel, CS_INIT); + } switch_set_flag(tech_pvt, TFLAG_SDP); } goto done;

1 0

[Freeswitch-svn] [commit] r7364 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su
by Freeswitch SVN 26 Jan '08

26 Jan '08

Author: mikej Date: Fri Jan 25 20:41:02 2008 New Revision: 7364 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Log: try to not segfault Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Fri Jan 25 20:41:02 2008 @@ -780,7 +780,8 @@ */ void su_free(su_home_t *home, void *data) { - if (home && data) { + if (data) { + if (home) { su_alloc_t *allocation; su_block_t *sub = MEMLOCK(home); @@ -825,6 +826,7 @@ } free(data); + } } /** Check home consistency. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_root.c Fri Jan 25 20:41:02 2008 @@ -1046,19 +1046,19 @@ */ void su_msg_destroy(su_msg_r rmsg) { + su_msg_t *msg = rmsg[0]; assert(rmsg); + rmsg[0] = NULL; - if (rmsg[0]) { - SU_TASK_ZAP(rmsg[0]->sum_to, su_msg_destroy); - SU_TASK_ZAP(rmsg[0]->sum_from, su_msg_destroy); + if (msg) { + SU_TASK_ZAP(msg->sum_to, su_msg_destroy); + SU_TASK_ZAP(msg->sum_from, su_msg_destroy); - if (rmsg[0]->sum_deinit) - rmsg[0]->sum_deinit(rmsg[0]->sum_data); + if (msg->sum_deinit) + msg->sum_deinit(msg->sum_data); - su_free(NULL, rmsg[0]); + su_free(NULL, msg); } - - rmsg[0] = NULL; } /** Gets a pointer to the message data area.

1 0

[Freeswitch-svn] [commit] r7363 - in freeswitch/trunk/src: . mod/event_handlers/mod_event_socket mod/loggers/mod_console
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: anthm Date: Fri Jan 25 18:09:33 2008 New Revision: 7363 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: add resistance on blocking writes to stdout 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 Fri Jan 25 18:09:33 2008 @@ -69,6 +69,8 @@ switch_hash_t *event_hash; switch_thread_rwlock_t *rwlock; switch_core_session_t *session; + int lost_events; + int lost_logs; struct listener *next; }; @@ -106,7 +108,19 @@ if (switch_test_flag(l, LFLAG_LOG) && l->level >= node->level) { char *data = strdup(node->data); if (data) { - switch_queue_push(l->log_queue, data); + if (switch_queue_trypush(l->log_queue, data) == SWITCH_STATUS_SUCCESS) { + int ll = l->lost_logs; + switch_event_t *event; + l->lost_logs = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d log lines!\n", ll); + if (switch_event_create(&event, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "info", "lost %d log lines", ll); + switch_event_fire(&event); + } + } else { + switch_safe_free(data); + l->lost_logs++; + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); } @@ -153,7 +167,21 @@ if (send) { if (switch_event_dup(&clone, event) == SWITCH_STATUS_SUCCESS) { - switch_queue_push(l->event_queue, clone); + if (switch_queue_trypush(l->event_queue, clone) == SWITCH_STATUS_SUCCESS) { + if (l->lost_events) { + int le = l->lost_events; + l->lost_events = 0; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d events!\n", le); + clone = NULL; + if (switch_event_create(&clone, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header(clone, SWITCH_STACK_BOTTOM, "info", "lost %d events", le); + switch_event_fire(&clone); + } + } + } else { + l->lost_events++; + switch_event_destroy(&clone); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); } Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Fri Jan 25 18:09:33 2008 @@ -62,7 +62,7 @@ static switch_hash_t *log_hash = NULL; static uint32_t all_level = 0; static int32_t hard_log_level = SWITCH_LOG_DEBUG; - +static int32_t failed_write = 0; static void del_mapping(char *var) { switch_core_hash_insert(log_hash, var, NULL); @@ -147,6 +147,36 @@ return SWITCH_STATUS_SUCCESS; } +static int can_write(FILE *handle, int ms) +{ +#ifndef WIN32 + int aok = 1; + fd_set can_write; + int fd; + struct timeval to; + int sec, usec; + + sec = ms / 1000; + usec = ms % 1000; + + fd = fileno(handle); + memset(&to, 0, sizeof(to)); + FD_SET(fd, &can_write); + to.tv_sec = sec; + to.tv_usec = usec; + if (select(fd+1, NULL, &can_write, NULL, &to) > 0) { + aok = FD_ISSET(fd, &can_write); + } else { + aok = 0; + } + + return aok; +#else + return 1; +#endif +} + + static switch_status_t switch_console_logger(const switch_log_node_t *node, switch_log_level_t level) { FILE *handle; @@ -155,6 +185,21 @@ return SWITCH_STATUS_SUCCESS; } + if (failed_write) { + if ((handle = switch_core_data_channel(SWITCH_CHANNEL_ID_LOG))) { + int aok = can_write(handle, 5); + if (aok) { + const char *msg = "Failed to write to the console! Logging disabled! RE-enable with the 'console loglevel' command\n"; + if (COLORIZE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s%s%s", COLORS[1], msg, SWITCH_SEQ_DEFAULT_COLOR); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s", msg); + } + failed_write = 0; + } + } + } + if (level > hard_log_level) { return SWITCH_STATUS_SUCCESS; } @@ -162,7 +207,7 @@ if ((handle = switch_core_data_channel(SWITCH_CHANNEL_ID_LOG))) { size_t mask = 0; size_t ok = 0; - + ok = switch_log_check_mask(all_level, level); if (log_hash) { @@ -178,6 +223,16 @@ } if (ok) { +#ifndef WIN32 + int aok = can_write(handle, 2000); + + if (!aok) { + hard_log_level = 0; + failed_write++; + return SWITCH_STATUS_SUCCESS; + } +#endif + if (COLORIZE) { #ifdef WIN32 SetConsoleTextAttribute(hStdout, COLORS[node->level]); @@ -213,18 +268,20 @@ if (argc > 0) { - if (argc < 2) { + if (argc < 1) { err = "missing arg"; goto end; } if (!strcasecmp(argv[0], "loglevel")) { - int level; + int level = hard_log_level; - if (*argv[1] > 47 && *argv[1] < 58) { - level = atoi(argv[1]); - } else { - level = switch_log_str2level(argv[1]); + if (argc > 1) { + if (*argv[1] > 47 && *argv[1] < 58) { + level = atoi(argv[1]); + } else { + level = switch_log_str2level(argv[1]); + } } if (level == SWITCH_LOG_INVALID) { @@ -235,7 +292,9 @@ } goto end; } else if (!strcasecmp(argv[0], "colorize")) { - COLORIZE = switch_true(argv[1]); + if (argc > 1) { + COLORIZE = switch_true(argv[1]); + } stream->write_function(stream, "+OK console color %s\n", COLORIZE ? "enabled" : "disabled"); goto end; } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Jan 25 18:09:33 2008 @@ -647,8 +647,13 @@ hp2 = (*event)->headers; for (hp = todup->headers; hp; hp = hp->next) { - if ((header = ALLOC(sizeof(*header))) == 0) { - return SWITCH_STATUS_MEMERR; + void *pop; + + if (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) { + header = (switch_event_header_t *) pop; + } else { + header = ALLOC(sizeof(*header)); + switch_assert(header); } memset(header, 0, sizeof(*header)); @@ -662,7 +667,7 @@ (*event)->headers = header; } - last = header; + (*event)->last_header = last = header; } if (todup->body) { Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Fri Jan 25 18:09:33 2008 @@ -253,7 +253,27 @@ } else { if (level == SWITCH_LOG_CONSOLE || !LOG_QUEUE || !THREAD_RUNNING) { if (handle) { - fprintf(handle, "%s", data); + int aok = 1; +#ifndef WIN32 + + fd_set can_write; + int fd; + struct timeval to; + + fd = fileno(handle); + memset(&to, 0, sizeof(to)); + FD_SET(fd, &can_write); + to.tv_sec = 0; + to.tv_usec = 5000; + if (select(fd+1, NULL, &can_write, NULL, &to) > 0) { + aok = FD_ISSET(fd, &can_write); + } else { + aok = 0; + } +#endif + if (aok) { + fprintf(handle, "%s", data); + } } free(data); } else if (level <= MAX_LEVEL) {

1 0

[Freeswitch-svn] [commit] r7362 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: anthm Date: Fri Jan 25 15:27:39 2008 New Revision: 7362 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: doh Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Jan 25 15:27:39 2008 @@ -139,7 +139,7 @@ uint32_t len = 0; char *app_data = NULL; - if (xaction->txt) { + if (!switch_strlen_zero(xaction->txt)) { data = xaction->txt; } else { data = (char *) switch_xml_attr_soft(xaction, "data");

1 0

[Freeswitch-svn] [commit] r7361 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: mikej Date: Fri Jan 25 14:57:46 2008 New Revision: 7361 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_tag.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Log: Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi(a)nokia.com> * soa_static.c: fixed signedness error Shall I unpull this patch? (8/128) [ynWvpxqadjk], or ? for help: y Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi(a)nokia.com * test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold Shall I unpull this patch? (15/128) [ynWvpxqadjk], or ? for help: y Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi(a)nokia.com * soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer The wanted media state is based on original user SDP and SOATAG_HOLD() content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter instead. Shall I unpull this patch? (20/128) [ynWvpxqadjk], or ? for help: y Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi(a)nokia.com> * soa_static.c: cleaned inactive hold, added tests Shall I unpull this patch? (31/128) [ynWvpxqadjk], or ? for help: y Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi(a)nokia.com * soa_tag.c: documented SOATAG_HOLD() inactive mode Shall I unpull this patch? (46/128) [ynWvpxqadjk], or ? for help: y Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com> * Using # in SOATAG_HOLD to set media as inactive instead of sendonly Shall I unpull this patch? (47/128) [ynWvpxqadjk], or ? for help: y revert a few more patches from sofia-sip darcs Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Fri Jan 25 14:57:46 2008 @@ -1 +1 @@ -Fri Jan 25 12:44:19 EST 2008 +Fri Jan 25 14:56:46 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Fri Jan 25 14:57:46 2008 @@ -974,28 +974,58 @@ return 0; } +/** Check if @a session mode should be changed. */ +static +int soa_sdp_mode_set_is_needed(sdp_session_t const *session, + sdp_session_t const *remote, + char const *hold) +{ + sdp_media_t const *sm, *rm, *rm_next; + int hold_all; + sdp_mode_t recv_mode; + + SU_DEBUG_7(("soa_sdp_mode_set_is_needed(%p, %p, \"%s\"): called\n", + (void *)session, (void *)remote, hold ? hold : "")); + + if (!session ) + return 0; + + hold_all = str0cmp(hold, "*") == 0; + + rm = remote ? remote->sdp_media : NULL, rm_next = NULL; + + for (sm = session->sdp_media; sm; sm = sm->m_next, rm = rm_next) { + rm_next = rm ? rm->m_next : NULL; + + if (sm->m_rejected) + continue; + + if (rm) { + /* Mode bits do not match */ + if (((rm->m_mode & sdp_recvonly) == sdp_recvonly) + != ((sm->m_mode & sdp_sendonly) == sdp_sendonly)) + return 1; + } + + recv_mode = sm->m_mode & sdp_recvonly; + if (recv_mode && hold && + (hold_all || strcasestr(hold, sm->m_type_name))) + return 1; + } -/** Update mode within session. - * - * @sa soatag_hold - * - * @retval 1 if session was changed (or to be changed, if @a dryrun is nonzero) - */ + return 0; +} + + +/** Update mode within session */ static -int soa_sdp_mode_set(sdp_session_t const *user, - int const *s2u, - sdp_session_t *session, +int soa_sdp_mode_set(sdp_session_t *session, sdp_session_t const *remote, - char const *hold, - int dryrun) + char const *hold) { sdp_media_t *sm; - sdp_media_t const *rm, *rm_next, *um; - int retval = 0, i, j; + sdp_media_t const *rm, *rm_next; int hold_all; - int inactive_all; - int inactive = 0; - char const *hold_media = NULL; sdp_mode_t send_mode, recv_mode; SU_DEBUG_7(("soa_sdp_mode_set(%p, %p, \"%s\"): called\n", @@ -1007,58 +1037,25 @@ rm = remote ? remote->sdp_media : NULL, rm_next = NULL; hold_all = str0cmp(hold, "*") == 0; - inactive_all = str0cmp(hold, "#") == 0; - - i = 0; - for (sm = session->sdp_media; sm; sm = sm->m_next, rm = rm_next, i++) { + for (sm = session->sdp_media; sm; sm = sm->m_next, rm = rm_next) { rm_next = rm ? rm->m_next : NULL; - inactive = 0; if (sm->m_rejected) continue; - assert(s2u); - - for (j = 0, um = user->sdp_media; j != s2u[i]; um = um->m_next, j++) - assert(um); - assert(um); - - send_mode = um->m_mode & sdp_sendonly; + send_mode = sdp_sendonly; if (rm) send_mode = (rm->m_mode & sdp_recvonly) ? sdp_sendonly : 0; - recv_mode = um->m_mode & sdp_recvonly; - - if (rm && rm->m_mode == sdp_inactive) { - send_mode = recv_mode = 0; - } - else if (inactive_all) { - send_mode = recv_mode = 0; - } - else if (hold_all) { + recv_mode = sm->m_mode & sdp_recvonly; + if (recv_mode && hold && (hold_all || strcasestr(hold, sm->m_type_name))) recv_mode = 0; - } - else if (hold && (hold_media = strcasestr(hold, sm->m_type_name))) { - recv_mode = 0; - hold_media += strlen(sm->m_type_name); - hold_media += strspn(hold_media, " \t"); - if (hold_media[0] == '=') { - hold_media += strspn(hold, " \t"); - if (strncasecmp(hold_media, "inactive", strlen("inactive")) == 0) - recv_mode = send_mode = 0; - } - } - - if (sm->m_mode != (unsigned)(recv_mode | send_mode)) - retval = 1; - if (!dryrun) { - sm->m_mode = recv_mode | send_mode; - } + sm->m_mode = recv_mode | send_mode; } - return retval; + return 0; } enum offer_answer_action { @@ -1216,22 +1213,16 @@ /* Step D: Set media mode bits */ switch (action) { - int const *s2u_; - case generate_offer: case generate_answer: case process_answer: - s2u_ = s2u; - - if (!s2u_) s2u_ = sss->sss_s2u; - - if (soa_sdp_mode_set(user, s2u_, local, remote, ss->ss_hold, 1)) { + if (soa_sdp_mode_set_is_needed(local, remote, ss->ss_hold)) { if (local != local0) { *local0 = *local, local = local0; DUP_LOCAL(local); } - soa_sdp_mode_set(user, s2u_, local, remote, ss->ss_hold, 0); + soa_sdp_mode_set(local, remote, ss->ss_hold); } break; default: Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_tag.c Fri Jan 25 14:57:46 2008 @@ -585,22 +585,12 @@ /**@def SOATAG_HOLD(x) * - * Hold media stream or streams. - * - * The hold media stream will have the attribute a=sendonly (meaning that - * some hold announcements or pause music is sent to the held party but that - * the held party should not generate any media) or a=inactive (meaning that - * no media is sent). - * - * When putting a SIP session on hold with sendonly, the application can - * include, e.g., SOATAG_HOLD("audio") or SOATAG_HOLD("video") or - * SOATAG_HOLD("audio, video") or SOATAG_HOLD("*") as @soa parameters. When - * using inactive instead, the application should use "#" or - * "audio=inactive" instead. When resuming the session, application should - * include the tag SOATAG_HOLD(NULL). - * - * Note that last SOATAG_HOLD() in the tag list will override the - * SOATAG_HOLD() tags before it. + * Hold media stream or streams. When putting a SIP session on hold, the + * application can include, e.g., SOATAG_HOLD("audio") or + * SOATAG_HOLD("video") or SOATAG_HOLD("audio, video") or SOATAG_HOLD("*") + * as @soa parameters. When resuming the session, it can include + * SOATAG_HOLD(NULL). Note that last SOATAG_HOLD() in the tag list will + * override the SOATAG_HOLD() tags before it. * * @par Used with * soa_set_params(), soa_get_params(), soa_get_paramlist() \n Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/test_soa.c Fri Jan 25 14:57:46 2008 @@ -451,67 +451,20 @@ TEST(soa_is_audio_active(a), SOA_ACTIVE_SENDONLY); TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDONLY); - /* 'A' will put call inactive */ - offer = NONE; - TEST(soa_set_params(a, SOATAG_HOLD("#"), TAG_END()), 1); - - TEST(soa_generate_offer(a, 1, test_completed), 0); - TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1); - TEST_1(offer != NULL && offer != NONE); - TEST_1(strstr(offer, "a=inactive")); - TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1); - TEST(soa_generate_answer(b, test_completed), 0); - TEST_1(soa_is_complete(b)); - TEST(soa_activate(b, NULL), 0); - TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1); - TEST_1(answer != NULL && answer != NONE); - TEST_1(strstr(answer, "a=inactive")); - TEST(soa_set_remote_sdp(a, 0, answer, -1), 1); - TEST(soa_process_answer(a, test_completed), 0); - TEST(soa_activate(a, NULL), 0); - - TEST(soa_is_audio_active(a), SOA_ACTIVE_INACTIVE); - TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_INACTIVE); - - /* B will send an offer to A, but there is no change in O/A status */ - TEST(soa_generate_offer(b, 1, test_completed), 0); - TEST(soa_get_local_sdp(b, NULL, &offer, &offerlen), 1); - TEST_1(offer != NULL && offer != NONE); - TEST_1(!strstr(offer, "a=inactive")); - printf("offer:\n%s", offer); - TEST(soa_set_remote_sdp(a, 0, offer, offerlen), 1); - TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_SENDRECV); - TEST(soa_generate_answer(a, test_completed), 0); - TEST(soa_is_audio_active(a), SOA_ACTIVE_INACTIVE); - TEST(soa_is_remote_audio_active(a), SOA_ACTIVE_INACTIVE); - TEST_1(soa_is_complete(a)); - TEST(soa_activate(a, NULL), 0); - TEST(soa_get_local_sdp(a, NULL, &answer, &answerlen), 1); - TEST_1(answer != NULL && answer != NONE); - TEST_1(strstr(answer, "a=inactive")); - printf("answer:\n%s", answer); - TEST(soa_set_remote_sdp(b, 0, answer, -1), 1); - TEST(soa_process_answer(b, test_completed), 0); - TEST(soa_activate(b, NULL), 0); - - - TEST(soa_is_audio_active(b), SOA_ACTIVE_INACTIVE); - TEST(soa_is_remote_audio_active(b), SOA_ACTIVE_INACTIVE); - /* 'A' will release hold. */ TEST(soa_set_params(a, SOATAG_HOLD(NULL), TAG_END()), 1); TEST(soa_generate_offer(a, 1, test_completed), 0); TEST(soa_get_local_sdp(a, NULL, &offer, &offerlen), 1); TEST_1(offer != NULL && offer != NONE); - TEST_1(!strstr(offer, "a=sendonly") && !strstr(offer, "a=inactive")); + TEST_1(!strstr(offer, "a=sendonly")); TEST(soa_set_remote_sdp(b, 0, offer, offerlen), 1); TEST(soa_generate_answer(b, test_completed), 0); TEST_1(soa_is_complete(b)); TEST(soa_activate(b, NULL), 0); TEST(soa_get_local_sdp(b, NULL, &answer, &answerlen), 1); TEST_1(answer != NULL && answer != NONE); - TEST_1(!strstr(answer, "a=recvonly") && !strstr(answer, "a=inactive")); + TEST_1(!strstr(answer, "a=recvonly")); TEST(soa_set_remote_sdp(a, 0, answer, -1), 1); TEST(soa_process_answer(a, test_completed), 0); TEST(soa_activate(a, NULL), 0);

1 0

[Freeswitch-svn] [commit] r7360 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: brian Date: Fri Jan 25 14:50:13 2008 New Revision: 7360 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: stop turning on tls Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Jan 25 14:50:13 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="true"/> + <param name="tls" value="false"/>  <param name="tls-bind-params" value="transport=tls"/>

1 0

[Freeswitch-svn] [commit] r7359 - in freeswitch/trunk/conf: dialplan sip_profiles
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: brian Date: Fri Jan 25 14:49:21 2008 New Revision: 7359 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/sip_profiles/default.xml Log: tweak actions to use CDATA Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 25 14:49:21 2008 @@ -119,10 +119,10 @@ </extension> <extension name="extension-intercom"> - <condition field="${sip_to_params}" expression="intercom\=true"/> +  <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> - <action application="export" data="sip_h_Call-Info=<sip:$${domain}>;answer-after=0"/> + <action application="export"><![CDATA[sip_h_Call-Info=<sip:$${domain}>;answer-after=0]]></action> <action application="export" data="sip_auto_answer=true"/> <action application="bridge" data="user/${dialed_ext}@$${domain}"/> </condition> @@ -272,12 +272,6 @@ <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> - <extension name="overlap_dial"> - <condition field="destination_number" expression="^(.*)$"> - <action application="respond" data="484 asterisk sucks"/> - </condition> - </extension> - <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> <action application="transfer" data="$1 enum"/> Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Fri Jan 25 14:49:21 2008 @@ -46,7 +46,7 @@   - <param name="tls" value="false"/> + <param name="tls" value="true"/>  <param name="tls-bind-params" value="transport=tls"/>

1 0

[Freeswitch-svn] [commit] r7358 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: anthm Date: Fri Jan 25 14:47:53 2008 New Revision: 7358 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: mupdate Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Fri Jan 25 14:47:53 2008 @@ -134,11 +134,17 @@ for (xaction = switch_xml_child(xcond, "action"); xaction; xaction = xaction->next) { char *application = (char *) switch_xml_attr_soft(xaction, "application"); - char *data = (char *) switch_xml_attr_soft(xaction, "data"); + char *data = NULL; char *substituted = NULL; uint32_t len = 0; char *app_data = NULL; + if (xaction->txt) { + data = xaction->txt; + } else { + data = (char *) switch_xml_attr_soft(xaction, "data"); + } + if (field && strchr(expression, '(')) { len = (uint32_t) (strlen(data) + strlen(field_data) + 10); if (!(substituted = malloc(len))) {

1 0

[Freeswitch-svn] [commit] r7357 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 25 Jan '08

25 Jan '08

Author: brian Date: Fri Jan 25 14:40:26 2008 New Revision: 7357 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: seems this is required for some phones Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Jan 25 14:40:26 2008 @@ -122,7 +122,7 @@ <condition field="${sip_to_params}" expression="intercom\=true"/> <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_ext=$1"/> - <action application="export" data="sip_h_Call-Info=answer-after=0"/> + <action application="export" data="sip_h_Call-Info=<sip:$${domain}>;answer-after=0"/> <action application="export" data="sip_auto_answer=true"/> <action application="bridge" data="user/${dialed_ext}@$${domain}"/> </condition> @@ -272,6 +272,12 @@ <X-PRE-PROCESS cmd="include" data="extensions/*.xml"/> + <extension name="overlap_dial"> + <condition field="destination_number" expression="^(.*)$"> + <action application="respond" data="484 asterisk sucks"/> + </condition> + </extension> + <extension name="enum"> <condition field="destination_number" expression="^(.*)$"> <action application="transfer" data="$1 enum"/>

1 0