diff options
author | Alexandr Anikin <may@telecom-service.ru> | 2011-11-09 19:08:44 +0000 |
---|---|---|
committer | Alexandr Anikin <may@telecom-service.ru> | 2011-11-09 19:08:44 +0000 |
commit | 31ee82863c6d1f441d2adf9d9f26643cc8a7c23f (patch) | |
tree | 7a95384738a9098e158aa9f3436be5b46e433ded /addons/ooh323c/src/ooq931.c | |
parent | c1647ab33a82c6af9fe321395f3ddeb7cb758735 (diff) |
Generate response to Status Enquiry message with Status q.931 message.
Some PBXes require this for call status checking
(closes issue ASTERISK-18748)
Reported by: Fabrizio Lazzaretti
Patches:
ASTERISK-18748-5.patch (License #5415) patch uploaded by may213
Tested by: Fabrizio Lazzaretti
........
Merged revisions 344158 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 344159 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@344161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/ooh323c/src/ooq931.c')
-rw-r--r-- | addons/ooh323c/src/ooq931.c | 179 |
1 files changed, 177 insertions, 2 deletions
diff --git a/addons/ooh323c/src/ooq931.c b/addons/ooh323c/src/ooq931.c index 58befa8db..ee13d7b02 100644 --- a/addons/ooh323c/src/ooq931.c +++ b/addons/ooh323c/src/ooq931.c @@ -238,6 +238,15 @@ EXTERN int ooQ931Decode OOTRACEDBGB1(" }\n"); } + /* Handle CallState ie */ + if(ie->discriminator == Q931CallStateIE) + { + msg->causeIE = ie; + OOTRACEDBGB1(" CallState IE = {\n"); + OOTRACEDBGB2(" %d\n", ie->data[0]); + OOTRACEDBGB1(" }\n"); + } + /* TODO: Get rid of ie list.*/ dListAppend (pctxt, &msg->ies, ie); if (rv != ASN_OK) @@ -405,6 +414,7 @@ int ooCreateQ931Message(OOCTXT* pctxt, Q931Message **q931msg, int msgType) (*q931msg)->callingPartyNumberIE = NULL; (*q931msg)->calledPartyNumberIE = NULL; (*q931msg)->causeIE = NULL; + (*q931msg)->callstateIE = NULL; return OO_OK; } } @@ -683,6 +693,10 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, else if(pq931Msg->messageType == Q931InformationMsg){ msgbuf[i++] = OOInformationMessage; } + else if(pq931Msg->messageType == Q931StatusMsg || + pq931Msg->messageType == Q931StatusEnquiryMsg){ + msgbuf[i++] = OOStatus; + } else if(pq931Msg->messageType == Q931FacilityMsg){ msgbuf[i++] = OOFacility; msgbuf[i++] = pq931Msg->tunneledMsgType; @@ -753,8 +767,8 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, msgbuf[i++] = 0x88; }*/ - /*Add display ie. */ - if(!ooUtilsIsStrEmpty(call->ourCallerId)) + /*Add display ie. for all but Status message as per ASTERISK-18748 */ + if(!ooUtilsIsStrEmpty(call->ourCallerId) && (pq931Msg->messageType != Q931StatusMsg)) { msgbuf[i++] = Q931DisplayIE; ieLen = strlen(call->ourCallerId)+1; @@ -793,6 +807,13 @@ int ooEncodeH225Message(OOH323CallData *call, Q931Message *pq931Msg, i += pq931Msg->keypadIE->length; } + if(pq931Msg->callstateIE) { + msgbuf[i++] = Q931CallStateIE; + msgbuf[i++] = pq931Msg->callstateIE->length; + memcpy(msgbuf+i, pq931Msg->callstateIE->data, pq931Msg->callstateIE->length); + i += pq931Msg->callstateIE->length; + } + /* Note: Have to fix this, though it works. Need to get rid of ie list. Right now we only put UUIE in ie list. Can be easily removed. */ @@ -1741,6 +1762,138 @@ int ooSendStartH245Facility(OOH323CallData *call) return ret; } +/* + +*/ + +int ooSendStatus(OOH323CallData *call) +{ + int ret; + H225Status_UUIE *status; + Q931Message *q931msg=NULL; + /* OOCTXT *pctxt = &gH323ep.msgctxt; */ + OOCTXT *pctxt = call->msgctxt; + + OOTRACEDBGC3("Building StatusMsg (%s, %s)\n", call->callType, + call->callToken); + ret = ooCreateQ931Message(pctxt, &q931msg, Q931StatusMsg); + if(ret != OO_OK) + { + OOTRACEERR1("Error: In allocating memory for - H225 Status " + "message\n"); + return OO_FAILED; + } + + q931msg->callReference = call->callReference; + + q931msg->userInfo = (H225H323_UserInformation*)memAllocZ(pctxt, + sizeof(H225H323_UserInformation)); + if(!q931msg->userInfo) + { + OOTRACEERR1("ERROR:Memory - ooSendStatus - userInfo\n"); + return OO_FAILED; + } + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG(call->flags, OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + T_H225H323_UU_PDU_h323_message_body_status; + + status = (H225Status_UUIE*)memAllocZ(pctxt, + sizeof(H225Status_UUIE)); + if(!status) + { + OOTRACEERR1("ERROR:Memory - ooSendStatus \n"); + return OO_FAILED; + } + q931msg->userInfo->h323_uu_pdu.h323_message_body.u.status = status; + + status->callIdentifier.guid.numocts = + call->callIdentifier.guid.numocts; + memcpy(status->callIdentifier.guid.data, + call->callIdentifier.guid.data, + call->callIdentifier.guid.numocts); + status->protocolIdentifier = gProtocolID; + + ooQ931SetCauseIE(pctxt, q931msg, Q931StatusEnquiryResponse, 0, 0); + ooQ931SetCallStateIE(pctxt, q931msg, 10); + + OOTRACEDBGA3("Built Status (%s, %s)\n", call->callType, + call->callToken); + ret = ooSendH225Msg(call, q931msg); + if(ret != OO_OK) + { + OOTRACEERR3("Error:Failed to enqueue Status message to outbound queue.(%s, %s)\n", call->callType, call->callToken); + } + + /* memReset(&gH323ep.msgctxt); */ + memReset(call->msgctxt); + + return ret; +} + +int ooSendStatusInquiry(OOH323CallData *call) +{ + int ret; + H225StatusInquiry_UUIE *statusInq; + Q931Message *q931msg=NULL; + /* OOCTXT *pctxt = &gH323ep.msgctxt; */ + OOCTXT *pctxt = call->msgctxt; + + OOTRACEDBGC3("Building StatusInquryMsg (%s, %s)\n", call->callType, + call->callToken); + ret = ooCreateQ931Message(pctxt, &q931msg, Q931StatusEnquiryMsg); + if(ret != OO_OK) + { + OOTRACEERR1("Error: In allocating memory for - H225 Status " + "message\n"); + return OO_FAILED; + } + + q931msg->callReference = call->callReference; + + q931msg->userInfo = (H225H323_UserInformation*)memAllocZ(pctxt, + sizeof(H225H323_UserInformation)); + if(!q931msg->userInfo) + { + OOTRACEERR1("ERROR:Memory - ooSendStatus - userInfo\n"); + return OO_FAILED; + } + q931msg->userInfo->h323_uu_pdu.m.h245TunnelingPresent=1; + q931msg->userInfo->h323_uu_pdu.h245Tunneling = + OO_TESTFLAG(call->flags, OO_M_TUNNELING); + q931msg->userInfo->h323_uu_pdu.h323_message_body.t = + T_H225H323_UU_PDU_h323_message_body_statusInquiry; + + statusInq = (H225StatusInquiry_UUIE*)memAllocZ(pctxt, + sizeof(H225StatusInquiry_UUIE)); + if(!statusInq) + { + OOTRACEERR1("ERROR:Memory - ooSendStatusInquiry \n"); + return OO_FAILED; + } + q931msg->userInfo->h323_uu_pdu.h323_message_body.u.statusInquiry = statusInq; + + statusInq->callIdentifier.guid.numocts = + call->callIdentifier.guid.numocts; + memcpy(statusInq->callIdentifier.guid.data, + call->callIdentifier.guid.data, + call->callIdentifier.guid.numocts); + statusInq->protocolIdentifier = gProtocolID; + + OOTRACEDBGA3("Built StatusInquiry (%s, %s)\n", call->callType, + call->callToken); + ret = ooSendH225Msg(call, q931msg); + if(ret != OO_OK) + { + OOTRACEERR3("Error:Failed to enqueue Status message to outbound queue.(%s, %s)\n", call->callType, call->callToken); + } + + /* memReset(&gH323ep.msgctxt); */ + memReset(call->msgctxt); + + return ret; +} int ooSendReleaseComplete(OOH323CallData *call) { int ret; @@ -3253,6 +3406,28 @@ int ooQ931SetCalledPartyNumberIE return OO_OK; } +int ooQ931SetCallStateIE + (OOCTXT* pctxt, Q931Message *pmsg, unsigned char callstate) +{ + if(pmsg->callstateIE){ + memFreePtr(pctxt, pmsg->callstateIE); + pmsg->callstateIE = NULL; + } + + pmsg->callstateIE = (Q931InformationElement*) + memAllocZ(pctxt, sizeof(Q931InformationElement)); + if(!pmsg->callstateIE) + { + OOTRACEERR1("Error:Memory - ooQ931SetCallstateIE - causeIE\n"); + return OO_FAILED; + } + pmsg->callstateIE->discriminator = Q931CallStateIE; + pmsg->callstateIE->length = 1; + pmsg->callstateIE->data[0] = callstate; + + return OO_OK; +} + int ooQ931SetCauseIE (OOCTXT* pctxt, Q931Message *pmsg, enum Q931CauseValues cause, unsigned coding, unsigned location) |