[libss7-commits] mattf: trunk r70 - in /trunk: isup.c isup.h mtp2.c mtp2.h

[libss7-commits at lists.digium.com]

Author: mattf
Date: Wed Nov  8 13:29:53 2006
New Revision: 70

URL: http://svn.digium.com/view/libss7?rev=70&view=rev
Log:
Update retranmission counts as well as ISUP support for additional optional 
parameter

Modified:
    trunk/isup.c
    trunk/isup.h
    trunk/mtp2.c
    trunk/mtp2.h

Modified: trunk/isup.c
URL: http://svn.digium.com/view/libss7/trunk/isup.c?rev=70&r1=69&r2=70&view=diff
==============================================================================
--- trunk/isup.c (original)
+++ trunk/isup.c Wed Nov  8 13:29:53 2006
@@ -416,6 +416,16 @@
 	return 2;
 }
 
+static FUNC_RECV(opt_backward_call_ind_receive)
+{
+	return 1;
+}
+
+static FUNC_DUMP(opt_backward_call_ind_dump)
+{
+	return 1;
+}
+
 static FUNC_RECV(cause_receive)
 {
 	c->causeloc = parm[0] & 0xf;
@@ -666,6 +676,7 @@
 	{ISUP_PARM_PROPAGATION_DELAY, "Propagation Delay"},
 	{ISUP_PARM_HOP_COUNTER, "Hop Counter"},
 	{ISUP_PARM_BACKWARD_CALL_IND, "Backward Call Indicator", backward_call_ind_dump, backward_call_ind_receive, backward_call_ind_transmit},
+	{ISUP_PARM_BACKWARD_CALL_IND, "Optional Backward Call Indicator", opt_backward_call_ind_dump, opt_backward_call_ind_receive, NULL},
 	{ISUP_PARM_CIRCUIT_GROUP_SUPERVISION_IND, "Circuit Group Supervision Indicator", circuit_group_supervision_dump, circuit_group_supervision_receive, circuit_group_supervision_transmit},
 	{ISUP_PARM_RANGE_AND_STATUS, "Range and status", range_and_status_dump, range_and_status_receive, range_and_status_transmit},
 	{ISUP_PARM_EVENT_INFO, "Event Information", event_info_dump, event_info_receive, event_info_transmit},

Modified: trunk/isup.h
URL: http://svn.digium.com/view/libss7/trunk/isup.h?rev=70&r1=69&r2=70&view=diff
==============================================================================
--- trunk/isup.h (original)
+++ trunk/isup.h Wed Nov  8 13:29:53 2006
@@ -84,6 +84,7 @@
 #define ISUP_PARM_SELECTION_INFO 0xee
 #define ISUP_PARM_CHARGE_NUMBER 0xeb
 #define ISUP_PARM_CIRCUIT_ASSIGNMENT_MAP 0x25
+#define ISUP_PARM_OPT_BACKWARD_CALL_IND 0x29
 #define ISUP_PARM_CONNECTION_REQ 0x0d
 #define ISUP_PARM_CONTINUITY_IND 0x10
 #define ISUP_PARM_CUG_INTERLOCK_CODE 0x1c

Modified: trunk/mtp2.c
URL: http://svn.digium.com/view/libss7/trunk/mtp2.c?rev=70&r1=69&r2=70&view=diff
==============================================================================
--- trunk/mtp2.c (original)
+++ trunk/mtp2.c Wed Nov  8 13:29:53 2006
@@ -118,6 +118,7 @@
 	link->curfib = 1;
 	link->curbib = 1;
 	link->lastfsnacked = 127;
+	link->retransmissioncount = 0;
 
 	flush_bufs(link);
 }
@@ -652,10 +653,6 @@
 {
 	int res = 0;
 
-#if 0
-	mtp_message(link->master, "Txbuf contains %d items\n", len_txbuf(link));
-#endif
-
 	switch (link->state) {
 		case MTP_ALIGNEDREADY:
 			mtp2_setstate(link, MTP_INSERVICE);
@@ -681,6 +678,7 @@
 
 	if (h->fsn != ((link->lastfsnacked+1) % 128)) {
 		mtp_message(link->master, "Received out of sequence MSU w/ fsn of %d, lastfsnacked = %d, requesting retransmission\n", h->fsn, link->lastfsnacked);
+		link->retransmissioncount++;
 		link->curbib = !link->curbib;
 		return 0;
 	}

Modified: trunk/mtp2.h
URL: http://svn.digium.com/view/libss7/trunk/mtp2.h?rev=70&r1=69&r2=70&view=diff
==============================================================================
--- trunk/mtp2.h (original)
+++ trunk/mtp2.h Wed Nov  8 13:29:53 2006
@@ -91,22 +91,26 @@
 	unsigned char curbib:1;
 	int fd;
 
+	/* Timers */
 	int t1;
 	int t2;
 	int t3;
 	int t4;
+	struct mtp2_timers timers;
 
 	int slc;
 
 	int emergency;
 	int provingperiod;
-	int retransmitting;
 	unsigned int dpc;
+
 	int autotxsutype;
 	int lastsurxd;
 	int lastsutxd;
 	int sent_tra;
-	struct mtp2_timers timers;
+
+	/* Line related stats */
+	unsigned int retransmissioncount;
 
 	struct ss7_msg *tx_buf;
 	struct ss7_msg *tx_q;