December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7027 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/endpoints/mod_portaudio mod/endpoints/mod_sofia mod/languages/mod_spidermonkey
by Freeswitch SVN 30 Dec '07

30 Dec '07

Author: mikej Date: Sat Dec 29 19:22:51 2007 New Revision: 7027 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_config.c freeswitch/trunk/src/switch_ivr_play_say.c freeswitch/trunk/src/switch_loadable_module.c freeswitch/trunk/src/switch_xml.cpp Log: don't strstr on null/blank strings. Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sat Dec 29 19:22:51 2007 @@ -50,9 +50,9 @@ codec->implementation->samples_per_second, \ codec->implementation->microseconds_per_frame / 1000) #ifdef WIN32 -#define switch_is_file_path(file) (*file == '\\' || *(file +1) == ':' || *file == '/' || strstr(file, SWITCH_URL_SEPARATOR)) +#define switch_is_file_path(file) (file && (*file == '\\' || *(file +1) == ':' || *file == '/' || strstr(file, SWITCH_URL_SEPARATOR))) #else -#define switch_is_file_path(file) ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR)) +#define switch_is_file_path(file) (file && ((*file == '/') || strstr(file, SWITCH_URL_SEPARATOR))) #endif SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size_t ilen, unsigned char *out, switch_size_t olen); Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Dec 29 19:22:51 2007 @@ -3498,9 +3498,9 @@ const char *modified_cmdline = cmdline; const char *cmd = conf_api_sub_commands[i].pname; - if ((start_text = strstr(modified_cmdline, cmd))) { + if (!switch_strlen_zero(modified_cmdline) && (start_text = strstr(modified_cmdline, cmd))) { modified_cmdline = start_text + strlen(cmd); - while (modified_cmdline && *modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) { + while (modified_cmdline && (*modified_cmdline == ' ' || *modified_cmdline == '\t')) { modified_cmdline++; } } Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Sat Dec 29 19:22:51 2007 @@ -1016,7 +1016,7 @@ if (switch_strlen_zero(name)) { match = 1; - } else if (strstr(pdi->name, name)) { + } else if (pdi && pdi->name && strstr(pdi->name, name)) { match = 1; } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 29 19:22:51 2007 @@ -1275,7 +1275,7 @@ const char *subject = "n/a"; char *msg = NULL; - if (sip->sip_content_type) { + if (sip->sip_content_type && !switch_strlen_zero(sip->sip_content_type->c_subtype)) { if (strstr(sip->sip_content_type->c_subtype, "composing")) { return; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Dec 29 19:22:51 2007 @@ -1027,7 +1027,7 @@ if ((mods = switch_xml_child(cfg, "modules"))) { for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) { const char *val = switch_xml_attr_soft(ld, "module"); - if (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) { + if (!switch_strlen_zero(val) && strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); continue; } Modified: freeswitch/trunk/src/switch_config.c ============================================================================== --- freeswitch/trunk/src/switch_config.c (original) +++ freeswitch/trunk/src/switch_config.c Sat Dec 29 19:22:51 2007 @@ -68,7 +68,7 @@ cfg->path = path; while (switch_config_next_pair(cfg, &var, &val)) { - if ((cfg->sectno != last) && !strcmp(cfg->section, file_path)) { + if (file_path && (cfg->sectno != last) && !strcmp(cfg->section, file_path)) { cfg->lockto = cfg->sectno; return 1; } Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sat Dec 29 19:22:51 2007 @@ -695,7 +695,7 @@ timer_name = switch_channel_get_variable(channel, "timer_name"); - if (!file) { + if (switch_strlen_zero(file)) { status = SWITCH_STATUS_FALSE; goto end; } Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Sat Dec 29 19:22:51 2007 @@ -983,7 +983,7 @@ if ((mods = switch_xml_child(cfg, "modules"))) { for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) { const char *val = switch_xml_attr_soft(ld, "module"); - if (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) { + if (switch_strlen_zero(val) || (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); continue; } @@ -1003,7 +1003,7 @@ if ((mods = switch_xml_child(cfg, "modules"))) { for (ld = switch_xml_child(mods, "load"); ld; ld = ld->next) { const char *val = switch_xml_attr_soft(ld, "module"); - if (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT)) { + if (switch_strlen_zero(val) || (strchr(val, '.') && !strstr(val, ext) && !strstr(val, EXT))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Invalid extension for %s\n", val); continue; } @@ -1043,7 +1043,7 @@ continue; } - if (!strstr(fname, ext) && !strstr(fname, EXT)) { + if (switch_strlen_zero(fname) || (!strstr(fname, ext) && !strstr(fname, EXT))) { continue; } Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Sat Dec 29 19:22:51 2007 @@ -1402,7 +1402,7 @@ if (user_name) { - if (strstr(xtra_params, "mailbox")) { + if (!switch_strlen_zero(xtra_params) && strstr(xtra_params, "mailbox")) { if ((*user = switch_xml_find_child(*domain, "user", "mailbox", user_name))) { return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7026 - in freeswitch/trunk: . src src/include src/mod/applications/mod_dptools
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: mikej Date: Sat Dec 29 18:15:57 2007 New Revision: 7026 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_ivr_play_say.c Log: avoid seg on invalid params to record app.(MODAPP-63) Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sat Dec 29 18:15:57 2007 @@ -115,6 +115,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dialplan", "dialplan", "{C7E2382E-2C22-4D18-BF93-80C6A1FFA7AC}" ProjectSection(SolutionItems) = preProject conf\dialplan\default.xml = conf\dialplan\default.xml + conf\dialplan\public.xml = conf\dialplan\public.xml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "directory", "directory", "{FC71C66E-E268-4EAD-B1F5-F008DC382E83}" Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat Dec 29 18:15:57 2007 @@ -1126,7 +1126,7 @@ \note the loadable module used is chosen based on the file extension */ SWITCH_DECLARE(switch_status_t) switch_core_file_open(switch_file_handle_t *fh, - const char *file_path, uint8_t channels, uint32_t rate, unsigned int flags, switch_memory_pool_t *pool); + _In_z_ const char *file_path, uint8_t channels, uint32_t rate, unsigned int flags, switch_memory_pool_t *pool); /*! \brief Read media from a file handle \param fh the file handle to read from (must be initilized by you memset all 0 for read, fill in channels and rate for write) Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Sat Dec 29 18:15:57 2007 @@ -298,8 +298,11 @@ \param limit max limit to record for (0 for infinite) \return SWITCH_STATUS_SUCCESS if all is well */ -SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *session, - switch_file_handle_t *fh, char *file, switch_input_args_t *args, uint32_t limit); +SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(_In_ switch_core_session_t *session, + _In_ switch_file_handle_t *fh, + _In_z_ const char *file, + _In_opt_ switch_input_args_t *args, + _In_ uint32_t limit); /*! Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sat Dec 29 18:15:57 2007 @@ -1253,7 +1253,7 @@ int rate; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (data && (mydata = switch_core_session_strdup(session, data))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Sat Dec 29 18:15:57 2007 @@ -42,6 +42,11 @@ char stream_name[128] = ""; char *rhs = NULL; + if (switch_strlen_zero(file_path)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Filename\n"); + return SWITCH_STATUS_FALSE; + } + if ((rhs = strstr(file_path, SWITCH_URL_SEPARATOR))) { switch_copy_string(stream_name, file_path, (rhs + 1) - file_path); ext = stream_name; Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sat Dec 29 18:15:57 2007 @@ -335,7 +335,7 @@ } SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *session, - switch_file_handle_t *fh, char *file, switch_input_args_t *args, uint32_t limit) + switch_file_handle_t *fh, const char *file, switch_input_args_t *args, uint32_t limit) { switch_channel_t *channel; switch_dtmf_t dtmf = {0};

1 0

[commit] r7025 - freeswitch/trunk/scripts/contrib/intralanman
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 16:39:06 2007 New Revision: 7025 Added: freeswitch/trunk/scripts/contrib/intralanman/ Log: add contrib dir for intralanman

1 0

[commit] r7024 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 14:54:23 2007 New Revision: 7024 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add direction to the rest of the events Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Dec 29 14:54:23 2007 @@ -682,6 +682,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } @@ -974,6 +975,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_HANGUP"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "terminated"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } @@ -4910,6 +4912,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conf_name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { @@ -4924,6 +4927,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conf_name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_HANGUP"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "terminated"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); }

1 0

[commit] r7023 - in freeswitch/trunk/src/mod/applications: mod_conference mod_fifo
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 14:41:41 2007 New Revision: 7023 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: ensure directions are correct for dialog-info Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Dec 29 14:41:41 2007 @@ -548,6 +548,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sat Dec 29 14:41:41 2007 @@ -140,7 +140,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "outbound"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } }

1 0

[commit] r7022 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 14:41:17 2007 New Revision: 7022 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: update for conference and parking presence for dialog-info Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 29 14:41:17 2007 @@ -740,12 +740,27 @@ stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n", !strcasecmp(event_status, "hold") ? "no" : "yes" ); stream.write_function(&stream, "</target>\n</local>\n"); stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_from_user, clean_from_user, host); - stream.write_function(&stream, "<target uri=\"sip:**%s%s@%s\"/>\n", !strcasecmp(proto, "park") ? "park+" : "", clean_to_user, host); + stream.write_function(&stream, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host); + stream.write_function(&stream, "</remote>\n"); + } else if (!strcasecmp(proto, "park")) { + stream.write_function(&stream, "<local>\n<identity display=\"parking\">sip:parking@%s;fifo=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:parking@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"parking\">sip:%s</identity>\n", uuid); + stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid); + stream.write_function(&stream, "</remote>\n"); + } else if (!strcasecmp(proto, "conf")) { + stream.write_function(&stream, "<local>\n<identity display=\"conference\">sip:conference@%s;conference=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:conference@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"yes\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"conference\">sip:%s@%s</identity>\n", uuid, host); + stream.write_function(&stream, "<target uri=\"sip:conf+%s@%s\"/>\n", uuid, host); stream.write_function(&stream, "</remote>\n"); - } - } + stream.write_function(&stream, "</dialog>\n"); }

1 0

[commit] r7021 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 13:30:48 2007 New Revision: 7021 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: use const here as per tip from Sir MikeJ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 29 13:30:48 2007 @@ -667,7 +667,7 @@ const char *state = switch_str_nil(switch_event_get_header(helper->event, "channel-state")); const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status")); const char *astate = switch_str_nil(switch_event_get_header(helper->event, "astate")); - char *answer_state = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); + const char *answer_state = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); const char *dft_state; SWITCH_STANDARD_STREAM(stream); @@ -753,6 +753,7 @@ stream.write_function(&stream, "</dialog-info>\n"); pl = stream.data; + ct = "application/dialog-info+xml"; if (astate && uuid && helper->stream.data) { stream.write_function(&helper->stream, "update sip_dialogs set state='%s' where uuid='%s';\n", astate, uuid);

1 0

[commit] r7020 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 12:57:07 2007 New Revision: 7020 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: more cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 29 12:57:07 2007 @@ -731,7 +731,6 @@ const char *clean_to_user; const char *clean_from_user; - printf("from:%s -> to:%s\n", from_id ? from_id : from_user, sub_to_user ? sub_to_user : to_user ); clean_to_user = switch_mprintf("%s", sub_to_user ? sub_to_user : to_user, host); clean_from_user = switch_mprintf("%s", from_id ? from_id : from_user, host);

1 0

[commit] r7019 - freeswitch/trunk/src/include
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: mikej Date: Sat Dec 29 12:56:42 2007 New Revision: 7019 Modified: freeswitch/trunk/src/include/switch_platform.h Log: for msvc 2005 team edition. Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Sat Dec 29 12:56:42 2007 @@ -69,7 +69,7 @@ #pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) -#if (_MSC_VER >= 1500) // VC9+ +#if (_MSC_VER >= 1400) // VC8+ #define switch_assert(expr) assert(expr);__analysis_assume( expr ) #endif

1 0

[commit] r7018 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 12:52:22 2007 New Revision: 7018 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: more cleanup Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 29 12:52:22 2007 @@ -749,11 +749,9 @@ } stream.write_function(&stream, "</dialog>\n"); - } else { - printf("resubscribe\n"); } - - stream.write_function(&stream, "</dialog-info>\n"); + + stream.write_function(&stream, "</dialog-info>\n"); pl = stream.data; ct = "application/dialog-info+xml";

1 0