[svn-commits] dhubbard: branch dhubbard/bbfcfm r1039 - /team/dhubbard/bbfcfm/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Aug 29 20:16:32 CDT 2009
Author: dhubbard
Date: Sat Aug 29 20:16:29 2009
New Revision: 1039
URL: http://svn.asterisk.org/svn-view/libpri?view=rev&rev=1039
Log:
add service message support for the 'national' switchtype
This work was done by only referencing a trace that was sent to me.
According to the trace, I believe this should work and is ready for
testing ... in theory...
Modified:
team/dhubbard/bbfcfm/pri_q931.h
team/dhubbard/bbfcfm/q931.c
Modified: team/dhubbard/bbfcfm/pri_q931.h
URL: http://svn.asterisk.org/svn-view/libpri/team/dhubbard/bbfcfm/pri_q931.h?view=diff&rev=1039&r1=1038&r2=1039
==============================================================================
--- team/dhubbard/bbfcfm/pri_q931.h (original)
+++ team/dhubbard/bbfcfm/pri_q931.h Sat Aug 29 20:16:29 2009
@@ -77,9 +77,8 @@
#define GR303_PROTOCOL_DISCRIMINATOR 0x4f
/* AT&T Maintenance Protocol Discriminators */
#define MAINTENANCE_PROTOCOL_DISCRIMINATOR_1 0x03
+/* National Maintenance Protocol Discriminator */
#define MAINTENANCE_PROTOCOL_DISCRIMINATOR_2 0x43
-/* National Maintenance Protocol Discriminator */
-#define MAINTENANCE_PROTOCOL_DISCRIMINATOR_3 0x67
/* Q.931 / National ISDN Message Types */
@@ -126,8 +125,8 @@
/* Maintenance messages (codeset 0 only) */
#define ATT_SERVICE 0x0f
#define ATT_SERVICE_ACKNOWLEDGE 0x07
-#define NATIONAL_SERVICE 0x0f
-#define NATIONAL_SERVICE_ACKNOWLEDGE 0x07
+#define NATIONAL_SERVICE 0x07
+#define NATIONAL_SERVICE_ACKNOWLEDGE 0x0f
#define SERVICE_CHANGE_STATUS_INSERVICE 0
#define SERVICE_CHANGE_STATUS_LOOPBACK 1 /* not supported */
Modified: team/dhubbard/bbfcfm/q931.c
URL: http://svn.asterisk.org/svn-view/libpri/team/dhubbard/bbfcfm/q931.c?view=diff&rev=1039&r1=1038&r2=1039
==============================================================================
--- team/dhubbard/bbfcfm/q931.c (original)
+++ team/dhubbard/bbfcfm/q931.c Sat Aug 29 20:16:29 2009
@@ -93,13 +93,16 @@
};
static int post_handle_q931_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c, int missingmand);
-struct msgtype maintenance_msgs[] = {
+struct msgtype att_maintenance_msgs[] = {
{ ATT_SERVICE, "SERVICE", { Q931_CHANNEL_IDENT } },
{ ATT_SERVICE_ACKNOWLEDGE, "SERVICE ACKNOWLEDGE", { Q931_CHANNEL_IDENT } },
+};
+
+struct msgtype national_maintenance_msgs[] = {
{ NATIONAL_SERVICE, "CONNECT", { Q931_CHANNEL_IDENT } },
{ NATIONAL_SERVICE_ACKNOWLEDGE, "CONNECT ACKNOWLEDGE", { Q931_CHANNEL_IDENT } },
};
-static int post_handle_maintenance_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c);
+static int post_handle_maintenance_message(struct pri *ctrl, int protodisc, struct q931_mh *mh, struct q931_call *c);
static struct msgtype causes[] = {
{ PRI_CAUSE_UNALLOCATED, "Unallocated (unassigned) number" },
@@ -2865,12 +2868,23 @@
return "Unknown Message Type";
}
-static char *maintenance_msg2str(int msg)
-{
- unsigned int x;
- for (x=0; x<sizeof(maintenance_msgs)/sizeof(maintenance_msgs[0]); x++) {
- if (maintenance_msgs[x].msgnum == msg)
- return maintenance_msgs[x].name;
+static char *maintenance_msg2str(int msg, int pd)
+{
+ unsigned int x, max;
+ struct msgtype *m = NULL;
+
+ if ( pd == MAINTENANCE_PROTOCOL_DISCRIMINATOR_1 ) {
+ m = att_maintenance_msgs;
+ max = ARRAY_LEN(att_maintenance_msgs);
+ } else {
+ m = national_maintenance_msgs;
+ max = ARRAY_LEN(national_maintenance_msgs);
+ }
+
+ for ( x = 0; x < max; x++ ) {
+ if ( m[x].msgnum == msg ) {
+ return m[x].name;
+ }
}
return "Unknown Message Type";
}
@@ -3176,7 +3190,7 @@
/* Message header begins at the end of the call reference number */
mh = (q931_mh *)(h->contents + h->crlen);
if ((h->pd == MAINTENANCE_PROTOCOL_DISCRIMINATOR_1) || (h->pd == MAINTENANCE_PROTOCOL_DISCRIMINATOR_2)) {
- pri_message(ctrl, "%c Message Type: %s (%d)\n", c, maintenance_msg2str(mh->msg), mh->msg);
+ pri_message(ctrl, "%c Message Type: %s (%d)\n", c, maintenance_msg2str(mh->msg, h->pd), mh->msg);
} else {
pri_message(ctrl, "%c Message Type: %s (%d)\n", c, msg2str(mh->msg), mh->msg);
}
@@ -3345,12 +3359,21 @@
int maintenance_service_ack(struct pri *ctrl, q931_call *c)
{
- return send_message(ctrl, c, (MAINTENANCE_PROTOCOL_DISCRIMINATOR_1 << 8) | ATT_SERVICE_ACKNOWLEDGE, maintenance_service_ies);
+ int pd = MAINTENANCE_PROTOCOL_DISCRIMINATOR_1;
+ int mt = ATT_SERVICE_ACKNOWLEDGE;
+
+ if (ctrl->switchtype == PRI_SWITCH_NI2) {
+ pd = MAINTENANCE_PROTOCOL_DISCRIMINATOR_2;
+ mt = NATIONAL_SERVICE_ACKNOWLEDGE;
+ }
+ return send_message(ctrl, c, (pd << 8) | mt, maintenance_service_ies);
}
int maintenance_service(struct pri *ctrl, int span, int channel, int changestatus)
{
struct q931_call *c;
+ int pd = MAINTENANCE_PROTOCOL_DISCRIMINATOR_1;
+ int mt = ATT_SERVICE;
c = q931_getcall(ctrl, 0 | 0x8000);
if (!c) {
@@ -3363,7 +3386,12 @@
c->channelno = channel;
c->chanflags |= FLAG_EXCLUSIVE;
c->changestatus = changestatus;
- return send_message(ctrl, c, (MAINTENANCE_PROTOCOL_DISCRIMINATOR_1 << 8) | ATT_SERVICE, maintenance_service_ies);
+
+ if ( ctrl->switchtype == PRI_SWITCH_NI2) {
+ pd = MAINTENANCE_PROTOCOL_DISCRIMINATOR_2;
+ mt = NATIONAL_SERVICE;
+ }
+ return send_message(ctrl, c, (pd << 8) | mt, maintenance_service_ies);
}
static int status_ies[] = { Q931_CAUSE, Q931_CALL_STATE, -1 };
@@ -4049,6 +4077,9 @@
/* SERVICE messages are a superset of messages that can take b-channels
* or entire d-channels in and out of service */
switch(mh->msg) {
+ /* the ATT_SERVICE/ATT_SERVICE_ACKNOWLEDGE and NATIONAL_SERVICE/NATIONAL_SERVICE_ACKNOWLEDGE
+ * are mirrors of each other so we only have to check for one type because they are pre-handled
+ * the same way as each other */
case ATT_SERVICE:
case ATT_SERVICE_ACKNOWLEDGE:
c->channelno = -1;
@@ -4059,7 +4090,7 @@
c->changestatus = -1;
break;
default:
- pri_error(ctrl, "!! Don't know how to pre-handle maintenance message type '%s' (%d)\n", maintenance_msg2str(mh->msg), mh->msg);
+ pri_error(ctrl, "!! Don't know how to pre-handle maintenance message type '%d'\n", mh->msg);
return -1;
}
return 0;
@@ -4336,18 +4367,18 @@
/* Post handling */
if ((h->pd == MAINTENANCE_PROTOCOL_DISCRIMINATOR_1) || (h->pd == MAINTENANCE_PROTOCOL_DISCRIMINATOR_2)) {
- res = post_handle_maintenance_message(ctrl, mh, c);
+ res = post_handle_maintenance_message(ctrl, h->pd, mh, c);
} else {
res = post_handle_q931_message(ctrl, mh, c, missingmand);
}
return res;
}
-static int post_handle_maintenance_message(struct pri *ctrl, struct q931_mh *mh, struct q931_call *c)
+static int post_handle_maintenance_message(struct pri *ctrl, int protodisc, struct q931_mh *mh, struct q931_call *c)
{
/* Do some maintenance stuff */
- switch (mh->msg) {
- case ATT_SERVICE:
+ if (((protodisc == MAINTENANCE_PROTOCOL_DISCRIMINATOR_1) && (mh->msg == ATT_SERVICE))
+ || ((protodisc == MAINTENANCE_PROTOCOL_DISCRIMINATOR_2) && (mh->msg == NATIONAL_SERVICE))) {
if (c->channelno > 0) {
ctrl->ev.e = PRI_EVENT_SERVICE;
ctrl->ev.service.channel = c->channelno | (c->ds1no << 8);
@@ -4369,7 +4400,9 @@
}
maintenance_service_ack(ctrl, c);
return Q931_RES_HAVEEVENT;
- case ATT_SERVICE_ACKNOWLEDGE:
+ }
+ if (((protodisc == MAINTENANCE_PROTOCOL_DISCRIMINATOR_1) && (mh->msg == ATT_SERVICE_ACKNOWLEDGE))
+ || ((protodisc == MAINTENANCE_PROTOCOL_DISCRIMINATOR_2) && (mh->msg == NATIONAL_SERVICE_ACKNOWLEDGE))) {
if (c->channelno > 0) {
ctrl->ev.e = PRI_EVENT_SERVICE_ACK;
ctrl->ev.service_ack.channel = c->channelno | (c->ds1no << 8);
@@ -4390,9 +4423,9 @@
}
}
return Q931_RES_HAVEEVENT;
- default:
- pri_error(ctrl, "!! Don't know how to post-handle maintenance message type %s (%d)\n", maintenance_msg2str(mh->msg), mh->msg);
- }
+ }
+
+ pri_error(ctrl, "!! Don't know how to post-handle maintenance message type %d\n", mh->msg);
return -1;
}
More information about the svn-commits
mailing list