[libpri-commits] rmudgett: branch rmudgett/t312 r2237 - in /team/rmudgett/t312: ./ q931.c
SVN commits to the libpri project
libpri-commits at lists.digium.com
Mon Feb 28 18:26:23 CST 2011
Author: rmudgett
Date: Mon Feb 28 18:26:19 2011
New Revision: 2237
URL: http://svnview.digium.com/svn/libpri?view=rev&rev=2237
Log:
Merged revisions 2236 via svnmerge from
https://origsvn.digium.com/svn/libpri/branches/1.4
........
r2236 | rmudgett | 2011-02-28 18:22:38 -0600 (Mon, 28 Feb 2011) | 2 lines
Miscellaneous cleanup before T312 branch merge.
........
Modified:
team/rmudgett/t312/ (props changed)
team/rmudgett/t312/q931.c
Propchange: team/rmudgett/t312/
------------------------------------------------------------------------------
--- t312-integrated (original)
+++ t312-integrated Mon Feb 28 18:26:19 2011
@@ -1,1 +1,1 @@
-/branches/1.4:1-2233
+/branches/1.4:1-2236
Modified: team/rmudgett/t312/q931.c
URL: http://svnview.digium.com/svn/libpri/team/rmudgett/t312/q931.c?view=diff&rev=2237&r1=2236&r2=2237
==============================================================================
--- team/rmudgett/t312/q931.c (original)
+++ team/rmudgett/t312/q931.c Mon Feb 28 18:26:19 2011
@@ -9206,8 +9206,9 @@
c->cause = PRI_CAUSE_DESTINATION_OUT_OF_ORDER;
UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_NULL);
c->peercallstate = Q931_CALL_STATE_NULL;
- if (pri_internal_clear(c) == Q931_RES_HAVEEVENT)
+ if (pri_internal_clear(c) == Q931_RES_HAVEEVENT) {
ctrl->schedev = 1;
+ }
}
/* Handle Layer 2 down event for a non active call. */
@@ -9216,15 +9217,17 @@
struct q931_call *c = data;
struct pri *ctrl = c->pri;
- if (ctrl->debug & PRI_DEBUG_Q931_STATE)
+ if (ctrl->debug & PRI_DEBUG_Q931_STATE) {
pri_message(ctrl, "Cancel call after data link failure\n");
+ }
c->retranstimer = 0;
c->cause = PRI_CAUSE_DESTINATION_OUT_OF_ORDER;
UPDATE_OURCALLSTATE(ctrl, c, Q931_CALL_STATE_NULL);
c->peercallstate = Q931_CALL_STATE_NULL;
- if (pri_internal_clear(c) == Q931_RES_HAVEEVENT)
+ if (pri_internal_clear(c) == Q931_RES_HAVEEVENT) {
ctrl->schedev = 1;
+ }
}
/*!
More information about the libpri-commits
mailing list