- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6812 - in freeswitch/trunk: conf/lang/en/vm src
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 13:48:06 2007 New Revision: 6812 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml freeswitch/trunk/src/switch_channel.c Log: commit a missing file from tonys commit and my update to sounds.xml Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Sat Dec 15 13:48:06 2007 @@ -201,7 +201,7 @@ </macro> <macro name="voicemail_greeting_selected"> - <input pattern="^(.*)$"> + <input pattern="^(\d+)$"> <match> <action function="play-file" data="voicemail/vm-greeting.wav"/> <action function="say" data="$1" method="pronounced" type="items"/> @@ -220,7 +220,7 @@ </macro> <macro name="voicemail_say_number"> - <input pattern="^(.*)$"> + <input pattern="^(\d+)$"> <match> <action function="say" data="$1" method="pronounced" type="items"/> </match> @@ -228,7 +228,7 @@ </macro> <macro name="voicemail_say_message_number"> - <input pattern="^([a-z]+):(.*)$"> + <input pattern="^([a-z]+):(\d+)$"> <match> <action function="play-file" data="voicemail/vm-$1.wav"/> <action function="play-file" data="voicemail/vm-message_number.wav"/> Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Dec 15 13:48:06 2007 @@ -610,7 +610,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Call-Direction", "%s", switch_channel_test_flag(channel, CF_OUTBOUND) ? "outbound" : "inbound"); if (switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "answered"); } else if (switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "early"); } else {

1 0

[commit] r6811 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 13:44:41 2007 New Revision: 6811 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: doc this string Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 15 13:44:41 2007 @@ -15,6 +15,7 @@ </domains> <settings> +  <param name="debug" value="0"/> <param name="sip-trace" value="no"/> <param name="context" value="public"/>

1 0

[commit] r6810 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 13:44:27 2007 New Revision: 6810 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: clean up dialplan Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 15 13:44:27 2007 @@ -141,20 +141,20 @@ </extension>  - <extension name="FS_Conf_SIP"> + <extension name="freeswitch_public_conf_via_sip"> <condition field="destination_number" expression="^888$"> <action application="bridge" data="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </condition> </extension> <extension name="static-park"> - <condition field="destination_number" expression="^8192$"> - <action application="fifo" data="default in undef /ram/swimp.raw"/> + <condition field="destination_number" expression="^8792$"> + <action application="fifo" data="default in undef local_stream://moh"/> </condition> </extension> <extension name="unpark"> - <condition field="destination_number" expression="^8193$"> + <condition field="destination_number" expression="^8793$"> <action application="answer"/> <action application="fifo" data="default out nowait"/> </condition>

1 0

[commit] r6809 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 13:33:59 2007 New Revision: 6809 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: name_spelled instead of items, thanks L2SHO Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Sat Dec 15 13:33:59 2007 @@ -3,7 +3,7 @@ <input pattern="(.*)"> <match> <action function="play-file" data="voicemail/vm-enter_id.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> </match> </input> </macro> @@ -12,7 +12,7 @@ <input pattern="(.*)"> <match> <action function="play-file" data="voicemail/vm-enter_pass.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> </match> </input> </macro>

1 0

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

15 Dec '07

Author: anthm Date: Sat Dec 15 13:26:10 2007 New Revision: 6808 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix 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 Sat Dec 15 13:26:10 2007 @@ -2107,6 +2107,15 @@ su_free(profile->home, tmp); } +#if 0 + if (sofia_test_pflag(profile, PFLAG_PRESENCE)) { + char *tmp = switch_mprintf("%s@%s", switch_str_nil(switch_channel_get_variable(channel, "sip_to_user")), switch_str_nil(switch_channel_get_variable(channel, "sip_to_host"))); + switch_assert(tmp); + switch_channel_set_variable(channel, "presence_id", tmp); + free(tmp); + } +#endif + check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, 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 15 13:26:10 2007 @@ -413,14 +413,14 @@ case SWITCH_EVENT_PRESENCE_IN: sql = switch_mprintf - ("select *,1,'%q','%q' from sip_subscriptions where proto='%q' and (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", - status, rpid, proto, event_type, alt_event_type, euser, host); + ("select *,1,'%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", + status, rpid, event_type, alt_event_type, euser, host); break; case SWITCH_EVENT_PRESENCE_OUT: sql = switch_mprintf - ("select *,0,'%q','%q' from sip_subscriptions where proto='%q' and (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", - status, rpid, proto, event_type, alt_event_type, euser, host); + ("select *,0,'%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", + status, rpid, event_type, alt_event_type, euser, host); break; default: break; @@ -436,6 +436,7 @@ if (sql) { struct presence_helper helper; + helper.profile = profile; helper.event = event; sofia_glue_execute_sql_callback(profile, @@ -507,6 +508,12 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", status); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", SOFIA_CHAT_PROTO); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_HANGUP"); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "void"); + switch_event_fire(&event); } @@ -550,7 +557,7 @@ struct presence_helper *helper = (struct presence_helper *) pArg; sofia_profile_t *profile = helper->profile; char *pl; - char *id, *note; + char *clean_id = NULL, *id = NULL, *note; uint32_t in = atoi(argv[13]); char *status = argv[14]; char *rpid = argv[15]; @@ -567,6 +574,8 @@ char *open; char *prpid; int done = 0; + const char *ct; + if (!(nh = (nua_handle_t *) switch_core_hash_find(profile->sub_hash, call_id))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); @@ -592,6 +601,8 @@ open = "closed"; } + clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + if (!strcasecmp(sub_to_host, host)) { /* same host */ id = switch_mprintf("sip:%s+%s@%s", proto, sub_to_user, sub_to_host); @@ -610,15 +621,23 @@ const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id")); const char *state = switch_str_nil(switch_event_get_header(helper->event, "channel-state")); const char *status = switch_str_nil(switch_event_get_header(helper->event, "status")); - - SWITCH_STANDARD_STREAM(stream); + const char *astate = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); + SWITCH_STANDARD_STREAM(stream); + + if (!strcasecmp(state, "cs_hangup")) { + astate = "terminated"; + } else if (!strcasecmp(astate, "answered")) { + astate = "confirmed"; + } else if (!strcasecmp(astate, "ringing")) { + astate = "early"; + } stream.write_function(&stream, "<?xml version=\"1.0\"?>\n" "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" " "version=\"%s\" state=\"full\" entity=\"%s\">\n", - switch_str_nil(switch_event_get_header(helper->event, "event_count")), to); + switch_str_nil(switch_event_get_header(helper->event, "event_count")), clean_id); if (!strcasecmp(state, "RING")) { stream.write_function(&stream, "<dialog id=\"%s\" direction=\"recipient\">\n", uuid); @@ -626,14 +645,18 @@ stream.write_function(&stream, "<dialog id=\"%s\">\n", uuid); } - stream.write_function(&stream, "<state>%s</state>\n", switch_str_nil(switch_event_get_header(helper->event, "answer-state"))); + + stream.write_function(&stream, "<state>%s</state>\n", astate); + if (!strcasecmp(status, "hold")) { stream.write_function(&stream, "<local>\n<target uri=\"%s\">\n" - "<param pname=\"+sip.rendering\" pvalue=\"no\">\n" - "</target>\n</local>\n", to); + "<param pname=\"+sip.rendering\" pvalue=\"no\">\n" + "</target>\n</local>\n", clean_id); } stream.write_function(&stream, "</dialog>\n</dialog-info>\n"); pl = stream.data; + ct = "application/dialog-info+xml"; + printf("%s\n", pl); } else { pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n" @@ -661,18 +684,20 @@ "</presence>", id, id, profile->url, open, status, prpid, open, rpid, note); + ct = "application/pidf+xml"; } nua_notify(nh, NUTAG_NEWSUB(1), SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=3600"), - SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/pidf+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); + SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(pl), TAG_END()); if (done) { switch_core_hash_delete(profile->sub_hash, call_id); } switch_safe_free(id); + switch_safe_free(clean_id); switch_safe_free(note); switch_safe_free(pl); switch_safe_free(to);

1 0

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

15 Dec '07

Author: anthm Date: Sat Dec 15 11:58:30 2007 New Revision: 6807 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Dec 15 11:58:30 2007 @@ -470,10 +470,6 @@ } } } else { - char *p; - if ((p = strrchr(stripped, ';'))) { - *p = '\0'; - } new_uri = stripped; }

1 0

[commit] r6806 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: anthm Date: Sat Dec 15 10:32:41 2007 New Revision: 6806 Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Log: update Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Sat Dec 15 10:32:41 2007 @@ -211,7 +211,7 @@ int16_t sample_buffer[], int samples) { - int sample, limit, j, x = 0; + int sample, limit = 0, j, x = 0; float v1, famp; float eng_sum = 0, eng_all[TELETONE_MAX_TONES]; int gtest = 0, see_hit = 0; @@ -224,6 +224,9 @@ } else { limit = samples; } + if (limit < 0 || limit > samples) { + limit = samples; + } for (j = sample; j < limit; j++) { famp = sample_buffer[j];

1 0

[commit] r6805 - freeswitch/trunk/src/mod/applications/mod_rss
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 00:50:21 2007 New Revision: 6805 Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: cleanups, remove some unnecessary var declarations and varname masking, whitespace cleanup. Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Sat Dec 15 00:50:21 2007 @@ -176,12 +176,11 @@ uint32_t last; char *mydata = NULL; char *filename = NULL; - char *argv[3], *feed_list[TTS_MAX_ENTRIES] = { 0 }, *feed_names[TTS_MAX_ENTRIES] = { - 0}; + char *argv[3], *feed_list[TTS_MAX_ENTRIES] = { 0 }, *feed_names[TTS_MAX_ENTRIES] = {0}; int argc, feed_index = 0; const char *cf = "rss.conf"; switch_xml_t cfg, cxml, feeds, feed; - char buf[1024]; + char buf[1024] = ""; int32_t jumpto = -1; uint32_t matches = 0; switch_input_args_t args = { 0 }; @@ -237,8 +236,6 @@ switch_channel_answer(channel); - - if (!switch_strlen_zero(data)) { if ((mydata = switch_core_session_strdup(session, data))) { argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0])); @@ -305,7 +302,6 @@ timerp = &timer; } - while (switch_channel_ready(channel)) { int32_t len = 0, idx = 0; char cmd[3]; @@ -321,11 +317,11 @@ } else { switch_core_speech_flush_tts(&sh); #ifdef MATCH_COUNT - switch_snprintf(buf + len, sizeof(buf) - len, + switch_snprintf(buf + len, sizeof(buf) - len, "%s", ",<break time=\"500ms\"/>Main Menu. <break time=\"600ms\"/> " "Select one of the following news sources, or press 0 to exit. " ",<break time=\"600ms\"/>"); #else - switch_snprintf(buf + len, sizeof(buf) - len, + switch_snprintf(buf + len, sizeof(buf) - len, "%s", ",<break time=\"500ms\"/>Main Menu. <break time=\"600ms\"/> " "Select one of the following news sources, followed by the pound key or press 0 to exit. " ",<break time=\"600ms\"/>"); #endif @@ -336,8 +332,7 @@ len = (int32_t) strlen(buf); } - - switch_snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>"); + switch_snprintf(buf + len, sizeof(buf) - len, "%s", "<break time=\"2000ms\"/>"); len = (int32_t) strlen(buf); args.input_callback = NULL; @@ -349,7 +344,7 @@ } } if (*cmd != '\0') { - int32_t i; + int32_t x; char *p; if (strchr(cmd, '0')) { @@ -375,9 +370,9 @@ switch_ivr_collect_digits_count(session, cp, blen, blen, "#", &term, 5000); } - i = atoi(cmd) - 1; + x = atoi(cmd) - 1; - if (i > -1 && i < feed_index) { + if (x > -1 && x < feed_index) { filename = feed_list[i]; } else if (matches > 1) { @@ -396,8 +391,6 @@ continue; } - - if (!(xml = switch_xml_parse_file(filename))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", filename); goto finished; @@ -445,7 +438,6 @@ entries[i].subject_txt = NULL; entries[i].dept_txt = NULL; - if ((title = switch_xml_child(item, "title"))) { entries[i].title_txt = title->txt; } @@ -483,7 +475,6 @@ } } #endif - i++; } @@ -491,7 +482,7 @@ switch_time_exp_t tm; char date[80] = ""; switch_size_t retsize; - char cmd[5] = ""; + char dtmf[5] = ""; switch_time_exp_lt(&tm, switch_time_now()); switch_strftime(date, &retsize, sizeof(date), "%I:%M %p", &tm); @@ -501,14 +492,14 @@ ",<break time=\"500ms\"/>%s. %s. %s. local time: %s, Press 0 for options, 5 to change voice, or pound to return to the main menu. ", title_txt, description_txt, rights_txt, date); args.input_callback = NULL; - args.buf = cmd; - args.buflen = sizeof(cmd); + args.buf = dtmf; + args.buflen = sizeof(dtmf); status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, buf, &args); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { goto finished; } - if (*cmd != '\0') { - switch (*cmd) { + if (*dtmf != '\0') { + switch (*dtmf) { case '0': switch_set_flag(&dtb, SFLAG_INSTRUCT); break; @@ -546,8 +537,8 @@ continue; } if (switch_channel_ready(channel)) { - char buf[1024] = ""; - uint32_t len = 0; + char tmpbuf[1024] = ""; + uint32_t tmplen = 0; if (switch_test_flag(&dtb, SFLAG_MAIN)) { switch_clear_flag(&dtb, SFLAG_MAIN); @@ -555,14 +546,14 @@ } if (switch_test_flag(&dtb, SFLAG_INFO)) { switch_clear_flag(&dtb, SFLAG_INFO); - switch_snprintf(buf + len, sizeof(buf) - len, "%s %s. I am speaking at %u words per minute. ", sh.engine, sh.voice, dtb.speed); - len = (uint32_t) strlen(buf); + switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s %s. I am speaking at %u words per minute. ", sh.engine, sh.voice, dtb.speed); + tmplen = (uint32_t) strlen(tmpbuf); } if (switch_test_flag(&dtb, SFLAG_INSTRUCT)) { switch_clear_flag(&dtb, SFLAG_INSTRUCT); cont = 1; - switch_snprintf(buf + len, sizeof(buf) - len, + switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s", "Press star to pause or resume speech. " "To go to the next item, press six. " "To go back, press 4. " @@ -570,29 +561,29 @@ "To change voices, press five. To restore the original voice press 9. " "To hear these options again, press zero or press pound to return to the main menu. "); } else { - switch_snprintf(buf + len, sizeof(buf) - len, "Story %d. ", dtb.index + 1); - len = (uint32_t) strlen(buf); + switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "Story %d. ", dtb.index + 1); + tmplen = (uint32_t) strlen(tmpbuf); if (entries[dtb.index].subject_txt) { - switch_snprintf(buf + len, sizeof(buf) - len, "Subject: %s. ", entries[dtb.index].subject_txt); - len = (uint32_t) strlen(buf); + switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "Subject: %s. ", entries[dtb.index].subject_txt); + tmplen = (uint32_t) strlen(tmpbuf); } if (entries[dtb.index].dept_txt) { - switch_snprintf(buf + len, sizeof(buf) - len, "From the %s department. ", entries[dtb.index].dept_txt); - len = (uint32_t) strlen(buf); + switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "From the %s department. ", entries[dtb.index].dept_txt); + tmplen = (uint32_t) strlen(tmpbuf); } if (entries[dtb.index].title_txt) { - switch_snprintf(buf + len, sizeof(buf) - len, "%s", entries[dtb.index].title_txt); - len = (uint32_t) strlen(buf); + switch_snprintf(tmpbuf + tmplen, sizeof(tmpbuf) - tmplen, "%s", entries[dtb.index].title_txt); + tmplen = (uint32_t) strlen(tmpbuf); } } switch_core_speech_flush_tts(&sh); args.input_callback = on_dtmf; args.buf = &dtb; args.buflen = sizeof(dtb); - status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, buf, &args); + status = switch_ivr_speak_text_handle(session, &sh, &speech_codec, timerp, tmpbuf, &args); if (status == SWITCH_STATUS_BREAK) { continue; } else if (status != SWITCH_STATUS_SUCCESS) { @@ -632,9 +623,7 @@ switch_core_timer_destroy(&timer); } - switch_xml_free(xml); - switch_core_session_reset(session); }

1 0

[commit] r6804 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Fri Dec 14 23:58:44 2007 New Revision: 6804 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: cleanups, simplify odbc ifdefs, remove some unnecessary var declarations, handle return values of unlink, whitespace cleanup. Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Dec 14 23:58:44 2007 @@ -98,11 +98,7 @@ uint32_t record_threshold; uint32_t record_silence_hits; uint32_t record_sample_rate; -#ifdef SWITCH_HAVE_ODBC switch_odbc_handle_t *master_odbc; -#else - void *filler1; -#endif }; typedef struct vm_profile vm_profile_t; @@ -115,8 +111,8 @@ switch_mutex_lock(mutex); } -#ifdef SWITCH_HAVE_ODBC if (profile->odbc_dsn) { +#ifdef SWITCH_HAVE_ODBC SQLHSTMT stmt; if (switch_odbc_handle_exec(profile->master_odbc, sql, &stmt) != SWITCH_ODBC_SUCCESS) { char *err_str; @@ -126,27 +122,21 @@ status = SWITCH_STATUS_FALSE; } SQLFreeHandle(SQL_HANDLE_STMT, stmt); - } else { #endif + } else { if (!(db = switch_core_db_open_file(profile->dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); status = SWITCH_STATUS_FALSE; goto end; } - status = switch_core_db_persistant_execute(db, sql, 25); switch_core_db_close(db); - -#ifdef SWITCH_HAVE_ODBC } -#endif - end: if (mutex) { switch_mutex_unlock(mutex); } - return status; } @@ -165,21 +155,16 @@ switch_mutex_lock(mutex); } - -#ifdef SWITCH_HAVE_ODBC if (profile->odbc_dsn) { +#ifdef SWITCH_HAVE_ODBC switch_odbc_handle_callback_exec(profile->master_odbc, sql, callback, pdata); - } else { #endif - - - + } else { if (!(db = switch_core_db_open_file(profile->dbname))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); goto end; } - switch_core_db_exec(db, sql, callback, pdata, &errmsg); if (errmsg) { @@ -190,22 +175,13 @@ if (db) { switch_core_db_close(db); } - -#ifdef SWITCH_HAVE_ODBC } -#endif - end: - if (mutex) { switch_mutex_unlock(mutex); } - - - return ret; - } @@ -225,7 +201,6 @@ " read_flags VARCHAR(255)\n" ");\n"; - static char vm_pref_sql[] = "CREATE TABLE voicemail_prefs (\n" " user VARCHAR(255),\n" @@ -234,9 +209,6 @@ " greeting_path VARCHAR(255)\n" ");\n"; - - - static switch_status_t load_config(void) { char *cf = "voicemail.conf"; @@ -323,8 +295,7 @@ email_headers = switch_core_strdup(globals.pool, param->txt); } - - for (param = switch_xml_child(x_email, "param"); param; param = param->next) { + for (param = switch_xml_child(x_email, "param"); param; param = param->next) { char *var, *val; var = (char *) switch_xml_attr_soft(param, "name"); @@ -371,8 +342,7 @@ } } - - for (param = switch_xml_child(x_profile, "param"); param; param = param->next) { + for (param = switch_xml_child(x_profile, "param"); param; param = param->next) { char *var, *val; var = (char *) switch_xml_attr_soft(param, "name"); @@ -551,8 +521,8 @@ } else { profile->dbname = switch_core_sprintf(globals.pool, "voicemail_%s", name); } -#ifdef SWITCH_HAVE_ODBC if (profile->odbc_dsn) { +#ifdef SWITCH_HAVE_ODBC if (!(profile->master_odbc = switch_odbc_handle_new(profile->odbc_dsn, profile->odbc_user, profile->odbc_pass))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open ODBC Database!\n"); continue; @@ -573,8 +543,8 @@ switch_odbc_handle_exec(profile->master_odbc, "drop table voicemail_data", NULL); switch_odbc_handle_exec(profile->master_odbc, vm_pref_sql, NULL); } - } else { #endif + } else { if ((db = switch_core_db_open_file(profile->dbname))) { switch_core_db_test_reactive(db, "select count(message_len) from voicemail_data", "drop table voicemail_data", vm_sql); switch_core_db_test_reactive(db, "select count(user) from voicemail_prefs", "drop table voicemail_data", vm_pref_sql); @@ -583,9 +553,7 @@ continue; } switch_core_db_close(db); -#ifdef SWITCH_HAVE_ODBC } -#endif profile->web_head = web_head; profile->web_tail = web_tail; @@ -633,23 +601,17 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Added Profile %s\n", profile->name); switch_core_hash_insert(globals.profile_hash, profile->name, profile); - } - } end: - switch_xml_free(xml); - return SWITCH_STATUS_SUCCESS; } static switch_status_t cancel_on_dtmf(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - - switch (itype) { case SWITCH_INPUT_TYPE_DTMF: { @@ -678,8 +640,6 @@ static switch_status_t control_playback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen) { - - switch (itype) { case SWITCH_INPUT_TYPE_DTMF: { @@ -707,9 +667,9 @@ } if (*dtmf == *cc->profile->restart_key) { - unsigned int pos = 0; + unsigned int seekpos = 0; fh->speed = 0; - switch_core_file_seek(fh, &pos, 0, SEEK_SET); + switch_core_file_seek(fh, &seekpos, 0, SEEK_SET); return SWITCH_STATUS_SUCCESS; } @@ -724,7 +684,6 @@ switch_core_file_seek(fh, &pos, fh->pos - samps, SEEK_SET); return SWITCH_STATUS_SUCCESS; } - } break; default: @@ -761,7 +720,6 @@ VM_CHECK_LISTEN } vm_check_state_t; - #define VM_ACK_MACRO "voicemail_ack" #define VM_SAY_DATE_MACRO "voicemail_say_date" #define VM_PLAY_GREETING_MACRO "voicemail_play_greeting" @@ -791,7 +749,6 @@ #define URGENT_FLAG_STRING "A_URGENT" #define NORMAL_FLAG_STRING "B_NORMAL" - static switch_status_t vm_macro_get(switch_core_session_t *session, char *macro, char *macro_arg, @@ -808,7 +765,7 @@ switch_size_t bslen; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (buf && buflen) { memset(buf, 0, buflen); @@ -863,7 +820,9 @@ static int unlink_callback(void *pArg, int argc, char **argv, char **columnNames) { if (argv[0]) { - unlink(argv[0]); + if (unlink(argv[0]) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", argv[0]); + } } return 0; } @@ -887,7 +846,7 @@ cc_t cc = { 0 }; switch_codec_t *read_codec; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); read_codec = switch_core_session_get_read_codec(session); @@ -898,7 +857,6 @@ profile->save_file_key, profile->record_file_key); - record_file: args.input_callback = cancel_on_dtmf; TRY_CODE(switch_ivr_phrase_macro(session, macro_name, NULL, NULL, NULL)); @@ -920,9 +878,8 @@ cc.fh = &fh; args.buf = &cc; switch_ivr_play_file(session, &fh, file_path, &args); - - - while(switch_channel_ready(channel)) { + + while(switch_channel_ready(channel)) { if (*cc.buf) { *input = *cc.buf; *(input+1) = '\0'; @@ -945,7 +902,6 @@ } end: - return status; } @@ -990,8 +946,7 @@ switch_copy_string(cbt->message_len, argv[9], 255); switch_copy_string(cbt->flags, argv[10], 255); switch_copy_string(cbt->read_flags, argv[11], 255); - - + return -1; } @@ -1005,9 +960,8 @@ cbt.buf = msg_count; cbt.len = sizeof(msg_count); - - switch_snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch=0", myid, domain_name, @@ -1032,8 +986,7 @@ vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_saved_messages = atoi(msg_count); - - switch_snprintf(sql, sizeof(sql), + switch_snprintf(sql, sizeof(sql), "select count(*) from voicemail_data where user='%s' and domain='%s' and in_folder='%s' and read_epoch!=0 and read_flags='%s'", myid, domain_name, @@ -1041,7 +994,6 @@ URGENT_FLAG_STRING); vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_saved_urgent_messages = atoi(msg_count); - } @@ -1055,23 +1007,20 @@ switch_file_handle_t fh = { 0 }; cc_t cc = { 0 }; channel = switch_core_session_get_channel(session); - assert(channel != NULL); - + switch_assert(channel != NULL); - if(switch_channel_ready(channel)) { + if(switch_channel_ready(channel)) { args.input_callback = cancel_on_dtmf; - - switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s:%s", + switch_snprintf(key_buf, sizeof(key_buf), "%s:%s:%s:%s:%s", profile->listen_file_key, profile->save_file_key, profile->delete_file_key, profile->email_key, profile->callback_key); - - switch_snprintf(input, sizeof(input), "%s:%d", cbt->type == MSG_NEW ? "new" : "saved", cbt->want+1); + switch_snprintf(input, sizeof(input), "%s:%d", cbt->type == MSG_NEW ? "new" : "saved", cbt->want+1); memset(&cc, 0, sizeof(cc)); cc.profile = profile; args.buf = &cc; @@ -1134,8 +1083,7 @@ priority = 1; } - - message_count(profile, cbt->user, cbt->domain, cbt->in_folder, &total_new_messages, &total_saved_messages, + message_count(profile, cbt->user, cbt->domain, cbt->in_folder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); switch_time_exp_lt(&tm, atoi(cbt->created_epoch) * 1000000); @@ -1258,10 +1206,9 @@ char *email_vm = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); - - if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { + if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error invalid profile %s\n", profile_name); return; } @@ -1274,7 +1221,6 @@ status = switch_ivr_phrase_macro(session, VM_HELLO_MACRO, NULL, NULL, NULL); while(switch_channel_ready(channel)) { - switch_ivr_sleep(session, 100); switch(vm_check_state) { @@ -1307,9 +1253,7 @@ message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); - - - if (total_new_urgent_messages > 0) { + if (total_new_urgent_messages > 0) { switch_snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; @@ -1352,8 +1296,7 @@ informed++; } - - vm_check_state = VM_CHECK_MENU; + vm_check_state = VM_CHECK_MENU; } break; case VM_CHECK_PLAY_MESSAGES: @@ -1405,8 +1348,7 @@ vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; - - message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, + message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { @@ -1496,9 +1438,8 @@ } else if (!strcmp(input, profile->record_greeting_key)) { int num; TRY_CODE(vm_macro_get(session, VM_CHOOSE_GREETING_MACRO, key_buf, input, sizeof(input), 1, "", &term, timeout)); - - - num = atoi(input); + + num = atoi(input); if (num < 1 || num > 3) { TRY_CODE(switch_ivr_phrase_macro(session, VM_CHOOSE_GREETING_FAIL_MACRO, NULL, NULL, NULL)); } else { @@ -1518,7 +1459,6 @@ switch_safe_free(file_path); switch_safe_free(sql); } - continue; } break; @@ -1554,8 +1494,7 @@ vm_check_state = VM_CHECK_PLAY_MESSAGES; } - - continue; + continue; } break; case VM_CHECK_AUTH: @@ -1587,8 +1526,7 @@ caller_profile = switch_channel_get_caller_profile(channel); xtra = switch_mprintf("mailbox=%s&destination_number=%s&caller_id_number=%s", myid,caller_profile->destination_number,caller_profile->caller_id_number); - - assert(xtra); + switch_assert(xtra); if (switch_xml_locate_user("id", myid, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, xtra) != SWITCH_STATUS_SUCCESS) { @@ -1658,16 +1596,14 @@ SWITCH_PATH_SEPARATOR, myid); } - - - if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + + if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path); return; } } - - vm_check_state = VM_CHECK_FOLDER_SUMMARY; + vm_check_state = VM_CHECK_FOLDER_SUMMARY; } else { goto failed; } @@ -1698,7 +1634,6 @@ if (x_domain_root) { switch_xml_free(x_domain_root); } - } @@ -1740,7 +1675,7 @@ } channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); caller_profile = switch_channel_get_caller_profile(channel); if(switch_strlen_zero(profile->storage_dir)) { @@ -1764,14 +1699,13 @@ goto end; } - - if (id) { + if (id) { int ok = 1; char *xtra = switch_mprintf("mailbox=%s", id); switch_xml_t x_domain, x_domain_root, x_user, x_params, x_param; const char *email_addr = NULL; - assert(xtra); + switch_assert(xtra); x_user = x_domain = x_domain_root = NULL; if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), &x_domain_root, &x_domain, &x_user, xtra) == SWITCH_STATUS_SUCCESS) { @@ -1802,9 +1736,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", id, domain_name); ok = 0; } - - switch_safe_free(xtra); + switch_safe_free(xtra); switch_xml_free(x_domain_root); if (!ok) { goto end; @@ -1870,8 +1803,7 @@ } } - - memset(&fh, 0, sizeof(fh)); + memset(&fh, 0, sizeof(fh)); args.input_callback = control_playback; memset(&cc, 0, sizeof(cc)); cc.profile = profile; @@ -1945,16 +1877,12 @@ end: - - if (send_mail && !switch_strlen_zero(email_vm)) { + if (send_mail && !switch_strlen_zero(email_vm)) { switch_event_t *event; char *from; char *body; char *headers; char *header_string; - switch_size_t retsize; - switch_time_exp_t tm; - char date[80] = ""; char tmp[50]=""; int total_new_messages = 0; int total_saved_messages = 0; @@ -1991,9 +1919,7 @@ switch_channel_set_variable(channel, "voicemail_priority", tmp); switch_channel_set_variable(channel, "voicemail_email", email_vm); - - - l_duration = (long)message_len * 1000000; + l_duration = (long)message_len * 1000000; switch_core_measure_time(l_duration, &duration); duration.day += duration.yr * 365; duration.hr += duration.day * 24; @@ -2002,10 +1928,8 @@ duration.min, duration.sec ); - - - switch_channel_set_variable(channel, "voicemail_message_len", duration_str); + switch_channel_set_variable(channel, "voicemail_message_len", duration_str); if (switch_strlen_zero(profile->email_from)) { from = switch_core_session_sprintf(session, "%s@%s", id, domain_name); @@ -2036,8 +1960,7 @@ header_string = switch_core_session_sprintf(session, "%s\nX-Voicemail-Length: %u", headers, message_len); - - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Message-Type", "voicemail"); switch_event_fire(&event); @@ -2059,7 +1982,9 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending message to %s\n", email_vm); switch_safe_free(body); if (email_delete) { - unlink(file_path); + if (unlink(file_path) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", file_path); + } } } @@ -2070,8 +1995,6 @@ } return status; - - } @@ -2091,7 +2014,7 @@ switch_channel_t *channel; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); if (switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", SWITCH_GLOBAL_dirs.storage_dir); @@ -2127,8 +2050,7 @@ id = argv[x++]; } - - if ((auth_var = switch_channel_get_variable(channel, "voicemail_authorized")) && switch_true(auth_var)) { + if ((auth_var = switch_channel_get_variable(channel, "voicemail_authorized")) && switch_true(auth_var)) { auth = 1; } @@ -2177,7 +2099,7 @@ } else { id = strdup(account); } - assert(id); + switch_assert(id); if ((domain = strchr(id, '@'))) { *domain++ = '\0'; @@ -2215,8 +2137,6 @@ switch_event_fire(&new_event); } } - - } #define VOICEMAIL_SYNTAX "rss [<host> <port> <uri> <user> <domain>]" @@ -2240,7 +2160,9 @@ static int del_callback(void *pArg, int argc, char **argv, char **columnNames) { if (argc > 8) { - unlink(argv[8]); + if (unlink(argv[8]) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", argv[8]); + } } return 0; } @@ -2281,12 +2203,9 @@ } holder->stream->raw_write_function(holder->stream, chunk, flen); - } - switch_file_close(fd); } - return 0; } @@ -2309,8 +2228,6 @@ vm_execute_sql_callback(profile, profile->mutex, sql, play_callback, &holder); switch_core_destroy_memory_pool(&holder.pool); switch_safe_free(sql); - - } @@ -2318,15 +2235,9 @@ { char *sql; struct holder holder; - //char *uri, *host, *port; char *ref = NULL; - //host = port = uri = NULL; - if (stream->event) { - //host = switch_event_get_header(stream->event, "http-host"); - //port = switch_event_get_header(stream->event, "http-port"); - //uri = switch_event_get_header(stream->event, "http-uri"); ref = switch_event_get_header(stream->event, "http-referer"); } @@ -2345,11 +2256,9 @@ stream->write_function(stream,"Content-type: text/html\n\n<h2>Message Deleted</h2>\n" "<META http-equiv=\"refresh\" content=\"1;URL=%s\">", ref); } - } - static int web_callback(void *pArg, int argc, char **argv, char **columnNames) { struct holder *holder = (struct holder *) pArg; @@ -2381,8 +2290,7 @@ l_duration = atol(argv[9]) * 1000000; } - - if ((fname = strrchr(argv[8], '/'))) { + if ((fname = strrchr(argv[8], '/'))) { fname++; } else { fname = argv[8]; @@ -2430,9 +2338,7 @@ switch_snprintf(title_b4, sizeof(title_b4), "%s <%s> %s", argv[5], argv[6], rss_date); switch_url_encode(title_b4, title_aft, sizeof(title_aft)-1); - - - holder->stream->write_function(holder->stream, + holder->stream->write_function(holder->stream, "<br><object width=550 height=15 \n" "type=\"application/x-shockwave-flash\" \n" "data=\"http://%s:%s/pub/slim.swf?song_url=%s&player_title=%s\">\n" @@ -2524,9 +2430,7 @@ x_link = switch_xml_add_child_d(holder->x_item, "fsvm:rmlink", 0); switch_xml_set_txt_d(x_link, del); - - - tmp = switch_mprintf("<![CDATA[Priority: %s<br>" + tmp = switch_mprintf("<![CDATA[Priority: %s<br>" "Last Heard: %s<br>Duration: %s<br>" "<a href=%s>Delete This Message</a><br>" "]]>", @@ -2536,17 +2440,13 @@ free(tmp); free(del); - - x_tmp = switch_xml_add_child_d(holder->x_item, "pubDate", 0); + x_tmp = switch_xml_add_child_d(holder->x_item, "pubDate", 0); switch_xml_set_txt_d(x_tmp, rss_date); x_tmp = switch_xml_add_child_d(holder->x_item, "itunes:duration", 0); switch_xml_set_txt_d(x_tmp, duration_str); - - - - x_tmp = switch_xml_add_child_d(holder->x_item, "guid", 0); + x_tmp = switch_xml_add_child_d(holder->x_item, "guid", 0); switch_xml_set_txt_d(x_tmp, get); x_link = switch_xml_add_child_d(holder->x_item, "link", 0); @@ -2556,9 +2456,7 @@ switch_xml_set_attr_d(x_tmp, "url", get); free(get); - - - if (switch_file_open(&fd, argv[8], SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, holder->pool) == SWITCH_STATUS_SUCCESS) { + if (switch_file_open(&fd, argv[8], SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, holder->pool) == SWITCH_STATUS_SUCCESS) { flen = switch_file_get_size(fd); tmp = switch_mprintf("%ld", (long) flen); switch_xml_set_attr_d(x_tmp, "length", tmp); @@ -2580,7 +2478,6 @@ static void do_rss(vm_profile_t *profile, char *user, char *domain, char *host, char *port, char *uri, switch_stream_handle_t *stream) { - struct holder holder; switch_xml_t x_tmp; char *sql, *xmlstr; @@ -2598,7 +2495,7 @@ holder.uri = uri; switch_core_new_memory_pool(&holder.pool); - assert(holder.xml); + switch_assert(holder.xml); switch_xml_set_attr_d(holder.xml, "xmlns:itunes", "http://www.itunes.com/dtds/podcast-1.0.dtd"); switch_xml_set_attr_d(holder.xml, "xmlns:fsvm", "http://www.freeswitch.org/dtd/fsvm.dtd"); @@ -2618,9 +2515,8 @@ x_tmp = switch_xml_add_child_d(holder.x_channel, "ttl", 0); switch_xml_set_txt_d(x_tmp, "15"); - - sql = switch_mprintf("select * from voicemail_data where user='%s' and domain='%s' order by read_flags", user, domain); + sql = switch_mprintf("select * from voicemail_data where user='%s' and domain='%s' order by read_flags", user, domain); vm_execute_sql_callback(profile, profile->mutex, sql, rss_callback, &holder); xmlstr = switch_xml_toxml(holder.xml, SWITCH_TRUE); @@ -2652,8 +2548,7 @@ holder.port = port; holder.uri = uri; - - if (profile->web_head) { + if (profile->web_head) { stream->raw_write_function(stream, (uint8_t *)profile->web_head, strlen(profile->web_head)); } @@ -2674,7 +2569,6 @@ if (profile->web_tail) { stream->raw_write_function(stream, (uint8_t *)profile->web_tail, strlen(profile->web_tail)); } - } SWITCH_STANDARD_API(voicemail_api_function) @@ -2703,7 +2597,7 @@ if (!switch_strlen_zero(cmd)) { mydata = strdup(cmd); - assert(mydata); + switch_assert(mydata); argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -2778,13 +2672,8 @@ stream->write_function(stream, "Error: %s\n", VOICEMAIL_SYNTAX); done: - switch_safe_free(mydata); - - return SWITCH_STATUS_SUCCESS; - - } @@ -2801,7 +2690,6 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); - if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");

1 0

[commit] r6803 - freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: stkn Date: Fri Dec 14 20:39:11 2007 New Revision: 6803 Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: Cleanup, sips: scheme is only needed for tls_bindurl, so remove everything we do not need anymore related to that Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Dec 14 20:39:11 2007 @@ -544,6 +544,5 @@ sofia_transport_t sofia_glue_url2transport(const url_t *url); const char *sofia_glue_transport2str(const sofia_transport_t tp); -const char *sofia_glue_transport2scheme(const sofia_transport_t tp); int sofia_glue_transport_has_tls(const sofia_transport_t tp); Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Fri Dec 14 20:39:11 2007 @@ -1080,10 +1080,10 @@ } if (profile->extsipip) { - profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); + profile->tls_url = switch_core_sprintf(profile->pool, "sip:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d;maddr=%s", profile->extsipip, profile->tls_sip_port, profile->sipip); } else { - profile->tls_url = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); + profile->tls_url = switch_core_sprintf(profile->pool, "sip:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); } @@ -2050,8 +2050,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Components: \"%s\" \"%s\" \"%d\"\n", host, user, port); - tech_pvt->to_uri = switch_core_session_sprintf(session, "%s:%s@%s:%d;transport=%s", - sofia_glue_transport2scheme(transport), host, user, port, sofia_glue_transport2str(transport)); + tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s@%s:%d;transport=%s", + user, host, port, sofia_glue_transport2str(transport)); if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { if (strchr(tech_pvt->to_uri, '>')) { Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Dec 14 20:39:11 2007 @@ -543,48 +543,6 @@ return SOFIA_TRANSPORT_UNKNOWN; } -#if 0 -sofia_transport_t sofia_glue_uri2transport(const char *uri) -{ - char *scheme = NULL, *transport = NULL; - int tls = 0; - - if ((scheme = strchr(uri, '<'))) { - scheme++; - } else { - scheme = (char *)uri; - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "scheme: %s\n", scheme); - - if (!strncasecmp(scheme, "sips", 4)) { - tls = 1; - } - - if (!(transport = strchr(uri, ';'))) { - return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; - } else { - transport = strchr(transport, '='); - if (transport) - transport++; - } - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transport: %s\n", transport); - - if (!strncasecmp(transport, "tls", 3)) { - return SOFIA_TRANSPORT_TCP_TLS; - } - else if (!strncasecmp(transport, "tcp", 3)) { - return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_TCP; - } - else if (!strncasecmp(transport, "sctp", 4)) { - return SOFIA_TRANSPORT_SCTP; - } - - return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; -} -#endif - const char *sofia_glue_transport2str(const sofia_transport_t tp) { switch(tp) { @@ -602,17 +560,6 @@ } } -const char *sofia_glue_transport2scheme(const sofia_transport_t tp) -{ - switch (tp) { - case SOFIA_TRANSPORT_TCP_TLS: - return "sips"; - - default: - return "sip"; - } -} - int sofia_glue_transport_has_tls(const sofia_transport_t tp) { switch(tp) { @@ -631,20 +578,14 @@ stripped = sofia_glue_get_url_from_contact(stripped, 0); if (transport && transport != SOFIA_TRANSPORT_UDP) { - const char *scheme = sofia_glue_transport2scheme(transport); - char *tmp; - - if ((tmp = strchr(stripped, ':')) != NULL) { - stripped = ++tmp; - } if (switch_stristr("port=", stripped)) { - new_uri = switch_core_session_sprintf(session, "%s%s:%s%s", uri_only ? "" : "<", scheme, stripped, uri_only ? "" : ">"); + new_uri = switch_core_session_sprintf(session, "%s%s%s", uri_only ? "" : "<", stripped, uri_only ? "" : ">"); } else { if (strchr(stripped, ';')) { - new_uri = switch_core_session_sprintf(session, "%s%s:%s&transport=%s%s", uri_only ? "" : "<", scheme, stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); + new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); } else { - new_uri = switch_core_session_sprintf(session, "%s%s:%s;transport=%s%s", uri_only ? "" : "<", scheme, stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); + new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); } } } else {

1 0