remove extraneous svn:executable properties

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/0.5.1@266 2fbb986a-6c06-0410-b554-c9c1f0a7f128
automatic tag renames
2005-11-29 18:39:18 +00:00 · 2005-11-27 04:17:23 +00:00 · 2004-01-17 15:14:11 +00:00 · 2004-01-17 15:14:11 +00:00 · 2003-12-09 15:55:48 +00:00 · 2003-12-05 23:10:33 +00:00
14 changed files with 412 additions and 85 deletions
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/libpri.h
+++ b/libpri.h
--- a/pri.c
+++ b/pri.c
@@ -285,7 +285,7 @@ int pri_call(struct pri *pri, q931_call *c, int transmode, int channel, int excl
 {
 	if (!pri || !c)
 		return -1;
-	return q931_setup(pri, c, transmode, channel, exclusive, nonisdn, caller, callerplan, callername, callerpres, called, calledplan, ulayer1);					
+	return q931_setup(pri, c, transmode, channel, exclusive, nonisdn, caller, callerplan, callername, callerpres, called, calledplan, ulayer1);
 }	

 static void (*__pri_error)(char *stuff);
--- a/pri_internal.h
+++ b/pri_internal.h
@@ -58,6 +58,7 @@ struct pri {
 	int v_na;			/* What we've told our peer we've acknowledged */
 	int solicitfbit;	/* Have we sent an I or S frame with the F-bit set? */
 	int retrans;		/* Retransmissions */
+	int sentrej;		/* Are we in reject state */
 	
 	int cref;			/* Next call reference value */
 	
--- a/pri_q921.h
+++ b/pri_q921.h
--- a/pri_q931.h
+++ b/pri_q931.h
--- a/pridump.c
+++ b/pridump.c
--- a/prisched.c
+++ b/prisched.c
--- a/pritest.c
+++ b/pritest.c
--- a/q921.c
+++ b/q921.c
@@ -49,6 +49,8 @@
 	(hf).h.tei = 0; \
 } while(0)

+static void reschedule_t203(struct pri *pri);
+
 static void q921_discard_retransmissions(struct pri *pri)
 {
 	struct q921_frame *f, *p;
@@ -62,7 +64,8 @@ static void q921_discard_retransmissions(struct pri *pri)
 	pri->txqueue = NULL;
 }

-static int q921_transmit(struct pri *pri, q921_h *h, int len) {
+static int q921_transmit(struct pri *pri, q921_h *h, int len) 
+{
 	int res;
 #ifdef RANDOM_DROPS
   if (!(random() % 3)) {
@@ -80,6 +83,7 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len) {
 		pri_error("Short write: %d/%d (%s)\n", res, len + 2, strerror(errno));
 		return -1;
 	}
+	reschedule_t203(pri);
 	return 0;
 }

@@ -174,17 +178,33 @@ static int q921_ack_packet(struct pri *pri, int num)

 static void t203_expire(void *);
 static void t200_expire(void *);
+static pri_event *q921_dchannel_down(struct pri *pri);

-static void q921_ack_rx(struct pri *pri, int ack)
+static void reschedule_t203(struct pri *pri)
+{
+	if (pri->t203_timer) {
+		pri_schedule_del(pri, pri->t203_timer);
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
+			pri_message("-- Restarting T203 counter\n");
+		/* Nothing to transmit, start the T203 counter instead */
+		pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+	}
+}
+
+static pri_event *q921_ack_rx(struct pri *pri, int ack)
 {
 	int x;
 	int cnt=0;
+	pri_event *ev;
 	/* Make sure the ACK was within our window */
 	for (x=pri->v_a; (x != pri->v_s) && (x != ack); Q921_INC(x));
 	if (x != ack) {
 		/* ACK was outside of our window --- ignore */
-		pri_error("ACK received outside of window, ignoring\n");
-		return;
+		pri_error("ACK received outside of window, restarting\n");
+		ev = q921_dchannel_down(pri);
+		q921_start(pri, 1);
+		pri->schedev = 1;
+		return ev;
 	}
 	/* Cancel each packet as necessary */
 	if (pri->debug & PRI_DEBUG_Q921_STATE)
@@ -216,9 +236,10 @@ static void q921_ack_rx(struct pri *pri, int ack)
 		/* Nothing to transmit, start the T203 counter instead */
 		pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
 	}
+	return NULL;
 }

-static void q921_reject(struct pri *pri)
+static void q921_reject(struct pri *pri, int pf)
 {
 	q921_h h;
 	Q921_INIT(h);
@@ -226,7 +247,7 @@ static void q921_reject(struct pri *pri)
 	h.s.ss = 2;	/* Reject */
 	h.s.ft = 1;	/* Frametype (01) */
 	h.s.n_r = pri->v_r;	/* Where to start retransmission */
-	h.s.p_f = 1;	/* XXX Should it always be set to 1? XXX */
+	h.s.p_f = pf;	
 	switch(pri->localtype) {
 	case PRI_NETWORK:
 		h.h.c_r = 0;
@@ -240,10 +261,11 @@ static void q921_reject(struct pri *pri)
 	}
 	if (pri->debug & PRI_DEBUG_Q921_STATE)
 		pri_message("Sending Reject (%d)\n", pri->v_r);
+	pri->sentrej = 1;
 	q921_transmit(pri, &h, 4);
 }

-static void q921_rr(struct pri *pri, int pbit) {
+static void q921_rr(struct pri *pri, int pbit, int cmd) {
 	q921_h h;
 	Q921_INIT(h);
 	h.s.x0 = 0;	/* Always 0 */
@@ -253,10 +275,16 @@ static void q921_rr(struct pri *pri, int pbit) {
 	h.s.p_f = pbit;		/* Poll/Final set appropriately */
 	switch(pri->localtype) {
 	case PRI_NETWORK:
-		h.h.c_r = 0;
+		if (cmd)
+			h.h.c_r = 1;
+		else
+			h.h.c_r = 0;
 		break;
 	case PRI_CPE:
-		h.h.c_r = 1;
+		if (cmd)
+			h.h.c_r = 0;
+		else
+			h.h.c_r = 1;
 		break;
 	default:
 		pri_error("Don't know how to U/A on a type %d node\n", pri->localtype);
@@ -268,8 +296,6 @@ static void q921_rr(struct pri *pri, int pbit) {
 	q921_transmit(pri, &h, 4);
 }

-static pri_event *q921_dchannel_down(struct pri *pri);
-
 static void t200_expire(void *vpri)
 {
 	struct pri *pri = vpri;
@@ -289,14 +315,17 @@ static void t200_expire(void *vpri)
         /* Reschedule t200_timer */
         if (pri->debug & PRI_DEBUG_Q921_STATE)
            pri_message("-- Retransmitting %d bytes\n", pri->txqueue->len);
-   		q921_transmit(pri, (q921_h *)&pri->txqueue->h, pri->txqueue->len);
+		if (pri->busy) 
+			q921_rr(pri, 1, 0);
+		else
+			q921_transmit(pri, (q921_h *)&pri->txqueue->h, pri->txqueue->len);
         if (pri->debug & PRI_DEBUG_Q921_STATE) 
               pri_message("-- Rescheduling retransmission (%d)\n", pri->retrans);
         pri->t200_timer = pri_schedule_event(pri, T_200, t200_expire, pri);
      } else {
         if (pri->debug & PRI_DEBUG_Q921_STATE) 
               pri_message("-- Timeout occured, restarting PRI\n");
-         pri->state = Q921_LINK_CONNECTION_RELEASED;
+         pri->q921_state = Q921_LINK_CONNECTION_RELEASED;
      	pri->t200_timer = 0;
         q921_dchannel_down(pri);
         q921_start(pri, 1);
@@ -344,8 +373,9 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 		else
 			pri->txqueue = f;
 		/* Immediately transmit unless we're in a recovery state */
-		if (!pri->retrans)
+		if (!pri->retrans && !pri->busy) {
 			q921_transmit(pri, (q921_h *)(&f->h), f->len);
+		}
 		if (pri->t203_timer) {
 			if (pri->debug & PRI_DEBUG_Q921_STATE)
 				pri_message("Stopping T_203 timer\n");
@@ -370,47 +400,57 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 static void t203_expire(void *vpri)
 {
 	struct pri *pri = vpri;
-	if (pri->debug &  PRI_DEBUG_Q921_STATE)
-		pri_message("T203 counter expired, sending RR and scheduling T203 again\n");
-	/* Solicit an F-bit in the other's RR */
-	pri->solicitfbit = 1;
-	q921_rr(pri, 1);
-	/* Restart ourselves */
-	pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+	if (pri->q921_state == Q921_LINK_CONNECTION_ESTABLISHED) {
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
+			pri_message("T203 counter expired, sending RR and scheduling T203 again\n");
+		/* Solicit an F-bit in the other's RR */
+		pri->solicitfbit = 1;
+		q921_rr(pri, 1, 1);
+		/* Restart ourselves */
+		pri->t203_timer = pri_schedule_event(pri, T_203, t203_expire, pri);
+	} else {
+		if (pri->debug &  PRI_DEBUG_Q921_STATE)
+			pri_message("T203 counter expired in weird statd %d\n", pri->q921_state);
+		pri->t203_timer = 0;
+	}
 }

 static pri_event *q921_handle_iframe(struct pri *pri, q921_i *i, int len)
 {
 	int res;
+	pri_event *ev;
 	/* Make sure this is a valid packet */
 	if (i->n_s == pri->v_r) {
 		/* Increment next expected I-frame */
 		Q921_INC(pri->v_r);
 		/* Handle their ACK */
-		q921_ack_rx(pri, i->n_r);
+		pri->sentrej = 0;
+		ev = q921_ack_rx(pri, i->n_r);
+		if (ev)
+			return ev;
 		if (i->p_f) {
 			/* If the Poll/Final bit is set, immediate send the RR */
-			q921_rr(pri, 1);
+			q921_rr(pri, 1, 0);
+		} else if (pri->busy) {
+			q921_rr(pri, 0, 0);
 		}
 		/* Receive Q.931 data */
 		res = q931_receive(pri, (q931_h *)i->data, len - 4);
 		/* Send an RR if one wasn't sent already */
 		if (pri->v_na != pri->v_r) 
-			q921_rr(pri, 0);
+			q921_rr(pri, 0, 0);
 		if (res == -1) {
 			return NULL;
 		}
 		if (res & Q931_RES_HAVEEVENT)
 			return &pri->ev;
 	} else {
-		if (((pri->v_r - i->n_s) & 127) < pri->window) {
-			/* It's within our window -- send back an RR */
-			q921_rr(pri, 0);
-		} else
-			q921_reject(pri);
-#if 0
-		q931_reject(pri);
-#endif		
+		/* If we haven't already sent a reject, send it now, otherwise
+		   we are obliged to RR */
+		if (!pri->sentrej)
+			q921_reject(pri, i->p_f);
+		else if (i->p_f)
+			q921_rr(pri, 1, 0);
 	}
 	return NULL;
 }
@@ -553,6 +593,9 @@ static pri_event *q921_dchannel_up(struct pri *pri)
 	pri_schedule_del(pri, pri->sabme_timer);
 	pri->sabme_timer = 0;
 	
+	/* Reset any rejects */
+	pri->sentrej = 0;
+	
 	/* Go into connection established state */
 	pri->q921_state = Q921_LINK_CONNECTION_ESTABLISHED;

@@ -592,13 +635,16 @@ void q921_reset(struct pri *pri)
 	pri->solicitfbit = 0;
 	pri->q921_state = Q921_LINK_CONNECTION_RELEASED;
 	pri->retrans = 0;
+	pri->sentrej = 0;
+	
 	/* Discard anything waiting to go out */
 	q921_discard_retransmissions(pri);
 }

-pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
+static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 {
 	q921_frame *f;
+	pri_event *ev;
 	int sendnow;
 	/* Discard FCS */
 	len -= 2;
@@ -646,7 +692,9 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 			/* Receiver Ready */
 			pri->busy = 0;
 			/* Acknowledge frames as necessary */
-			q921_ack_rx(pri, h->s.n_r);
+			ev = q921_ack_rx(pri, h->s.n_r);
+			if (ev)
+				return ev;
 			if (h->s.p_f) {
 				/* If it's a p/f one then send back a RR in return with the p/f bit set */
 				if (pri->solicitfbit) {
@@ -655,26 +703,28 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 				} else {
 					if (pri->debug & PRI_DEBUG_Q921_STATE) 
 						pri_message("-- Unsolicited RR with P/F bit, responding\n");
-						q921_rr(pri, 1);
+						q921_rr(pri, 1, 0);
 				}
 				pri->solicitfbit = 0;
 			}
 			break;
-#if 0
      case 1:
         /* Receiver not ready */
         if (pri->debug & PRI_DEBUG_Q921_STATE)
            pri_message("-- Got receiver not ready\n");
+	 if(h->s.p_f) {
+		/* Send RR if poll bit set */
+		q921_rr(pri, h->s.p_f, 0);
+	 }
         pri->busy = 1;
         break;   
-#endif         
      case 2:
         /* Just retransmit */
         if (pri->debug & PRI_DEBUG_Q921_STATE)
            pri_message("-- Got reject requesting packet %d...  Retransmitting.\n", h->s.n_r);
         if (h->s.p_f) {
            /* If it has the poll bit set, send an appropriate supervisory response */
-            q921_rr(pri, 1);
+            q921_rr(pri, 1, 0);
         }
 		 sendnow = 0;
         /* Resend the proper I-frame */
@@ -726,7 +776,6 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 				if (h->u.p_f) {
 					/* Section 5.7.1 says we should restart on receiving a DM response with the f-bit set to
 					   one, but we wait T200 first */
-					pri_event *ev = NULL;
 					if (pri->debug & PRI_DEBUG_Q921_STATE)
 						pri_message("-- Got DM Mode from peer.\n");
 					/* Disconnected mode, try again after T200 */
@@ -752,7 +801,9 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 				pri_message("-- Got Disconnect from peer.\n");
 			/* Acknowledge */
 			q921_send_ua(pri, h->u.p_f);
-			return q921_dchannel_down(pri);
+			ev = q921_dchannel_down(pri);
+			q921_start(pri, 0);
+			return ev;
 		case 3:
 			if (h->u.m2 == 3) {
 				/* SABME */
@@ -802,6 +853,14 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 	return NULL;
 }

+pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
+{
+	pri_event *e;
+	e = __q921_receive(pri, h, len);
+	reschedule_t203(pri);
+	return e;
+}
+
 void q921_start(struct pri *pri, int now)
 {
 	if (pri->q921_state != Q921_LINK_CONNECTION_RELEASED) {
--- a/q931.c
+++ b/q931.c
@@ -32,9 +32,12 @@
 #include <string.h>
 #include <stdio.h>

+#define MAX_MAND_IES 10
+
 struct msgtype {
 	int msgnum;
 	unsigned char *name;
+	int mandies[MAX_MAND_IES];
 };

 struct msgtype msgs[] = {
@@ -43,26 +46,26 @@ struct msgtype msgs[] = {
 	{ Q931_CALL_PROCEEDING, "CALL PROCEEDING" },
 	{ Q931_CONNECT, "CONNECT" },
 	{ Q931_CONNECT_ACKNOWLEDGE, "CONNECT ACKNOWLEDGE" },
-	{ Q931_PROGRESS, "PROGRESS" },
-	{ Q931_SETUP, "SETUP" },
+	{ Q931_PROGRESS, "PROGRESS", { Q931_PROGRESS_INDICATOR } },
+	{ Q931_SETUP, "SETUP", { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT } },
 	{ Q931_SETUP_ACKNOWLEDGE, "SETUP ACKNOWLEDGE" },
 	
 	/* Call disestablishment messages */
-	{ Q931_DISCONNECT, "DISCONNECT" },
+	{ Q931_DISCONNECT, "DISCONNECT", { Q931_CAUSE } },
 	{ Q931_RELEASE, "RELEASE" },
 	{ Q931_RELEASE_COMPLETE, "RELEASE COMPLETE" },
-	{ Q931_RESTART, "RESTART" },
-	{ Q931_RESTART_ACKNOWLEDGE, "RESTART ACKNOWLEDGE" },
+	{ Q931_RESTART, "RESTART", { Q931_RESTART_INDICATOR } },
+	{ Q931_RESTART_ACKNOWLEDGE, "RESTART ACKNOWLEDGE", { Q931_RESTART_INDICATOR } },

 	/* Miscellaneous */
-	{ Q931_STATUS, "STATUS" },
+	{ Q931_STATUS, "STATUS", { Q931_CAUSE, Q931_CALL_STATE } },
 	{ Q931_STATUS_ENQUIRY, "STATUS ENQUIRY" },
 	{ Q931_USER_INFORMATION, "USER_INFORMATION" },
 	{ Q931_SEGMENT, "SEGMENT" },
 	{ Q931_CONGESTION_CONTROL, "CONGESTION CONTROL" },
 	{ Q931_INFORMATION, "INFORMATION" },
 	{ Q931_FACILITY, "FACILITY" },
-	{ Q931_NOTIFY, "NOTIFY" },
+	{ Q931_NOTIFY, "NOTIFY", { Q931_IE_NOTIFY_IND } },

 	/* Call Management */
 	{ Q931_HOLD, "HOLD" },
@@ -72,8 +75,8 @@ struct msgtype msgs[] = {
 	{ Q931_RETRIEVE_ACKNOWLEDGE, "RETRIEVE ACKNOWLEDGE" },
 	{ Q931_RETRIEVE_REJECT, "RETRIEVE REJECT" },
 	{ Q931_RESUME, "RESUME" },
-	{ Q931_RESUME_ACKNOWLEDGE, "RESUME ACKNOWLEDGE" },
-	{ Q931_RESUME_REJECT, "RESUME REJECT" },
+	{ Q931_RESUME_ACKNOWLEDGE, "RESUME ACKNOWLEDGE", { Q931_CHANNEL_IDENT } },
+	{ Q931_RESUME_REJECT, "RESUME REJECT", { Q931_CAUSE } },
 	{ Q931_SUSPEND, "SUSPEND" },
 	{ Q931_SUSPEND_ACKNOWLEDGE, "SUSPEND ACKNOWLEDGE" },
 	{ Q931_SUSPEND_REJECT, "SUSPEND REJECT" },
@@ -179,7 +182,12 @@ struct msgtype causes[] = {
 #define LOC_INTERNATIONAL_NETWORK	0x7
 #define LOC_NETWORK_BEYOND_INTERWORKING	0xa

+#define T_308			4000
+#define T_305			30000
+#define T_313			4000
+
 struct q931_call {
+	struct pri *pri;	/* PRI */
 	int cr;		/* Call Reference */
 	int forceinvert;	/* Force inversion of call number even if 0 */
 	q931_call *next;
@@ -220,6 +228,7 @@ struct q931_call {
 	
 	int peercallstate;			/* Call state of peer as reported */
 	int ourcallstate;		/* Our call state */
+	int sugcallstate;		/* Status call state */
 	
 	int callerplan;
 	int callerpres;			/* Caller presentation */
@@ -230,7 +239,10 @@ struct q931_call {
 	int nonisdn;
 	char callednum[256];	/* Called Number */
 	int complete;			/* no more digits coming */
+	int newcall;		/* if the received message has a new call reference value */

+	int retranstimer;		/* Timer for retransmitting DISC */
+	int t308_timedout;		/* Whether t308 timed out once */
 	int redirectingplan;
 	int redirectingpres;
 	int redirectingreason;	      
@@ -273,6 +285,7 @@ static void call_init(struct q931_call *c)
 	c->chanflags = 0;
 	c->next = NULL;
 	c->sentchannel = 0;
+	c->newcall = 1;
 	c->ourcallstate = Q931_CALL_STATE_NULL;
 	c->peercallstate = Q931_CALL_STATE_NULL;
 }
@@ -908,7 +921,7 @@ static int receive_display(struct pri *pri, q931_call *call, int msgtype, q931_i

 static int transmit_display(struct pri *pri, q931_call *call, int msgtype, q931_ie *ie, int len)
 {
-	if (pri->switchtype != PRI_SWITCH_NI1) {
+	if ((pri->switchtype != PRI_SWITCH_NI1) && strlen(call->callername)) {
 		ie->data[0] = 0xb1;
 		memcpy(ie->data + 1, call->callername, strlen(call->callername));
 		return 3 + strlen(call->callername);
@@ -958,7 +971,7 @@ static int transmit_call_state(struct pri *pri, q931_call *call, int msgtype, q9

 static int receive_call_state(struct pri *pri, q931_call *call, int msgtype, q931_ie *ie, int len)
 {
-	call->ourcallstate = ie->data[0] & 0x3f;
+	call->sugcallstate = ie->data[0] & 0x3f;
 	return 0;
 }

@@ -1238,9 +1251,22 @@ static inline int q931_cr(q931_h *h)
 		pri_error("Call Reference Length Too long: %d\n", h->crlen);
 		return -1;
 	}
-	for (x=0;x<h->crlen;x++) {
-		cr <<= 8;
-		cr |= h->crv[x];
+	switch (h->crlen) {
+		case 2: 
+			for (x=0;x<h->crlen;x++) {
+				cr <<= 8;
+				cr |= h->crv[x];
+			}
+			break;
+		case 1:
+			cr = h->crv[0];
+			if (cr & 0x80) {
+				cr &= ~0x80;
+				cr |= 0x8000;
+			}
+			break;
+		default:
+			pri_error("Call Reference Length not supported: %d\n", h->crlen);
 	}
 	return cr;
 }
@@ -1279,6 +1305,7 @@ static q931_call *q931_getcall(struct pri *pri, int cr)
 		call_init(cur);
 		/* Call reference */
 		cur->cr = cr;
+		cur->pri = pri;
 		/* Append to end of list */
 		if (prev)
 			prev->next = cur;
@@ -1318,6 +1345,8 @@ static void q931_destroycall(struct pri *pri, int cr)
 				pri->calls = cur->next;
 			if (pri->debug & PRI_DEBUG_Q931_STATE)
 				pri_message("NEW_HANGUP DEBUG: Destroying the call, ourstate %s, peerstate %s\n",callstate2str(cur->ourcallstate),callstate2str(cur->peercallstate));
+			if (cur->retranstimer)
+				pri_schedule_del(pri, cur->retranstimer);
 			free(cur);
 			return;
 		}
@@ -1478,21 +1507,24 @@ static int send_message(struct pri *pri, q931_call *c, int msgtype, int ies[])

 static int status_ies[] = { Q931_CAUSE, Q931_CALL_STATE, -1 };

-static int q931_status(struct pri *pri, q931_call *c)
+static int q931_status(struct pri *pri, q931_call *c, int cause)
 {
 	q931_call *cur = NULL;
+	if (!cause)
+		cause = PRI_CAUSE_RESPONSE_TO_STATUS_ENQUIRY;
 	if (c->cr > -1)
 		cur = pri->calls;
 	while(cur) {
 		if (cur->cr == c->cr) {
-			cur->cause=PRI_CAUSE_RESPONSE_TO_STATUS_ENQUIRY;
+			cur->cause=cause;
 			cur->causecode = CODE_CCITT;
-			cur->causeloc = LOC_PRIV_NET_LOCAL_USER;
+			cur->causeloc = LOC_USER;
 			break;
 		}
 		cur = cur->next;
 	}
 	if (!cur) {
+		pri_message("YYY Here we get reset YYY\n");
 		/* something went wrong, respond with "no such call" */
 		c->ourcallstate = Q931_CALL_STATE_NULL;
 		c->peercallstate = Q931_CALL_STATE_NULL;
@@ -1575,6 +1607,47 @@ int q931_setup_ack(struct pri *pri, q931_call *c, int channel, int nonisdn)
 	return send_message(pri, c, Q931_SETUP_ACKNOWLEDGE, connect_ies);
 }

+static void pri_connect_timeout(void *data)
+{
+	struct q931_call *c = data;
+	struct pri *pri = c->pri;
+	if (pri->debug & PRI_DEBUG_Q931_STATE)
+		pri_message("Timed out looking for connect acknowledge\n");
+	q931_disconnect(pri, c, PRI_CAUSE_NORMAL_CLEARING);
+	
+}
+
+static void pri_release_timeout(void *data)
+{
+	struct q931_call *c = data;
+	struct pri *pri = c->pri;
+	if (pri->debug & PRI_DEBUG_Q931_STATE)
+		pri_message("Timed out looking for release complete\n");
+	c->t308_timedout++;
+	c->alive = 1;
+	q931_release(pri, c, PRI_CAUSE_NORMAL_CLEARING);
+}
+
+static void pri_release_finaltimeout(void *data)
+{
+	struct q931_call *c = data;
+	struct pri *pri = c->pri;
+	c->alive = 1;
+	if (pri->debug & PRI_DEBUG_Q931_STATE)
+		pri_message("Final time-out looking for release complete\n");
+	c->t308_timedout++;
+}
+
+static void pri_disconnect_timeout(void *data)
+{
+	struct q931_call *c = data;
+	struct pri *pri = c->pri;
+	if (pri->debug & PRI_DEBUG_Q931_STATE)
+		pri_message("Timed out looking for release\n");
+	c->alive = 1;
+	q931_release(pri, c, PRI_CAUSE_NORMAL_CLEARING);
+}
+
 int q931_connect(struct pri *pri, q931_call *c, int channel, int nonisdn)
 {
 	if (channel)
@@ -1590,6 +1663,11 @@ int q931_connect(struct pri *pri, q931_call *c, int channel, int nonisdn)
 	c->ourcallstate = Q931_CALL_STATE_CONNECT_REQUEST;
 	c->peercallstate = Q931_CALL_STATE_ACTIVE;
 	c->alive = 1;
+	/* Setup timer */
+	if (c->retranstimer)
+		pri_schedule_del(pri, c->retranstimer);
+	if (pri->localtype == PRI_CPE)
+		c->retranstimer = pri_schedule_event(pri, T_313, pri_connect_timeout, c);
 	return send_message(pri, c, Q931_CONNECT, connect_ies);
 }

@@ -1604,9 +1682,16 @@ int q931_release(struct pri *pri, q931_call *c, int cause)
 		c->cause = cause;
 		c->causecode = CODE_CCITT;
 		c->causeloc = LOC_PRIV_NET_LOCAL_USER;
-		if (c->acked)
+		if (c->acked) {
+			if (c->retranstimer)
+				pri_schedule_del(pri, c->retranstimer);
+			if (!c->t308_timedout) {
+				c->retranstimer = pri_schedule_event(pri, T_308, pri_release_timeout, c);
+			} else {
+				c->retranstimer = pri_schedule_event(pri, T_308, pri_release_finaltimeout, c);
+			}
 			return send_message(pri, c, Q931_RELEASE, release_ies);
-		else
+		} else
 			return send_message(pri, c, Q931_RELEASE_COMPLETE, release_ies); /* Yes, release_ies, not release_complete_ies */
 	} else
 		return 0;
@@ -1643,6 +1728,9 @@ int q931_disconnect(struct pri *pri, q931_call *c, int cause)
 		c->causecode = CODE_CCITT;
 		c->causeloc = LOC_PRIV_NET_LOCAL_USER;
 		c->sendhangupack = 1;
+		if (c->retranstimer)
+			pri_schedule_del(pri, c->retranstimer);
+		c->retranstimer = pri_schedule_event(pri, T_305, pri_disconnect_timeout, c);
 		return send_message(pri, c, Q931_DISCONNECT, disconnect_ies);
 	} else
 		return 0;
@@ -1669,7 +1757,7 @@ int q931_setup(struct pri *pri, q931_call *c, int transmode, int channel, int ex
 	c->slotmap = -1;
 	c->ds1no = -1;
 	c->nonisdn = nonisdn;
-		
+	c->newcall = 0;		
 	if (exclusive) 
 		c->chanflags = FLAG_EXCLUSIVE;
 	else
@@ -1803,11 +1891,15 @@ int q931_hangup(struct pri *pri, q931_call *c, int cause)
 		break;
 	case Q931_CALL_STATE_DISCONNECT_REQUEST:
 		/* sent DISCONNECT */
+		q931_release(pri,c,cause);
 		break;
 	case Q931_CALL_STATE_DISCONNECT_INDICATION:
 		/* received DISCONNECT */
-		if (c->peercallstate == Q931_CALL_STATE_DISCONNECT_REQUEST)
+		if (c->peercallstate == Q931_CALL_STATE_DISCONNECT_REQUEST) {
+			c->alive = 1;
 			q931_release(pri,c,cause);
+		}
+		break;
 	case Q931_CALL_STATE_RELEASE_REQUEST:
 		/* sent RELEASE */
 		/* don't do anything, waiting for RELEASE_COMPLETE */
@@ -1830,9 +1922,12 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 	q931_mh *mh;
 	q931_call *c;
 	q931_ie *ie;
-	int x;
+	unsigned int x;
+	int y;
 	int res;
 	int r;
+	int mandies[MAX_MAND_IES];
+	int missingmand;
 	if (pri->debug & PRI_DEBUG_Q931_DUMP)
 		q931_dump(h, len, 0);
 	mh = (q931_mh *)(h->contents + h->crlen);
@@ -1840,9 +1935,12 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		/* This is the weird maintenance stuff.  We majorly
 		   KLUDGE this by changing byte 4 from a 0xf (SERVICE) 
 		   to a 0x7 (SERVICE ACKNOWLEDGE) */
-		h->raw[3] -= 0x8;
+		h->raw[h->crlen + 2] -= 0x8;
 		q931_xmit(pri, h, len, 1);
 		return 0;
+	} else if (h->pd != Q931_PROTOCOL_DISCRIMINATOR) {
+		pri_error("Warning: unknown protocol discriminator received\n");
+		return 0;
 	}
 	c = q931_getcall(pri, q931_cr(h));
 	if (!c) {
@@ -1898,8 +1996,12 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 	case Q931_PROGRESS:
 		c->progress = -1;
 		break;
-	case Q931_CALL_PROCEEDING:
 	case Q931_CONNECT_ACKNOWLEDGE:
+		if (c->retranstimer)
+			pri_schedule_del(pri, c->retranstimer);
+		c->retranstimer = 0;
+		/* Fall through */
+	case Q931_CALL_PROCEEDING:
 		/* Do nothing */
 		break;
 	case Q931_RELEASE:
@@ -1907,12 +2009,19 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		c->cause = -1;
 		c->causecode = -1;
 		c->causeloc = -1;
+		if (c->retranstimer)
+			pri_schedule_del(pri, c->retranstimer);
+		c->retranstimer = 0;
 		break;
 	case Q931_RELEASE_COMPLETE:
+		if (c->retranstimer)
+			pri_schedule_del(pri, c->retranstimer);
+		c->retranstimer = 0;
 	case Q931_STATUS:
 		c->cause = -1;
 		c->causecode = -1;
 		c->causeloc = -1;
+		c->sugcallstate = -1;
 		break;
 	case Q931_RESTART_ACKNOWLEDGE:
 		c->channelno = -1;
@@ -1923,10 +2032,11 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		break;
 	case Q931_SETUP_ACKNOWLEDGE:
 		break;
+	case Q931_NOTIFY:
+		break;
 	case Q931_USER_INFORMATION:
 	case Q931_SEGMENT:
 	case Q931_CONGESTION_CONTROL:
-	case Q931_NOTIFY:
 	case Q931_HOLD:
 	case Q931_HOLD_ACKNOWLEDGE:
 	case Q931_HOLD_REJECT:
@@ -1940,29 +2050,66 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 	case Q931_SUSPEND_ACKNOWLEDGE:
 	case Q931_SUSPEND_REJECT:
 		pri_error("!! Not yet handling pre-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
-		return -1;
-		
+		/* Fall through */
 	default:
-		pri_error("!! Don't know how to pre-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
+		pri_error("!! Don't know how to post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
+		q931_status(pri,c, PRI_CAUSE_MESSAGE_TYPE_NONEXIST);
+		if (c->newcall) 
+			q931_destroycall(pri,c->cr);
 		return -1;
 	}
+	memset(mandies, 0, sizeof(mandies));
+	missingmand = 0;
+	for (x=0;x<sizeof(msgs) / sizeof(msgs[0]); x++)  {
+		if (msgs[x].msgnum == mh->msg) {
+			memcpy(mandies, msgs[x].mandies, sizeof(mandies));
+		}
+	}
 	x = 0;
 	/* Do real IE processing */
 	len -= (h->crlen + 3);
 	while(len) {
 		ie = (q931_ie *)(mh->data + x);
+		for (y=0;y<MAX_MAND_IES;y++) {
+			if (mandies[y] == ie->ie)
+				mandies[y] = 0;
+		}
 		r = ielen(ie);
 		if (r > len) {
 			pri_error("XXX Message longer than it should be?? XXX\n");
 			return -1;
 		}
-		q931_handle_ie(pri, c, mh->msg, ie);
+		y = q931_handle_ie(pri, c, mh->msg, ie);
+		if (!(ie->ie & 0xf0) && (y < 0))
+		    mandies[MAX_MAND_IES - 1] = ie->ie;
 		x += r;
 		len -= r;
 	}
+	missingmand = 0;
+	for (x=0;x<MAX_MAND_IES;x++) {
+		if (mandies[x]) {
+			pri_error("XXX Missing mandatory IE %d/%s XXX\n", mandies[x], ie2str(mandies[x]));
+			missingmand++;
+		}
+	}
+	/* check if there is no channel identyfication when we're configured as network -> that's not an error */
+	if (missingmand && pri->localtype == PRI_NETWORK && mh->msg == Q931_SETUP) {
+		for (x=0;x<MAX_MAND_IES;x++) {
+			if (mandies[x] == Q931_CHANNEL_IDENT) {
+				missingmand--;
+				break;
+			}
+		}
+	}
+	
 	/* Post handling */
 	switch(mh->msg) {
 	case Q931_RESTART:
+		if (missingmand) {
+			q931_status(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
+			q931_destroycall(pri, c->cr);
+			break;
+		}
 		c->ourcallstate = Q931_CALL_STATE_RESTART;
 		c->peercallstate = Q931_CALL_STATE_RESTART_REQUEST;
 		/* Send back the Restart Acknowledge */
@@ -1972,6 +2119,15 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		pri->ev.restart.channel = c->channelno;
 		return Q931_RES_HAVEEVENT;
 	case Q931_SETUP:
+		if (missingmand) {
+			q931_release_complete(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
+			break;
+		}
+		/* Must be new call */
+		if (!c->newcall) {
+			break;
+		}
+		c->newcall = 0;
 		c->ourcallstate = Q931_CALL_STATE_CALL_PRESENT;
 		c->peercallstate = Q931_CALL_STATE_CALL_INITIATED;
 		/* it's not yet a call since higher level can respond with RELEASE or RELEASE_COMPLETE */
@@ -1991,12 +2147,17 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		pri->ev.ring.call = c;
 		pri->ev.ring.layer1 = c->userl1;
 		pri->ev.ring.complete = c->complete; 
+		pri->ev.ring.ctype = c->transcapability;
 		if (c->transmoderate != TRANS_MODE_64_CIRCUIT) {
-			q931_release(pri, c, PRI_CAUSE_BEARERCAPABILITY_NOTIMPL);
+			q931_release_complete(pri, c, PRI_CAUSE_BEARERCAPABILITY_NOTIMPL);
 			break;
 		}
 		return Q931_RES_HAVEEVENT;
 	case Q931_ALERTING:
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
 		c->ourcallstate = Q931_CALL_STATE_CALL_DELIVERED;
 		c->peercallstate = Q931_CALL_STATE_CALL_RECEIVED;
 		pri->ev.e = PRI_EVENT_RINGING;
@@ -2005,6 +2166,14 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		pri->ev.ringing.call = c;
 		return Q931_RES_HAVEEVENT;
 	case Q931_CONNECT:
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
+		if (c->ourcallstate == Q931_CALL_STATE_ACTIVE) {
+			q931_status(pri, c, PRI_CAUSE_WRONG_MESSAGE);
+			break;
+		}
 		c->ourcallstate = Q931_CALL_STATE_ACTIVE;
 		c->peercallstate = Q931_CALL_STATE_CONNECT_REQUEST;
 		pri->ev.e = PRI_EVENT_ANSWER;
@@ -2014,6 +2183,10 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		q931_connect_acknowledge(pri, c);
 		return Q931_RES_HAVEEVENT;
 	case Q931_FACILITY:
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
 		pri->ev.e = PRI_EVENT_FACNAME;
 		strncpy(pri->ev.facname.callingname, c->callername, sizeof(pri->ev.facname.callingname) - 1);
 		strncpy(pri->ev.facname.callingnum, c->callernum, sizeof(pri->ev.facname.callingname) - 1);
@@ -2025,22 +2198,81 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 #endif
 		return Q931_RES_HAVEEVENT;
 	case Q931_PROGRESS:
+		if (missingmand) {
+			q931_status(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
+			q931_destroycall(pri, c->cr);
+			break;
+		}
+		/* Fall through */
 	case Q931_CALL_PROCEEDING:
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
+		if ((c->ourcallstate != Q931_CALL_STATE_CALL_INITIATED) &&
+		    (c->ourcallstate != Q931_CALL_STATE_OVERLAP_SENDING) && 
+		    (c->ourcallstate != Q931_CALL_STATE_CALL_DELIVERED) && 
+		    (c->ourcallstate != Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING)) {
+			q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE);
+			break;
+		}
 		pri->ev.e = PRI_EVENT_PROCEEDING;
 		pri->ev.proceeding.channel = c->channelno;
-		c->ourcallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
-		c->peercallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
+		if (mh->msg == Q931_CALL_PROCEEDING) {
+			c->ourcallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING;
+			c->peercallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING;
+		}
 		return Q931_RES_HAVEEVENT;
 	case Q931_CONNECT_ACKNOWLEDGE:
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
+		if (c->ourcallstate != Q931_CALL_STATE_CONNECT_REQUEST) {
+			q931_status(pri,c,PRI_CAUSE_WRONG_MESSAGE);
+			break;
+		}
 		c->ourcallstate = Q931_CALL_STATE_ACTIVE;
 		c->peercallstate = Q931_CALL_STATE_ACTIVE;
 		break;
 	case Q931_STATUS:
+		if (missingmand) {
+			q931_status(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
+			q931_destroycall(pri, c->cr);
+			break;
+		}
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_WRONG_CALL_STATE);
+			break;
+		}
 		/* Do nothing */
-		/* FIXME if the callstate != ourcallstate send RELEASE */
+		/* Also when the STATUS asks for the call of an unexisting reference send RELEASE_COMPL */
 		if ((pri->debug & PRI_DEBUG_Q931_ANOMALY) &&
-		    (c->cause != PRI_CAUSE_INTERWORKING))
+		    (c->cause != PRI_CAUSE_INTERWORKING)) 
 			pri_error("Received unsolicited status: %s\n", pri_cause2str(c->cause));
+		if (!c->sugcallstate) {
+			pri->ev.hangup.channel = c->channelno;
+			pri->ev.hangup.cref = c->cr;          		
+			pri->ev.hangup.cause = c->cause;      		
+			pri->ev.hangup.call = c;              		
+			/* Free resources */
+			c->ourcallstate = Q931_CALL_STATE_NULL;
+			c->peercallstate = Q931_CALL_STATE_NULL;
+			if (c->alive) {
+				pri->ev.e = PRI_EVENT_HANGUP;
+				res = Q931_RES_HAVEEVENT;
+				c->alive = 0;
+			} else if (c->sendhangupack) {
+				res = Q931_RES_HAVEEVENT;
+				pri->ev.e = PRI_EVENT_HANGUP_ACK;
+				q931_hangup(pri, c, c->cause);
+			} else {
+				q931_hangup(pri, c, c->cause);
+				res = 0;
+			}
+			if (res)
+				return res;
+		}
 		break;
 	case Q931_RELEASE_COMPLETE:
 		c->ourcallstate = Q931_CALL_STATE_NULL;
@@ -2066,15 +2298,37 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 			q931_hangup(pri,c,c->cause);
 		break;
 	case Q931_RELEASE:
+		if (missingmand) {
+			q931_release_complete(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
+			break;
+		}
+		if (c->ourcallstate == Q931_CALL_STATE_RELEASE_REQUEST) 
+			c->peercallstate = Q931_CALL_STATE_NULL;
+		else {
+			c->peercallstate = Q931_CALL_STATE_RELEASE_REQUEST;
+		}
 		c->ourcallstate = Q931_CALL_STATE_NULL;
-		c->peercallstate = Q931_CALL_STATE_RELEASE_REQUEST;
 		pri->ev.e = PRI_EVENT_HANGUP;
 		pri->ev.hangup.channel = c->channelno;
 		pri->ev.hangup.cref = c->cr;
 		pri->ev.hangup.cause = c->cause;
 		pri->ev.hangup.call = c;
-		return Q931_RES_HAVEEVENT;
+		/* Don't send release complete if they send us release 
+		   while we sent it, assume a NULL state */
+		if (c->newcall)
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+		else 
+			return Q931_RES_HAVEEVENT;
+		break;
 	case Q931_DISCONNECT:
+		if (missingmand) {
+			q931_release(pri, c, PRI_CAUSE_MANDATORY_IE_MISSING);
+			break;
+		}
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
 		c->ourcallstate = Q931_CALL_STATE_DISCONNECT_INDICATION;
 		c->peercallstate = Q931_CALL_STATE_DISCONNECT_REQUEST;
 		c->sendhangupack = 1;
@@ -2084,10 +2338,6 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		pri->ev.hangup.cref = c->cr;
 		pri->ev.hangup.cause = c->cause;
 		pri->ev.hangup.call = c;
-#if 0		/* Require the user app to call release */
-		/* Send a release with no cause */
-		q931_release(pri, c, -1);
-#endif
 		if (c->alive)
 			return Q931_RES_HAVEEVENT;
 		else
@@ -2104,6 +2354,10 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		       overlap dialing received digit
 		       +  the "Complete" msg which is basically an EOF on further digits
 		   XXX */
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
 		if (c->ourcallstate!=Q931_CALL_STATE_OVERLAP_RECEIVING)
 			break;
 		pri->ev.e = PRI_EVENT_INFO_RECEIVED;
@@ -2112,19 +2366,29 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		strncpy(pri->ev.ring.callednum, c->callednum, sizeof(pri->ev.ring.callednum) - 1);
 		pri->ev.ring.complete = c->complete; 	/* this covers IE 33 (Sending Complete) */
 		return Q931_RES_HAVEEVENT;
+		break;
 	case Q931_STATUS_ENQUIRY:
-		q931_status(pri,c);
+		if (c->newcall) {
+			q931_release_complete(pri, c, PRI_CAUSE_INVALID_CALL_REFERENCE);
+		} else
+			q931_status(pri,c, 0);
 		break;
 	case Q931_SETUP_ACKNOWLEDGE:
+		if (c->newcall) {
+			q931_release_complete(pri,c,PRI_CAUSE_INVALID_CALL_REFERENCE);
+			break;
+		}
 		c->ourcallstate = Q931_CALL_STATE_OVERLAP_SENDING;
 		c->peercallstate = Q931_CALL_STATE_OVERLAP_RECEIVING;
 		pri->ev.e = PRI_EVENT_SETUP_ACK;
 		pri->ev.setup_ack.channel = c->channelno;
 		return Q931_RES_HAVEEVENT;
+	case Q931_NOTIFY:
+		/* Do nothing */
+		break;
 	case Q931_USER_INFORMATION:
 	case Q931_SEGMENT:
 	case Q931_CONGESTION_CONTROL:
-	case Q931_NOTIFY:
 	case Q931_HOLD:
 	case Q931_HOLD_ACKNOWLEDGE:
 	case Q931_HOLD_REJECT:
@@ -2138,10 +2402,13 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 	case Q931_SUSPEND_ACKNOWLEDGE:
 	case Q931_SUSPEND_REJECT:
 		pri_error("!! Not yet handling post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
-		return -1;
-		
+		/* Fall through */
 	default:
+		
 		pri_error("!! Don't know how to post-handle message type %s (%d)\n", msg2str(mh->msg), mh->msg);
+		q931_status(pri,c, PRI_CAUSE_MESSAGE_TYPE_NONEXIST);
+		if (c->newcall) 
+			q931_destroycall(pri,c->cr);
 		return -1;
 	}
 	return 0;
Author	SHA1	Message	Date
Kevin P. Fleming	b6a9ed870b	remove extraneous svn:executable properties git-svn-id: https://origsvn.digium.com/svn/libpri/tags/0.5.1@266 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-11-29 18:39:18 +00:00
Kevin P. Fleming	0777515137	automatic tag renames git-svn-id: https://origsvn.digium.com/svn/libpri/tags/0.5.1@263 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2005-11-27 04:17:23 +00:00
Admin Commit	8f9296ef00	This commit was manufactured by cvs2svn to create tag 'v0-5-1'. git-svn-id: https://origsvn.digium.com/svn/libpri/tags/v0-5-1@72 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2004-01-17 15:14:11 +00:00
Mark Spencer	e1394704ad	Fix SERVICE_ACKNOWLEDGE even with different address sizes git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@71 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2004-01-17 15:14:11 +00:00
Martin Pycko	0961ecb4b0	Don't expect CONNECT_ACK after we send CONNECT if we're the network and they're the user. git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@70 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-12-09 15:55:48 +00:00
Martin Pycko	a36186ce49	Don't reject SETUP without missing channel information IE if we're network. git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@69 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-12-05 23:10:33 +00:00
Mark Spencer	5f6e12c3e5	Populate ctype field git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@68 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-11-24 14:36:46 +00:00
Mark Spencer	d80324dbdd	Ignore invalid/non Q.931 protocol discriminator git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@67 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-11-19 20:11:11 +00:00
Mark Spencer	e172ca2a03	Accept "PROGRESS" after "ALERTING" git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@66 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-10-15 13:56:10 +00:00
Mark Spencer	e4f9ea7583	Accept "PROGRESS" after "ALERTING" git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@65 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-10-15 13:56:09 +00:00
Martin Pycko	b5fa5986b2	Forgot to put break in the last patch git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@64 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-10-13 22:36:07 +00:00
Martin Pycko	f63cc76a94	Allow the reception of 1 byte Call Reference value git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@63 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-10-13 22:34:05 +00:00
Mark Spencer	cb01262a54	Progress OK when "CALL PROCEEDING" git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@62 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-10-10 07:04:19 +00:00
Mark Spencer	79e10c30a1	Fix for new GCC's git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@61 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-10-06 05:15:16 +00:00
Mark Spencer	06d9c2aeb3	Bring into full TBR4 compliance git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@60 2fbb986a-6c06-0410-b554-c9c1f0a7f128	2003-09-25 06:13:14 +00:00