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

More changes for RLT

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@302 2fbb986a-6c06-0410-b554-c9c1f0a7f128
This commit is contained in:
Matthew Fredrickson 2006-01-19 22:18:01 +00:00
parent 3f78370c92
commit 30188c642d
2 changed files with 20 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pri_facility.c
View File

@ -1521,7 +1521,7 @@ int rose_return_result_decode(struct pri *pri, q931_call *call, unsigned char *d
/* Next is the Call ID */
NEXT_COMPONENT(comp, i);
GET_COMPONENT(comp, i, vdata, len);
CHECK_COMPONENT(comp, (ASN1_CONTEXT_SPECIFIC|ASN1_TAG_0), "Error check failed on Call ID!\n");
CHECK_COMPONENT(comp, ASN1_TAG_0, "Error check failed on Call ID!\n");
ASN1_GET_INTEGER(comp, call->rlt_call_id);
/* We have enough data to transfer the call */
call->transferable = 1;

69
q931.c
View File

@ -1174,57 +1174,26 @@ static FUNC_RECV(receive_facility)
if (ie->len < 1)
return -1;
if (pri->switchtype != PRI_SWITCH_DMS100) {
if ((ie->data[i] & 0xe0) != 0x80) {
pri_error(pri, "!! Invalid Protocol Profile field 0x%X\n", ie->data[i]);
return -1;
}
switch(next_protocol = protocol = (ie->data[i] & 0x1f)) {
case Q932_PROTOCOL_CMIP:
case Q932_PROTOCOL_ACSE:
if (pri->debug & PRI_DEBUG_APDU)
pri_message(pri, "!! Don't know how to handle Q.932 Protocol Profile of type 0x%X\n", protocol);
return -1;
case Q932_PROTOCOL_EXTENSIONS:
state = Q932_STATE_NFE;
next_protocol = Q932_PROTOCOL_ROSE;
break;
case Q932_PROTOCOL_ROSE:
break;
default:
pri_error(pri, "!! Invalid Q.932 Protocol Profile of type 0x%X received\n", protocol);
return -1;
}
i++;
} else { /* Silly DMS100s */
switch(next_protocol = protocol = (ie->data[i] & 0x1f)) {
case Q932_PROTOCOL_CMIP:
case Q932_PROTOCOL_ACSE:
if (pri->debug & PRI_DEBUG_APDU)
pri_message(pri, "!! Don't know how to handle Q.932 Protocol Profile of type 0x%X\n", protocol);
return -1;
case Q932_PROTOCOL_EXTENSIONS:
state = Q932_STATE_NFE;
next_protocol = Q932_PROTOCOL_ROSE;
break;
case Q932_PROTOCOL_ROSE:
break;
default:
pri_error(pri, "!! Invalid Q.932 Protocol Profile of type 0x%X received\n", protocol);
return -1;
}
if (!(ie->data[i] & 0x80)) {
i++;
if (((ie->data[i] & 0x7f) != RLT_OPERATION_IND) || !(ie->data[i] & 0x80)) {
pri_error(pri, "!! Do not support operation 0x%x\n", ie->data[i] & 0xff);
return -1;
}
}
i++;
switch(next_protocol = protocol = (ie->data[i] & 0x1f)) {
case Q932_PROTOCOL_CMIP:
case Q932_PROTOCOL_ACSE:
if (pri->debug & PRI_DEBUG_APDU)
pri_message(pri, "!! Don't know how to handle Q.932 Protocol Profile of type 0x%X\n", protocol);
return -1;
case Q932_PROTOCOL_EXTENSIONS:
state = Q932_STATE_NFE;
next_protocol = Q932_PROTOCOL_ROSE;
break;
case Q932_PROTOCOL_ROSE:
break;
default:
pri_error(pri, "!! Invalid Q.932 Protocol Profile of type 0x%X received\n", protocol);
return -1;
}
/* Service indicator octet - Just ignore for now */
if (!(ie->data[i] & 0x80))
i++;
i++;
if (ie->len < 3)
return -1;