remove CVS ignore lists

git-svn-id: https://origsvn.digium.com/svn/libpri/tags/1.0.0@267 2fbb986a-6c06-0410-b554-c9c1f0a7f128

.cvsignore

@@ -1,5 +0,0 @@
-.depend
-*.lo
-libpri.so.1.0
-pritest
-

Makefile

@@ -28,6 +28,7 @@
 #LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
 
 OSARCH=$(shell uname -s)
+PROC=$(shell uname -m)
 
 TOBJS=testpri.o
 T2OBJS=testprilib.o
@@ -46,6 +47,14 @@ CFLAGS += -I../zaptel -I../zapata
 endif
 endif
 
+#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+#This works for even old (2.96) versions of gcc and provides a small boost either way.
+#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
+ifeq ($(PROC),sparc64)
+PROC=ultrasparc
+CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+endif
+
 all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 
 update:
@@ -69,16 +78,16 @@ uninstall:
 	rm -f $(INSTALL_PREFIX)/usr/include/libpri.h
 
 pritest: pritest.o
-	$(CC) -o pritest pritest.o -L. -lpri -lzap
+	$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)
 
 testprilib.o: testprilib.c
 	$(CC) $(CFLAGS) -D_REENTRANT -D_GNU_SOURCE -o $@ -c $<
 
 testprilib: testprilib.o
-	$(CC) -o testprilib testprilib.o -L. -lpri -lpthread
+	$(CC) -o testprilib testprilib.o -L. -lpri -lpthread $(CFLAGS)
 
 pridump: pridump.o
-	$(CC) -o pridump pridump.o -L. -lpri -lzap
+	$(CC) -o pridump pridump.o -L. -lpri -lzap $(CFLAGS)
 
 include .depend
 

libpri.h

@@ -279,6 +279,7 @@ typedef struct pri_event_ring {
 	char callingnum[256];		/* Calling number */
 	char callingname[256];		/* Calling name (if provided) */
 	int calledplan;				/* Dialing plan of Called number */
+	int ani2;                   /* ANI II */
 	char callednum[256];		/* Called number */
 	char redirectingnum[256];		/* Redirecting number */
 	char useruserinfo[256];			/* User->User info */

q931.c

@@ -255,6 +255,8 @@ struct q931_call {
 	int callerpres;			/* Caller presentation */
 	char callernum[256];	/* Caller */
 	char callername[256];
+
+	int ani2;               /* ANI II */
 	
 	int  calledplan;
 	int nonisdn;
@@ -865,12 +867,26 @@ static FUNC_DUMP(dump_connected_number)
 
 
 static FUNC_RECV(receive_redirecting_number)
-{        
-        call->redirectingplan = ie->data[0] & 0x7f;
-        call->redirectingpres = ie->data[1] & 0x7f;
-        call->redirectingreason = ie->data[2] & 0x0f;
+{
+	int i = 0;
 
-        q931_get_number(call->redirectingnum, sizeof(call->redirectingnum), ie->data + 3, len - 5);
+	/* To follow Q.931 (4.5.1), we must search for start of octet 4 by
+	   walking through all bytes until one with ext bit (8) set to 1 */
+	do {
+		switch(i) {
+		case 0:
+			call->redirectingplan = ie->data[i] & 0x7f;
+			break;
+		case 1:
+			call->redirectingpres = ie->data[i] & 0x7f;
+			break;
+		case 2:
+			call->redirectingreason = ie->data[i] & 0x0f;
+			break;
+		}
+	}
+	while(!(ie->data[i++] & 0x80));
+	q931_get_number(call->redirectingnum, sizeof(call->redirectingnum), ie->data + i, ie->len - i);
 	return 0;
 }
 
@@ -930,7 +946,7 @@ static FUNC_SEND(transmit_calling_party_number)
 {
 	ie->data[0] = call->callerplan;
 	ie->data[1] = 0x80 | call->callerpres;
-	if (strlen(call->callednum)) 
+	if (strlen(call->callernum)) 
 		memcpy(ie->data + 2, call->callernum, strlen(call->callernum));
 	return strlen(call->callernum) + 4;
 }
@@ -1401,6 +1417,7 @@ static FUNC_DUMP(dump_line_information)
 
 static FUNC_RECV(receive_line_information)
 {
+	call->ani2 = ie->data[0];
 	return 0;
 }
 
@@ -1526,7 +1543,7 @@ static char *ie2str(int ie)
 	}
 }	
 
-static inline int ielen(q931_ie *ie)
+static inline unsigned int ielen(q931_ie *ie)
 {
 	if ((ie->ie & 0x80) != 0)
 		return 1;
@@ -2095,6 +2112,7 @@ int q931_connect(struct pri *pri, q931_call *c, int channel, int nonisdn)
 	/* Setup timer */
 	if (c->retranstimer)
 		pri_schedule_del(pri, c->retranstimer);
+	c->retranstimer = 0;
 	if ((pri->localtype == PRI_CPE) && (!pri->subchannel))
 		c->retranstimer = pri_schedule_event(pri, T_313, pri_connect_timeout, c);
 	return send_message(pri, c, Q931_CONNECT, connect_ies);
@@ -2632,6 +2650,7 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 		pri->ev.ring.channel = c->channelno | (c->ds1no << 8);
 		pri->ev.ring.callingpres = c->callerpres;
 		pri->ev.ring.callingplan = c->callerplan;
+		pri->ev.ring.ani2 = c->ani2;
 		strncpy(pri->ev.ring.callingnum, c->callernum, sizeof(pri->ev.ring.callingnum) - 1);
 		strncpy(pri->ev.ring.callingname, c->callername, sizeof(pri->ev.ring.callingname) - 1);
 		pri->ev.ring.calledplan = c->calledplan;