Merge BKW's ANI2 patch (bug #2450)

git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@134 2fbb986a-6c06-0410-b554-c9c1f0a7f128
This commit is contained in:
Mark Spencer
2004-09-17 04:02:16 +00:00
parent ea146a8f6f
commit 9682be31fb
2 changed files with 5 additions and 0 deletions

View File

@@ -279,6 +279,7 @@ typedef struct pri_event_ring {
char callingnum[256]; /* Calling number */
char callingname[256]; /* Calling name (if provided) */
int calledplan; /* Dialing plan of Called number */
int ani2; /* ANI II */
char callednum[256]; /* Called number */
char redirectingnum[256]; /* Redirecting number */
char useruserinfo[256]; /* User->User info */

4
q931.c
View File

@@ -255,6 +255,8 @@ struct q931_call {
int callerpres; /* Caller presentation */
char callernum[256]; /* Caller */
char callername[256];
int ani2; /* ANI II */
int calledplan;
int nonisdn;
@@ -1415,6 +1417,7 @@ static FUNC_DUMP(dump_line_information)
static FUNC_RECV(receive_line_information)
{
call->ani2 = ie->data[0];
return 0;
}
@@ -2646,6 +2649,7 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
pri->ev.ring.channel = c->channelno | (c->ds1no << 8);
pri->ev.ring.callingpres = c->callerpres;
pri->ev.ring.callingplan = c->callerplan;
pri->ev.ring.ani2 = c->ani2;
strncpy(pri->ev.ring.callingnum, c->callernum, sizeof(pri->ev.ring.callingnum) - 1);
strncpy(pri->ev.ring.callingname, c->callername, sizeof(pri->ev.ring.callingname) - 1);
pri->ev.ring.calledplan = c->calledplan;