Merged revisions 338323 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Wed, 28 Sep 2011 22:38:00 +0000 (22:38 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 28 Sep 2011 22:38:00 +0000 (22:38 +0000)
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338323 | rmudgett | 2011-09-28 17:36:57 -0500 (Wed, 28 Sep 2011) | 12 lines

  Merged revisions 338322 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r338322 | rmudgett | 2011-09-28 17:35:52 -0500 (Wed, 28 Sep 2011) | 5 lines

    Make duplicate call ptr warning message more helpful.

    * Adds the value of the call ptr to the duplicate call ptr message to help
    trace why there is a duplicate call ptr.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338324 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/sig_pri.c

index 533d6cc..5135e07 100644 (file)
@@ -5838,8 +5838,8 @@ static void *pri_dchannel(void *vpri)
                                if (-1 < chanpos) {
                                        /* Libpri has already filtered out duplicate SETUPs. */
                                        ast_log(LOG_WARNING,
                                if (-1 < chanpos) {
                                        /* Libpri has already filtered out duplicate SETUPs. */
                                        ast_log(LOG_WARNING,
-                                               "Span %d: Got SETUP with duplicate call ptr.  Dropping call.\n",
-                                               pri->span);
+                                               "Span %d: Got SETUP with duplicate call ptr (%p).  Dropping call.\n",
+                                               pri->span, e->ring.call);
                                        pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_NORMAL_TEMPORARY_FAILURE);
                                        break;
                                }
                                        pri_hangup(pri->pri, e->ring.call, PRI_CAUSE_NORMAL_TEMPORARY_FAILURE);
                                        break;
                                }