[svn-commits] rmudgett: branch group/ccss r1397 - /team/group/ccss/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Dec 22 10:18:41 CST 2009
Author: rmudgett
Date: Tue Dec 22 10:18:38 2009
New Revision: 1397
URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1397
Log:
Removed attempt to support CC service retention.
Modified:
team/group/ccss/libpri.h
team/group/ccss/pri.c
team/group/ccss/pri_cc.c
team/group/ccss/pri_internal.h
Modified: team/group/ccss/libpri.h
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/libpri.h?view=diff&rev=1397&r1=1396&r2=1397
==============================================================================
--- team/group/ccss/libpri.h (original)
+++ team/group/ccss/libpri.h Tue Dec 22 10:18:38 2009
@@ -575,11 +575,6 @@
* ccnr(1)
*/
int mode;
- /*!
- * \brief TRUE if negotiated to retain CC service if B busy again.
- * \note This will be the setting if the CC request is accepted.
- */
- int retain_service;
};
struct pri_subcmd_cc_request_rsp {
@@ -602,11 +597,6 @@
* \note Use pri_facility_reject2str() to convert the reject_code.
*/
int fail_code;
- /*!
- * \brief TRUE if negotiated to retain CC service if B busy again.
- * \note Valid when status is success.
- */
- int retain_service;
};
struct pri_subcmd_cc_status {
@@ -1418,17 +1408,6 @@
void pri_cc_recall_mode(struct pri *ctrl, int mode);
/*!
- * \brief Set the call completion service retention mode to negotiate
- * if party B is busy again.
- *
- * \param ctrl D channel controller.
- * \param retain_service TRUE if can retain cc service if party B is unavailable again.
- *
- * \return Nothing
- */
-void pri_cc_retain_service(struct pri *ctrl, int retain_service);
-
-/*!
* \brief Set the Q.SIG call completion signaling link retention mode.
* (Requestor/Initiator/Originator/Party-A)
*
Modified: team/group/ccss/pri.c
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/pri.c?view=diff&rev=1397&r1=1396&r2=1397
==============================================================================
--- team/group/ccss/pri.c (original)
+++ team/group/ccss/pri.c Tue Dec 22 10:18:38 2009
@@ -1701,14 +1701,6 @@
}
}
-void pri_cc_retain_service(struct pri *ctrl, int retain_service)
-{
- ctrl = PRI_MASTER(ctrl);
- if (ctrl) {
- ctrl->cc.option.retain_service = retain_service ? 1 : 0;
- }
-}
-
void pri_cc_retain_signaling_req(struct pri *ctrl, int signaling_retention)
{
ctrl = PRI_MASTER(ctrl);
Modified: team/group/ccss/pri_cc.c
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/pri_cc.c?view=diff&rev=1397&r1=1396&r2=1397
==============================================================================
--- team/group/ccss/pri_cc.c (original)
+++ team/group/ccss/pri_cc.c Tue Dec 22 10:18:38 2009
@@ -413,7 +413,6 @@
cc_record->saved_ie_contents = call->cc.saved_ie_contents;
cc_record->bc = call->bc;
cc_record->option.recall_mode = ctrl->cc.option.recall_mode;
- cc_record->option.retain_service = ctrl->cc.option.retain_service;
/*! \todo BUGBUG need more initialization?? */
/*
@@ -891,9 +890,7 @@
}
}
- if (cc_record->master->cc.option.retain_service) {
- msg.args.etsi.CCBS_T_Request.retention_supported = 1;
- }
+ //msg.args.etsi.CCBS_T_Request.retention_supported = 0;
pos = rose_encode_invoke(ctrl, pos, end, &msg);
@@ -1847,11 +1844,6 @@
* when we saved the original call information.
*/
- /* Determine negotiated service_retention. */
- cc_record->option.retain_service =
- (invoke->args.etsi.CCBS_T_Request.retention_supported
- && cc_record->master->cc.option.retain_service) ? 1 : 0;
-
/* Link the signaling link to the cc_record. */
call->cc.record = cc_record;
cc_record->signaling = call;
@@ -2593,9 +2585,6 @@
pri_cc_event(ctrl, call, cc_record, CC_EVENT_TIMEOUT_T_ACTIVATE);
break;
case APDU_CALLBACK_REASON_MSG_RESULT:
- cc_record->option.retain_service =
- msg->response.result->args.etsi.CCBS_T_Request.retention_supported;
-
pri_cc_event(ctrl, call, cc_record, CC_EVENT_CC_REQUEST_ACCEPT);
break;
case APDU_CALLBACK_REASON_MSG_ERROR:
@@ -3052,7 +3041,6 @@
subcmd->cmd = PRI_SUBCMD_CC_REQ;
subcmd->u.cc_request.cc_id = cc_record->record_id;
subcmd->u.cc_request.mode = cc_record->is_ccnr ? 1 /* ccnr */ : 0 /* ccbs */;
- subcmd->u.cc_request.retain_service = cc_record->option.retain_service;
}
/*!
@@ -3151,7 +3139,6 @@
subcmd->u.cc_request_rsp.cc_id = cc_record->record_id;
subcmd->u.cc_request_rsp.status = 0;/* success */
subcmd->u.cc_request_rsp.fail_code = 0;
- subcmd->u.cc_request_rsp.retain_service = cc_record->option.retain_service;
}
/*!
@@ -3180,7 +3167,6 @@
(cc_record->msg.cc_req_rsp.reason == APDU_CALLBACK_REASON_MSG_ERROR)
? 2 /* error */ : 3 /* reject */;
subcmd->u.cc_request_rsp.fail_code = cc_record->msg.cc_req_rsp.code;
- subcmd->u.cc_request_rsp.retain_service = 0;
}
/*!
@@ -3207,7 +3193,6 @@
subcmd->u.cc_request_rsp.cc_id = cc_record->record_id;
subcmd->u.cc_request_rsp.status = 1;/* timeout */
subcmd->u.cc_request_rsp.fail_code = 0;
- subcmd->u.cc_request_rsp.retain_service = 0;
}
/*!
@@ -5399,7 +5384,7 @@
msg.operation = cc_record->response.invoke_operation;
/* CCBS/CCNR reply */
- msg.args.etsi.CCBS_T_Request.retention_supported = cc_record->option.retain_service;
+ //msg.args.etsi.CCBS_T_Request.retention_supported = 0;
pos = rose_encode_result(ctrl, pos, end, &msg);
Modified: team/group/ccss/pri_internal.h
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/pri_internal.h?view=diff&rev=1397&r1=1396&r2=1397
==============================================================================
--- team/group/ccss/pri_internal.h (original)
+++ team/group/ccss/pri_internal.h Tue Dec 22 10:18:38 2009
@@ -180,8 +180,6 @@
struct {
/*! PTMP recall mode: globalRecall(0), specificRecall(1) */
unsigned char recall_mode;
- /*! TRUE if can retain cc service if party B is unavailable again. */
- unsigned char retain_service;
/*! Q.SIG Request signaling link retention: release(0), retain(1), do-not-care(2) */
unsigned char signaling_retention_req;
/*! Q.SIG Response request signaling link retention: release(0), retain(1) */
@@ -844,8 +842,6 @@
struct {
/*! PTMP recall mode: globalRecall(0), specificRecall(1) */
unsigned char recall_mode;
- /*! TRUE if negotiated to retain CC service if B busy again. */
- unsigned char retain_service;
/*! TRUE if negotiated for Q.SIG signaling link to be retained. */
unsigned char retain_signaling_link;
#if defined(QSIG_PATH_RESERVATION_SUPPORT)
More information about the svn-commits
mailing list