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

Separate PROGRESS and PROCEEDING

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@112 2fbb986a-6c06-0410-b554-c9c1f0a7f128
This commit is contained in:
Mark Spencer 2004-06-14 21:25:41 +00:00
parent 832475b271
commit 66781c3141
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libpri.h
View File

@ -71,6 +71,7 @@
#define PRI_EVENT_SETUP_ACK 14 /* When we get SETUP_ACKNOWLEDGE */ #define PRI_EVENT_SETUP_ACK 14 /* When we get SETUP_ACKNOWLEDGE */
#define PRI_EVENT_HANGUP_REQ 15 /* Requesting the higher layer to hangup */ #define PRI_EVENT_HANGUP_REQ 15 /* Requesting the higher layer to hangup */
#define PRI_EVENT_NOTIFY 16 /* Notification received */ #define PRI_EVENT_NOTIFY 16 /* Notification received */
#define PRI_EVENT_PROGRESS 17 /* When we get CALL_PROCEEDING or PROGRESS */
/* Simple states */ /* Simple states */
#define PRI_STATE_DOWN 0 #define PRI_STATE_DOWN 0

3
q931.c
View File

@ -2431,6 +2431,7 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
q931_destroycall(pri, c->cr); q931_destroycall(pri, c->cr);
break; break;
} }
pri->ev.e = PRI_EVENT_PROGRESS;
/* Fall through */ /* Fall through */
case Q931_CALL_PROCEEDING: case Q931_CALL_PROCEEDING:
if (c->newcall) { if (c->newcall) {
@ -2444,9 +2445,9 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE); q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE);
break; break;
} }
pri->ev.e = PRI_EVENT_PROCEEDING;
pri->ev.proceeding.channel = c->channelno | (c->ds1no << 8); pri->ev.proceeding.channel = c->channelno | (c->ds1no << 8);
if (mh->msg == Q931_CALL_PROCEEDING) { if (mh->msg == Q931_CALL_PROCEEDING) {
pri->ev.e = PRI_EVENT_PROCEEDING;
c->ourcallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING; c->ourcallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
c->peercallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING; c->peercallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
} }