[libpri-commits] rmudgett: branch group/ccss r1438 - /team/group/ccss/
SVN commits to the libpri project
libpri-commits at lists.digium.com
Fri Jan 22 19:03:33 CST 2010
Author: rmudgett
Date: Fri Jan 22 19:03:29 2010
New Revision: 1438
URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1438
Log:
Conditionaled out handling support for ROSE_ETSI_StatusRequest.
The stubs for the handling of the ROSE_ETSI_StatusRequest ROSE message has
been conditionaled out with the STATUS_REQUEST_PLACE_HOLDER define until
they are ever written.
Modified:
team/group/ccss/libpri.h
team/group/ccss/pri.c
team/group/ccss/pri_facility.c
Modified: team/group/ccss/libpri.h
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/libpri.h?view=diff&rev=1438&r1=1437&r2=1438
==============================================================================
--- team/group/ccss/libpri.h (original)
+++ team/group/ccss/libpri.h Fri Jan 22 19:03:29 2010
@@ -512,12 +512,21 @@
int invoke_id;
};
+/*
+ * NOTE:
+ * The code surrounded by STATUS_REQUEST_PLACE_HOLDER is not implemented.
+ * The STATUS_REQUEST_PLACE_HOLDER code will be made unconditional if support
+ * for the messages is ever needed (and gets written).
+ */
+
/* Subcommands derived from supplementary services. */
#define PRI_SUBCMD_REDIRECTING 1 /*!< Redirecting information update */
#define PRI_SUBCMD_CONNECTED_LINE 2 /*!< Connected line information update */
#define PRI_SUBCMD_REROUTING 3 /*!< CallRerouting/CallDeflection received. */
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
#define PRI_SUBCMD_STATUS_REQ 4 /*!< Determine the status of the given party. */
#define PRI_SUBCMD_STATUS_REQ_RSP 5 /*!< Status request response */
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
#define PRI_SUBCMD_CC_AVAILABLE 6 /*!< Indicate that CC is available */
#define PRI_SUBCMD_CC_REQ 7 /*!< CC activation request */
#define PRI_SUBCMD_CC_REQ_RSP 8 /*!< CC activation request response */
@@ -530,6 +539,7 @@
#define PRI_SUBCMD_CC_CANCEL 15 /*!< Unsolicited indication that CC is canceled */
#define PRI_SUBCMD_CC_STOP_ALERTING 16 /*!< Indicate that someone else has responed to remote user free */
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
struct pri_subcmd_status_request {
/*!
* \brief Invoke id in case there are multiple outstanding requests.
@@ -540,7 +550,9 @@
/*! \brief Party address requesting status about. */
struct pri_party_address party;
};
-
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
+
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
struct pri_subcmd_status_request_rsp {
/*!
* \brief Request id in case there are multiple outstanding requests.
@@ -554,11 +566,11 @@
* free(0),
* busy(1),
* incompatible(2)
- * unknown(3),
- * timeout(4),
+ * timeout(3),
*/
int status;
};
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
struct pri_subcmd_cc_id {
/*! \brief Call-Completion record id */
@@ -631,8 +643,10 @@
struct pri_party_connected_line connected_line;
struct pri_party_redirecting redirecting;
struct pri_rerouting_data rerouting;
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
struct pri_subcmd_status_request status_request;
struct pri_subcmd_status_request_rsp status_request_rsp;
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
struct pri_subcmd_cc_id cc_available;
struct pri_subcmd_cc_request cc_request;
struct pri_subcmd_cc_request_rsp cc_request_rsp;
@@ -1395,8 +1409,10 @@
*/
int pri_retrieve_rej(struct pri *ctrl, q931_call *call, int cause);
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
int pri_status_req(struct pri *ctrl, int request_id, const struct pri_sr *req);
void pri_status_req_rsp(struct pri *ctrl, int invoke_id, int status);
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
/*!
* \brief Set the call completion feature enable flag.
Modified: team/group/ccss/pri.c
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/pri.c?view=diff&rev=1438&r1=1437&r2=1438
==============================================================================
--- team/group/ccss/pri.c (original)
+++ team/group/ccss/pri.c Fri Jan 22 19:03:29 2010
@@ -957,6 +957,7 @@
return 0;
}
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
/*!
* \brief Poll/ping for the status of any "called" party.
*
@@ -968,10 +969,7 @@
* \note
* There could be one or more PRI_SUBCMD_STATUS_REQ_RSP to the status request
* depending upon how many endpoints respond to the request.
- * (This includes the timeout or unknown termination response.)
- * \note
- * If the switch type is not ETSI BRI PTMP NT then the status will always be
- * an immediate unknown.
+ * (This includes the timeout termination response.)
* \note
* Could be used to poll for the status of call-completion party B.
*
@@ -980,10 +978,11 @@
*/
int pri_status_req(struct pri *ctrl, int request_id, const struct pri_sr *req)
{
- /*! \todo BUGBUG pri_status_req() not written */
return -1;
}
-
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
+
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
/*!
* \brief Response to a poll/ping request for status of any "called" party by libpri.
*
@@ -1001,8 +1000,8 @@
*/
void pri_status_req_rsp(struct pri *ctrl, int invoke_id, int status)
{
- /*! \todo BUGBUG pri_status_req_rsp() not written */
-}
+}
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
#if 0
/* deprecated routines, use pri_hangup */
Modified: team/group/ccss/pri_facility.c
URL: http://svnview.digium.com/svn/libpri/team/group/ccss/pri_facility.c?view=diff&rev=1438&r1=1437&r2=1438
==============================================================================
--- team/group/ccss/pri_facility.c (original)
+++ team/group/ccss/pri_facility.c Fri Jan 22 19:03:29 2010
@@ -3848,11 +3848,11 @@
case ROSE_ETSI_EctLoopTest:
break;
#endif /* Not handled yet */
-#if 0 /* Not handled yet */
+#if defined(STATUS_REQUEST_PLACE_HOLDER)
case ROSE_ETSI_StatusRequest:
- /*! \todo BUGBUG ROSE_ETSI_StatusRequest not handled */
- break;
-#endif /* Not handled yet */
+ /* Not handled yet */
+ break;
+#endif /* defined(STATUS_REQUEST_PLACE_HOLDER) */
case ROSE_ETSI_CallInfoRetain:
if (!PRI_MASTER(ctrl)->cc_support) {
/*
More information about the libpri-commits
mailing list