Merged revisions 372764,372767 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r372764 | kmoore | 2012-09-10 13:32:51 -0500 (Mon, 10 Sep 2012) | 12 lines

  Warn on CLI when UDPTL init fails

  This adds a CLI warning when a SDP offer is rejected due to UDPTL
  initialization failure. Previously, there was no indication of the
  reason for offer rejection in this case.

  (closes issue ASTERISK-20357)
  Reported-by: Francesco Usseglio Gaudi
  ........

  Merged revisions 372763 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r372767 | jrose | 2012-09-10 13:41:45 -0500 (Mon, 10 Sep 2012) | 8 lines

  app_meetme: Document that 'p' option will continue in dialplan.

  (closes issue AST-991)
  Reported by John Bigelow
  ........

  Merged revisions 372765 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@372794 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index afbbdbb62714622ce8a9c828d64364263981f0ea..8e0bab089a256d1255a63074abaae16cef86c1f6 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -144,7 +144,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        </option>
                                        <option name="p" hasparams="optional">
                                                <para>Allow user to exit the conference by pressing <literal>#</literal> (default)
-                                               or any of the defined keys.  The key used is set to channel variable
+                                               or any of the defined keys. Dial plan execution will continue at the next
+                                               priority following MeetMe. The key used is set to channel variable
                                                <variable>MEETME_EXIT_KEY</variable>.</para>
                                                <argument name="keys" required="true" />
                                                <note>

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b2f2ccfdde0f01fe924499525db94071aacb63c7..2225015c2e9a6adf68bed9ccf9a080119b3dc25b 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9423,6 +9423,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req, int t38action
                                }
 
                                if (initialize_udptl(p)) {
+                                       ast_log(LOG_WARNING, "Rejecting offer with image stream due to UDPTL initialization failure\n");
                                        res = -1;
                                        goto process_sdp_cleanup;
                                }