- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9371 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Aug '08

27 Aug '08

Author: brian Date: Wed Aug 27 00:05:25 2008 New Revision: 9371 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: rfc3261 section 18.1.1 grrr 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 Wed Aug 27 00:05:25 2008 @@ -544,7 +544,7 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), - TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65536)), + TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */

1 0

[commit] r9370 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: anthm Date: Tue Aug 26 14:39:59 2008 New Revision: 9370 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: add optional content-type arg Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Tue Aug 26 14:39:59 2008 @@ -159,7 +159,7 @@ if (argc > 7) { char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[7])); - snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); + switch_snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); } headers = curl_slist_append(headers, ct);

1 0

[commit] r9369 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: anthm Date: Tue Aug 26 14:39:17 2008 New Revision: 9369 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: add optional content-type arg Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Tue Aug 26 14:39:17 2008 @@ -123,17 +123,12 @@ method = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); url = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - if (argc > 2) { - char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); - snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); - } - co->curl_handle = curl_easy_init(); if (!strncasecmp(url, "https", 5)) { curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } - headers = curl_slist_append(headers, ct); + if (argc > 2) { data = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); @@ -162,7 +157,12 @@ } } + if (argc > 7) { + char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[7])); + snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); + } + headers = curl_slist_append(headers, ct); curl_easy_setopt(co->curl_handle, CURLOPT_HTTPHEADER, headers);

1 0

[commit] r9368 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: anthm Date: Tue Aug 26 14:38:02 2008 New Revision: 9368 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: add optional content-type arg Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Tue Aug 26 14:38:02 2008 @@ -113,6 +113,7 @@ long httpRes = 0; struct curl_slist *headers = NULL; int32 timeout = 0; + char ct[80] = "Content-Type: application/x-www-form-urlencoded"; if (argc < 2 || !co) { return JS_FALSE; @@ -122,12 +123,17 @@ method = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); url = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + if (argc > 2) { + char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); + } + co->curl_handle = curl_easy_init(); if (!strncasecmp(url, "https", 5)) { curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } - headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); + headers = curl_slist_append(headers, ct); if (argc > 2) { data = JS_GetStringBytes(JS_ValueToString(cx, argv[2]));

1 0

[commit] r9367 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: brian Date: Tue Aug 26 12:13:25 2008 New Revision: 9367 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: Switch_true 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 Tue Aug 26 12:13:25 2008 @@ -1870,7 +1870,7 @@ send_main = switch_true(val); send_mail++; } else if (!strcasecmp(var, "vm-notify-email-all-messages")) { - send_notify = witch_true(val); + send_notify = switch_true(val); send_mail++; } else if (!strcasecmp(var, "vm-keep-local-after-email")) { insert_db = switch_true(val);

1 0

[commit] r9366 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: anthm Date: Tue Aug 26 11:40:30 2008 New Revision: 9366 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix one of the issues from MODAPP-133 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 Tue Aug 26 11:40:30 2008 @@ -1867,9 +1867,11 @@ } else if (!strcasecmp(var, "email-addr")) { email_addr = switch_core_strdup(pool, val); } else if (!strcasecmp(var, "vm-email-all-messages")) { - send_main = send_mail = switch_true(val); + send_main = switch_true(val); + send_mail++; } else if (!strcasecmp(var, "vm-notify-email-all-messages")) { - send_notify = send_mail = switch_true(val); + send_notify = witch_true(val); + send_mail++; } else if (!strcasecmp(var, "vm-keep-local-after-email")) { insert_db = switch_true(val); } else if (!strcasecmp(var, "vm-attach-file")) { @@ -2310,9 +2312,11 @@ } else if (!strcasecmp(var, "email-addr")) { email_addr = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-email-all-messages")) { - send_main = send_mail = switch_true(val); + send_main = switch_true(val); + send_mail++; } else if (!strcasecmp(var, "vm-notify-email-all-messages")) { - send_notify = send_mail = switch_true(val); + send_notify = switch_true(val); + send_mail++; } else if (!strcasecmp(var, "vm-keep-local-after-email")) { insert_db = switch_true(val); } else if (!strcasecmp(var, "vm-attach-file")) {

1 0

[commit] r9365 - in freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket: . Commands SipEvents
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: verifier Date: Tue Aug 26 04:17:43 2008 New Revision: 9365 Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs Log: Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs Tue Aug 26 04:17:43 2008 @@ -23,9 +23,10 @@ private SofiaSipAddress _caller; private Address _destination; private readonly IList<ChannelVariable> _variables = new List<ChannelVariable>(); - private string _callerIdName = null; - private string _callerIdNumber = null; - private bool _varsAdded = false; + private string _callerIdName; + private string _callerIdNumber; + private bool _varsAdded; + private bool _autoAnswer; public Originate() {} @@ -80,6 +81,9 @@ if (!string.IsNullOrEmpty(_callerIdNumber)) _variables.Add(new ChannelVariable("origination_caller_id_number", _callerIdNumber)); _varsAdded = true; + + if (_autoAnswer) + _variables.Add(new ChannelVariable("sip_auto_answer", "true")); } string variables = string.Empty; @@ -92,20 +96,21 @@ } } + public bool AutoAnswer + { + get { return _autoAnswer; } + set { _autoAnswer = value; } + } + public override CommandReply CreateReply(string dataToParse) { string[] nameValue = dataToParse.Split(' '); if (nameValue[0].Length > 0 && nameValue[0][0] == '+') return new OriginateReply(true, nameValue[1]); - else - { - OriginateReply reply = new OriginateReply(false, string.Empty); - if (nameValue.Length > 1) - reply.ErrorMessage = nameValue[1]; - else - reply.ErrorMessage = dataToParse; - return reply; - } + + OriginateReply reply = new OriginateReply(false, string.Empty); + reply.ErrorMessage = nameValue.Length > 1 ? nameValue[1] : dataToParse; + return reply; } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs Tue Aug 26 04:17:43 2008 @@ -15,6 +15,8 @@ public event EventHandler EventReceived; private readonly EventsWriter _writer; private readonly TextWriter _rawLog; + private object _logLocker = new object(); + public string Password { set { _socket.Password = value; } @@ -47,7 +49,8 @@ private void OnData(string data) { - _writer(data); + lock (_logLocker) + _writer(data); } /// <summary> Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs Tue Aug 26 04:17:43 2008 @@ -61,7 +61,7 @@ private void IgnoreLineBreaks(ref int i) { - while (i < Text.Length && (Text[i] == '\n' || Text[i] == '\r')) + while (i < _text.Length && (_text[i] == '\n' || _text[i] == '\r')) ++i; } @@ -80,15 +80,15 @@ } PlainEventMsg plainEvent; - lock (Text) + lock (_text) { int i = 0; // find complete header bool found = false; - for (; i < Text.Length - 1; ++i) + for (; i < _text.Length - 1; ++i) { - if (Text[i] == '\n' && Text[i+1] == '\n') + if (_text[i] == '\n' && _text[i + 1] == '\n') { found = true; break; @@ -99,13 +99,8 @@ // extract header char[] chars = new char[i]; - Text.CopyTo(0, chars, 0, i); + _text.CopyTo(0, chars, 0, i); string headers = new string(chars); -#if DEBUG - Console.WriteLine("===================================="); - Console.WriteLine("Headers: "); - Console.WriteLine(headers); -#endif IgnoreLineBreaks(ref i); plainEvent = new PlainEventMsg(); @@ -117,12 +112,12 @@ // Start of Empty header bugfix // FS seems to send a header with content-length without sending an actual body // this will eat that kind of header. - if (Text.Length >= BugWorkaround.Length + i) + if (_text.Length >= BugWorkaround.Length + i) { found = true; for (int index = 0; index < BugWorkaround.Length; ++index) { - if (Text[index + i] != BugWorkaround[index]) + if (_text[index + i] != BugWorkaround[index]) { found = false; break; @@ -130,7 +125,7 @@ } if (found) { - Text.Remove(0, i); + _text.Remove(0, i); Console.WriteLine("Removing empty content header."); return null; } @@ -138,12 +133,12 @@ // end of bugfix. // not enough data for body. - if (plainEvent.ContentLength + i > Text.Length) + if (plainEvent.ContentLength + i > _text.Length) return null; // extract body chars = new char[plainEvent.ContentLength]; - Text.CopyTo(i, chars, 0, plainEvent.ContentLength); + _text.CopyTo(i, chars, 0, plainEvent.ContentLength); plainEvent.Body = new string(chars); // check for errors. @@ -156,14 +151,10 @@ Console.WriteLine("Body"); Console.WriteLine(plainEvent.Body); Console.WriteLine("=========================== EVERYTHING in _text =============================="); - Console.WriteLine(Text); - throw new InvalidDataException("Fucked up event: " + Text); + Console.WriteLine(_text); + throw new InvalidDataException("Fucked up event: " + _text); } -#if DEBUG - Console.WriteLine("Body:"); - Console.WriteLine(plainEvent.Body); -#endif if (plainEvent.Body.Length < plainEvent.ContentLength) throw new InvalidDataException("Body contents are too small!"); @@ -174,7 +165,7 @@ // remove header( + body) from buffer - Text.Remove(0, i); + _text.Remove(0, i); } return plainEvent; Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs Tue Aug 26 04:17:43 2008 @@ -127,6 +127,9 @@ string inbuffer; try { + if (_stream == null) + return; // closed socket. + int bytesRead = _stream.EndRead(ar); if (bytesRead == 0) { @@ -144,7 +147,7 @@ return; } - if (DataReceived != null) + if (DataReceived != null && !string.IsNullOrEmpty(inbuffer)) DataReceived(inbuffer); try Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs Tue Aug 26 04:17:43 2008 @@ -4,7 +4,7 @@ { public override string ToString() { - return "PresenceIn." + base.ToString(); + return "In." + base.ToString(); } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs Tue Aug 26 04:17:43 2008 @@ -4,7 +4,7 @@ { public override string ToString() { - return "PresenceOut." + base.ToString(); + return "Out." + base.ToString(); }

1 0

[commit] r9364 - freeswitch/trunk/src
by Freeswitch SVN 25 Aug '08

25 Aug '08

Author: anthm Date: Mon Aug 25 12:40:39 2008 New Revision: 9364 Modified: freeswitch/trunk/src/switch_core.c Log: fix FSCORE-176 Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Aug 25 12:40:39 2008 @@ -1154,11 +1154,9 @@ for (param = switch_xml_child(settings, "variable"); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); const char *val = switch_xml_attr_soft(param, "value"); - char *varr = NULL, *vall = NULL; - - varr = switch_core_strdup(runtime.memory_pool, var); - vall = switch_core_strdup(runtime.memory_pool, val); - switch_core_hash_insert(runtime.global_vars, varr, vall); + if (var && val) { + switch_core_set_variable(var, val); + } } }

1 0

[commit] r9363 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/endpoints/mod_sofia
by Freeswitch SVN 25 Aug '08

25 Aug '08

Author: anthm Date: Mon Aug 25 12:30:28 2008 New Revision: 9363 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Log: presence tweak Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon Aug 25 12:30:28 2008 @@ -145,8 +145,9 @@ \param channel the channel to initilize \param rpid the rpid if for the icon to use \param status the status message + \param id presence id */ -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status); +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status, const char *id); /*! \brief Uninitalize a channel 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 Mon Aug 25 12:30:28 2008 @@ -606,6 +606,26 @@ switch_channel_answer(switch_core_session_get_channel(session)); } +SWITCH_STANDARD_APP(presence_function) +{ + char *argv[6] = { 0 }; + int argc; + char *mydata = NULL; + switch_channel_t *channel = switch_core_session_get_channel(session); + + if (switch_strlen_zero(data) || !(mydata = switch_core_session_strdup(session, data))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); + return; + } + + if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n"); + return; + } + + switch_channel_presence(channel, argv[0], argv[1], argv[2]); +} + SWITCH_STANDARD_APP(pre_answer_function) { switch_channel_pre_answer(switch_core_session_get_channel(session)); @@ -2248,6 +2268,7 @@ SWITCH_ADD_APP(app_interface, "answer", "Answer the call", "Answer the call for a channel.", answer_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "hangup", "Hangup the call", "Hangup the call for a channel.", hangup_function, "[<cause>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set_name", "Name the channel", "Name the channel", set_name_function, "<name>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "presence", "Send Presence", "Send Presence.", presence_function, "<rpid> <status> [<id>]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "log", "Logs to the logger", LOG_LONG_DESC, log_function, "<log_level> <log_string>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "info", "Display Call Info", "Display Call Info", info_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Aug 25 12:30:28 2008 @@ -242,7 +242,7 @@ if (tech_pvt->max_missed_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); } - switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); + switch_channel_presence(tech_pvt->channel, "unknown", "unhold", NULL); if ((buuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))) { if ((bsession = switch_core_session_locate(buuid))) { 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 Mon Aug 25 12:30:28 2008 @@ -2389,11 +2389,11 @@ if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { if (!switch_stristr("sendonly", r_sdp)) { switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); + switch_channel_presence(tech_pvt->channel, "unknown", "unhold", NULL); } } else if (switch_stristr("sendonly", r_sdp)) { switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - switch_channel_presence(tech_pvt->channel, "unknown", "hold"); + switch_channel_presence(tech_pvt->channel, "unknown", "hold", NULL); } 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 Mon Aug 25 12:30:28 2008 @@ -2087,7 +2087,7 @@ const char *stream; switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - switch_channel_presence(tech_pvt->channel, "unknown", "hold"); + switch_channel_presence(tech_pvt->channel, "unknown", "hold", NULL); if (tech_pvt->max_missed_hold_packets) { switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_hold_packets); @@ -2134,7 +2134,7 @@ } switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); - switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); + switch_channel_presence(tech_pvt->channel, "unknown", "unhold", NULL); } } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Aug 25 12:30:28 2008 @@ -389,9 +389,8 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status) +SWITCH_DECLARE(void) switch_channel_presence(switch_channel_t *channel, const char *rpid, const char *status, const char *id) { - const char *id = switch_channel_get_variable(channel, "presence_id"); switch_event_t *event; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; @@ -400,6 +399,10 @@ } if (!id) { + id = switch_channel_get_variable(channel, "presence_id"); + } + + if (!id) { return; } @@ -783,7 +786,7 @@ if (channel->state >= CS_ROUTING) { switch_clear_flag(channel, CF_TRANSFER); - switch_channel_presence(channel, "unknown", (char *) state_names[state]); + switch_channel_presence(channel, "unknown", (char *) state_names[state], NULL); } if (state < CS_HANGUP) { @@ -1360,7 +1363,7 @@ } switch_channel_set_variable(channel, "hangup_cause", switch_channel_cause2str(channel->hangup_cause)); - switch_channel_presence(channel, "unavailable", switch_channel_cause2str(channel->hangup_cause)); + switch_channel_presence(channel, "unavailable", switch_channel_cause2str(channel->hangup_cause), NULL); switch_core_session_kill_channel(channel->session, SWITCH_SIG_KILL); switch_core_session_signal_state_change(channel->session); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Aug 25 12:30:28 2008 @@ -1028,6 +1028,7 @@ { const switch_application_interface_t *application_interface; char *expanded = NULL; + const char *var; if ((application_interface = switch_loadable_module_get_application_interface(app)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", app); @@ -1058,7 +1059,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Expanded String %s(%s)\n", switch_channel_get_name(session->channel), app, expanded); } - if (switch_channel_get_variable(session->channel, "presence_id")) { + if ((var = switch_channel_get_variable(session->channel, "verbose_presence")) && switch_true(var)) { char *myarg = NULL; if (expanded) { myarg = switch_mprintf("%s(%s)", app, expanded); @@ -1068,7 +1069,7 @@ myarg = switch_mprintf("%s", app); } if (myarg) { - switch_channel_presence(session->channel, "unknown", myarg); + switch_channel_presence(session->channel, "unknown", myarg, NULL); switch_safe_free(myarg); } }

1 0

[commit] r9362 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 24 Aug '08

24 Aug '08

Author: brian Date: Sun Aug 24 14:17:53 2008 New Revision: 9362 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: line it up 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 Sun Aug 24 14:17:53 2008 @@ -215,8 +215,8 @@ " username VARCHAR(255),\n" " domain VARCHAR(255),\n" " name_path VARCHAR(255),\n" - " greeting_path VARCHAR(255),\n" - " password VARCHAR(255)\n" + " greeting_path VARCHAR(255),\n" + " password VARCHAR(255)\n" ");\n"; static switch_status_t load_config(void)

1 0