FGCOM/libpri
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 1143, 1144 from

Browse Source 
https://origsvn.digium.com/svn/libpri/tags/1.4.10.2

  ..........
  r1144 | mattf | 2009-09-29 10:32:23 -0500 (Tue, 29 Sep 2009) | 1 line

  This fix is more like the fix that was used to resolve the issue for the PRI case
  ..........
  r1143 | mattf | 2009-09-28 14:07:01 -0500 (Mon, 28 Sep 2009) | 1 line

  Changes for 1.4.10.2
  ..........


git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@1151 2fbb986a-6c06-0410-b554-c9c1f0a7f128
This commit is contained in:
Richard Mudgett 2009-10-07 18:33:09 +00:00
parent 18ea19900c
commit 175c1e470f
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pri.c
View File

@ -308,7 +308,7 @@ int pri_restart(struct pri *pri)
{ {
/* Restart Q.921 layer */ /* Restart Q.921 layer */
if (pri) { if (pri) {
q921_reset(pri); q921_reset(pri, 1);
q921_start(pri, pri->localtype == PRI_CPE); q921_start(pri, pri->localtype == PRI_CPE);
} }
return 0; return 0;

2
pri_q921.h
View File

@ -186,7 +186,7 @@ extern void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx
/* Bring up the D-channel */ /* Bring up the D-channel */
extern void q921_start(struct pri *pri, int now); extern void q921_start(struct pri *pri, int now);
extern void q921_reset(struct pri *pri); extern void q921_reset(struct pri *pri, int reset_iqueue);
extern pri_event *q921_receive(struct pri *pri, q921_h *h, int len); extern pri_event *q921_receive(struct pri *pri, q921_h *h, int len);

26
q921.c
View File

@ -785,6 +785,12 @@ void q921_dump(struct pri *pri, q921_h *h, int len, int showraw, int txrx)
pri_event *q921_dchannel_up(struct pri *pri) pri_event *q921_dchannel_up(struct pri *pri)
{ {
if (pri->tei == Q921_TEI_PRI) {
q921_reset(pri, 1);
} else {
q921_reset(pri, 0);
}
/* Stop any SABME retransmissions */ /* Stop any SABME retransmissions */
pri_schedule_del(pri, pri->sabme_timer); pri_schedule_del(pri, pri->sabme_timer);
pri->sabme_timer = 0; pri->sabme_timer = 0;
@ -797,7 +803,12 @@ pri_event *q921_dchannel_up(struct pri *pri)
pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_ESTABLISHED\n", DBGINFO); pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_ESTABLISHED\n", DBGINFO);
pri->q921_state = Q921_LINK_CONNECTION_ESTABLISHED; pri->q921_state = Q921_LINK_CONNECTION_ESTABLISHED;
/* Ensure that we do not have T200 or T203 running when the link comes up */
pri_schedule_del(pri, pri->t200_timer);
pri->t200_timer = 0;
/* Start the T203 timer */ /* Start the T203 timer */
pri_schedule_del(pri, pri->t203_timer);
pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri); pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
/* Notify Layer 3 */ /* Notify Layer 3 */
@ -813,7 +824,7 @@ pri_event *q921_dchannel_up(struct pri *pri)
pri_event *q921_dchannel_down(struct pri *pri) pri_event *q921_dchannel_down(struct pri *pri)
{ {
/* Reset counters, reset sabme timer etc */ /* Reset counters, reset sabme timer etc */
q921_reset(pri); q921_reset(pri, 1);
/* Notify Layer 3 */ /* Notify Layer 3 */
q931_dl_indication(pri, PRI_EVENT_DCHAN_DOWN); q931_dl_indication(pri, PRI_EVENT_DCHAN_DOWN);
@ -823,10 +834,12 @@ pri_event *q921_dchannel_down(struct pri *pri)
return &pri->ev; return &pri->ev;
} }
void q921_reset(struct pri *pri) void q921_reset(struct pri *pri, int reset_iqueue)
{ {
/* Having gotten a SABME we MUST reset our entire state */ /* Having gotten a SABME we MUST reset our entire state */
pri->v_s = 0; if (reset_iqueue)
pri->v_s = 0;
pri->v_a = 0; pri->v_a = 0;
pri->v_r = 0; pri->v_r = 0;
pri->v_na = 0; pri->v_na = 0;
@ -848,7 +861,8 @@ void q921_reset(struct pri *pri)
pri->sentrej = 0; pri->sentrej = 0;
/* Discard anything waiting to go out */ /* Discard anything waiting to go out */
q921_discard_retransmissions(pri); if (reset_iqueue)
q921_discard_retransmissions(pri);
} }
static void q921_tei_release_and_reacquire(struct pri *master) static void q921_tei_release_and_reacquire(struct pri *master)
@ -1248,14 +1262,14 @@ static void q921_restart(struct pri *pri, int now)
return; return;
} }
/* Reset our interface */ /* Reset our interface */
q921_reset(pri); q921_reset(pri, 1);
/* Do the SABME XXX Maybe we should implement T_WAIT? XXX */ /* Do the SABME XXX Maybe we should implement T_WAIT? XXX */
q921_send_sabme(pri, now); q921_send_sabme(pri, now);
} }
void q921_start(struct pri *pri, int isCPE) void q921_start(struct pri *pri, int isCPE)
{ {
q921_reset(pri); q921_reset(pri, 1);
if ((pri->sapi == Q921_SAPI_LAYER2_MANAGEMENT) && (pri->tei == Q921_TEI_GROUP)) { if ((pri->sapi == Q921_SAPI_LAYER2_MANAGEMENT) && (pri->tei == Q921_TEI_GROUP)) {
pri->q921_state = Q921_DOWN; pri->q921_state = Q921_DOWN;
if (isCPE) if (isCPE)