remove CVS ignore lists

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

Makefile

@@ -24,15 +24,23 @@
 # Uncomment if you want libpri not send PROGRESS_INDICATOR w/ALERTING
 #ALERTING=-DALERTING_NO_PROGRESS
 
+# Uncomment if you want libpri to count number of Q921/Q931 sent/received
+#LIBPRI_COUNTERS=-DLIBPRI_COUNTERS
+
 TOBJS=testpri.o
+T2OBJS=testprilib.o
 STATIC_LIBRARY=libpri.a
 DYNAMIC_LIBRARY=libpri.so.1.0
 STATIC_OBJS=pri.o q921.o prisched.o q931.o
 DYNAMIC_OBJS=pri.lo q921.lo prisched.lo q931.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
 INSTALL_PREFIX=
 
-all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+
+update:
+	@echo "Updating from CVS"
+	@cvs update -d
 
 install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	mkdir -p $(INSTALL_PREFIX)/usr/lib
@@ -43,12 +51,27 @@ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib
 	/sbin/ldconfig
 
+uninstall:
+	@echo "Removing Libpri"
+	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.so.1.0
+	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.so
+	rm -f $(INSTALL_PREFIX)/usr/lib/libpri.a
+	rm -f $(INSTALL_PREFIX)/usr/include/libpri.h
+
 pritest: pritest.o
 	$(CC) -o pritest pritest.o -L. -lpri -lzap
 
+testprilib.o: testprilib.c
+	$(CC) $(CFLAGS) -D_REENTRANT -D_GNU_SOURCE -o $@ -c $<
+
+testprilib: testprilib.o
+	$(CC) -o testprilib testprilib.o -L. -lpri -lpthread
+
 pridump: pridump.o
 	$(CC) -o pridump pridump.o -L. -lpri -lzap
 
+include .depend
+
 %.lo : %.c
 	$(CC) -fPIC $(CFLAGS) -o $@ -c $<
 
@@ -62,6 +85,12 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
 	ln -sf libpri.so.1 libpri.so
 
 clean:
-	rm -f *.o *.so *.lo 
-	rm -f testpri $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+	rm -f *.o *.so *.lo *.so.1 *.so.1.0
+	rm -f testpri testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	rm -f pritest pridump
+	rm -f .depend
+
+depend: .depend
+
+.depend: 
+	./mkdep ${CFLAGS} `ls *.c`

libpri.h

@@ -386,4 +386,11 @@ extern void pri_set_error(void (*__pri_error)(char *));
 /* Set overlap mode */
 #define PRI_SET_OVERLAPDIAL
 extern void pri_set_overlapdial(struct pri *pri,int state);
+
+#define PRI_DUMP_INFO
+extern void pri_dump_info(struct pri *pri);
+
+/* Get file descriptor */
+extern int pri_fd(struct pri *pri);
+
 #endif

mkdep

@@ -0,0 +1,113 @@
+#!/bin/sh -
+#
+#	$OpenBSD: mkdep.gcc.sh,v 1.8 1998/09/02 06:40:07 deraadt Exp $
+#	$NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
+#
+# Copyright (c) 1991, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#	@(#)mkdep.gcc.sh	8.1 (Berkeley) 6/6/93
+#
+
+D=.depend			# default dependency file is .depend
+append=0
+pflag=
+
+while :
+	do case "$1" in
+		# -a appends to the depend file
+		-a)
+			append=1
+			shift ;;
+
+		# -f allows you to select a makefile name
+		-f)
+			D=$2
+			shift; shift ;;
+
+		# the -p flag produces "program: program.c" style dependencies
+		# so .o's don't get produced
+		-p)
+			pflag=p
+			shift ;;
+		*)
+			break ;;
+	esac
+done
+
+if [ $# = 0 ] ; then
+	echo 'usage: mkdep [-p] [-f depend_file] [cc_flags] file ...'
+	exit 1
+fi
+
+DTMP=/tmp/mkdep$$
+TMP=$DTMP/mkdep
+
+um=`umask`
+umask 022
+if ! mkdir $DTMP ; then
+	echo failed to create tmp dir $DTMP
+	exit 1
+fi
+
+umask $um
+trap 'rm -rf $DTMP ; trap 2 ; kill -2 $$' 1 2 3 13 15
+
+if [ x$pflag = x ]; then
+	${CC:-cc} -M "$@" | sed -e 's; \./; ;g' > $TMP
+else
+	${CC:-cc} -M "$@" | sed -e 's;\.o :; :;' -e 's; \./; ;g' > $TMP
+fi
+
+if [ $? != 0 ]; then
+	echo 'mkdep: compile failed.'
+	rm -rf $DTMP
+	exit 1
+fi
+
+if [ $append = 1 ]; then
+	cat $TMP >> $D
+	if [ $? != 0 ]; then
+		echo 'mkdep: append failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+else
+	mv $TMP $D
+	if [ $? != 0 ]; then
+		echo 'mkdep: rename failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+fi
+
+rm -rf $DTMP
+exit 0

pri.c

@@ -51,6 +51,8 @@ char *pri_switch2str(int sw)
 		return "AT&T 4ESS";
 	case PRI_SWITCH_NI1:
 		return "National ISDN 1";
+	case PRI_SWITCH_EUROISDN_E1:
+		return "EuroISDN";
 	default:
 		return "Unknown switchtype";
 	}
@@ -66,8 +68,14 @@ struct pri *pri_new(int fd, int node, int switchtype)
 		p->localtype = node;
 		p->switchtype = switchtype;
 		p->cref = 1;
-		/* Start Q.921 layer */
-		q921_start(p, 1);
+#ifdef LIBPRI_COUNTERS
+		p->q921_rxcount = 0;
+		p->q921_txcount = 0;
+		p->q931_rxcount = 0;
+		p->q931_txcount = 0;
+#endif
+		/* Start Q.921 layer, Wait if we're the network */
+		q921_start(p, p->localtype == PRI_CPE);
 	}
 	return p;
 }
@@ -332,3 +340,41 @@ void pri_set_overlapdial(struct pri *pri,int state)
 	pri->overlapdial = state;
 }
 
+int pri_fd(struct pri *pri)
+{
+	return pri->fd;
+}
+
+void pri_dump_info(struct pri *pri)
+{
+#ifdef LIBPRI_COUNTERS
+	struct q921_frame *f;
+	int q921outstanding = 0;
+#endif
+	if (!pri)
+		return;
+
+	/* Might be nice to format these a little better */
+	pri_message("Switchtype: %s\n", pri_switch2str(pri->switchtype));
+	pri_message("Type: %s\n", pri_node2str(pri->localtype));
+#ifdef LIBPRI_COUNTERS
+	/* Remember that Q921 Counters include Q931 packets (and any retransmissions) */
+	pri_message("Q931 RX: %d\n", pri->q931_rxcount);
+	pri_message("Q931 TX: %d\n", pri->q931_txcount);
+	pri_message("Q921 RX: %d\n", pri->q921_rxcount);
+	pri_message("Q921 TX: %d\n", pri->q921_txcount);
+	f = pri->txqueue;
+	while (f) {
+		q921outstanding++;
+		f = f->next;
+	}
+	pri_message("Q921 Outstanding: %d\n", q921outstanding);
+#endif
+	pri_message("Window Length: %d/%d\n", pri->windowlen, pri->window);
+	pri_message("Sentrej: %d\n", pri->sentrej);
+	pri_message("SolicitFbit: %d\n", pri->solicitfbit);
+	pri_message("Retrans: %d\n", pri->retrans);
+	pri_message("Busy: %d\n", pri->busy);
+	pri_message("Overlap Dial: %d\n", pri->overlapdial);
+}
+

pri_internal.h

@@ -52,6 +52,7 @@ struct pri {
 	/* Q.921 State */
 	int q921_state;	
 	int window;			/* Max window size */
+	int windowlen;		/* Fullness of window */
 	int v_s;			/* Next N(S) for transmission */
 	int v_a;			/* Last acknowledged frame */
 	int v_r;			/* Next frame expected to be received */
@@ -82,6 +83,14 @@ struct pri {
 
 	/* do we do overlap dialing */
 	int overlapdial;
+
+#ifdef LIBPRI_COUNTERS
+	/* q921/q931 packet counters */
+	unsigned int q921_txcount;
+	unsigned int q921_rxcount;
+	unsigned int q931_txcount;
+	unsigned int q931_rxcount;
+#endif
 };
 
 extern int pri_schedule_event(struct pri *pri, int ms, void (*function)(void *data), void *data);

pri_q921.h

@@ -134,6 +134,7 @@ typedef union {
 typedef struct q921_frame {
 	struct q921_frame *next;	/* Next in list */
 	int len;					/* Length of header + body */
+	int transmitted;			/* Have we been transmitted */
 	q921_i h;
 } q921_frame;
 

q921.c

@@ -73,7 +73,9 @@ static int q921_transmit(struct pri *pri, q921_h *h, int len)
          return 0;
    }
 #endif   
-      
+#ifdef LIBPRI_COUNTERS
+	pri->q921_txcount++;      
+#endif
 	/* Just send it raw */
 	if (pri->debug & PRI_DEBUG_Q921_DUMP)
 		q921_dump(h, len, pri->debug & PRI_DEBUG_Q921_RAW, 1);
@@ -168,6 +170,22 @@ static int q921_ack_packet(struct pri *pri, int num)
 			free(f);
 			/* Reset retransmission counter if we actually acked something */
 			pri->retrans = 0;
+			/* Decrement window size */
+			pri->windowlen--;
+			/* Search for something to send */
+			f = pri->txqueue;
+			while(f) {
+				if (!f->transmitted) {
+					/* Send it now... */
+					if (pri->debug & PRI_DEBUG_Q921_STATE)
+						pri_message("-- Finally transmitting %d, since window opened up\n", f->h.n_s);
+					f->transmitted++;
+					pri->windowlen++;
+					q921_transmit(pri, (q921_h *)(&f->h), f->len);
+					break;
+				}
+				f = f->next;
+			}
 			return 1;
 		}
 		prev = f;
@@ -317,8 +335,11 @@ static void t200_expire(void *vpri)
             pri_message("-- Retransmitting %d bytes\n", pri->txqueue->len);
 		if (pri->busy) 
 			q921_rr(pri, 1, 0);
-		else
+		else {
+			if (!pri->txqueue->transmitted) 
+				pri_error("!! Not good - head of queue has not been transmitted yet\n");
 			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);
@@ -360,6 +381,7 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 		break;
 		}
 		f->next = NULL;
+		f->transmitted = 0;
 		f->len = len + 4;
 		memcpy(f->h.data, buf, len);
 		f->h.n_s = pri->v_s;
@@ -372,9 +394,18 @@ int q921_transmit_iframe(struct pri *pri, void *buf, int len, int cr)
 			prev->next = f;
 		else
 			pri->txqueue = f;
-		/* Immediately transmit unless we're in a recovery state */
+		/* Immediately transmit unless we're in a recovery state, or the window
+		   size is too big */
 		if (!pri->retrans && !pri->busy) {
-			q921_transmit(pri, (q921_h *)(&f->h), f->len);
+			if (pri->windowlen < pri->window) {
+				pri->windowlen++;
+				q921_transmit(pri, (q921_h *)(&f->h), f->len);
+				f->transmitted++;
+			} else {
+				if (pri->debug & PRI_DEBUG_Q921_STATE)
+					pri_message("Delaying transmission of %d, window is %d/%d long\n", 
+						f->h.n_s, pri->windowlen, pri->window);
+			}
 		}
 		if (pri->t203_timer) {
 			if (pri->debug & PRI_DEBUG_Q921_STATE)
@@ -463,10 +494,14 @@ void q921_dump(q921_h *h, int len, int showraw, int txrx)
 	
 	direction_tag = txrx ? '>' : '<';
 	if (showraw) {
-		pri_message("\n%c [", direction_tag);
-		for (x=0;x<len;x++) 
-			pri_message("%02x ",h->raw[x]);
-		pri_message("]");
+		char *buf = malloc(len * 3 + 1);
+		int buflen = 0;
+		if (buf) {
+			for (x=0;x<len;x++) 
+				buflen += sprintf(buf + buflen, "%02x ", h->raw[x]);
+			pri_message("\n%c [ %s]\n", direction_tag, buf);
+			free(buf);
+		}
 	}
 
 	switch (h->h.data[0] & Q921_FRAMETYPE_MASK) {
@@ -625,6 +660,7 @@ void q921_reset(struct pri *pri)
 	pri->v_r = 0;
 	pri->v_na = 0;
 	pri->window = 7;
+	pri->windowlen = 0;
 	pri_schedule_del(pri, pri->sabme_timer);
 	pri_schedule_del(pri, pri->t203_timer);
 	pri_schedule_del(pri, pri->t200_timer);
@@ -729,8 +765,9 @@ static pri_event *__q921_receive(struct pri *pri, q921_h *h, int len)
 		 sendnow = 0;
          /* Resend the proper I-frame */
          for(f=pri->txqueue;f;f=f->next) {
-               if (sendnow || (f->h.n_s == h->s.n_r)) {
-                     /* Matches the request, or follows in our window */
+               if ((sendnow || (f->h.n_s == h->s.n_r)) && f->transmitted) {
+                     /* Matches the request, or follows in our window, and has
+					    already been transmitted. */
 					 sendnow = 1;
 					 pri_error("!! Got reject for frame %d, retransmitting frame %d now, updating n_r!\n", h->s.n_r, f->h.n_s);
 				     f->h.n_r = pri->v_r;
@@ -858,6 +895,9 @@ pri_event *q921_receive(struct pri *pri, q921_h *h, int len)
 	pri_event *e;
 	e = __q921_receive(pri, h, len);
 	reschedule_t203(pri);
+#ifdef LIBPRI_COUNTERS
+	pri->q921_rxcount++;
+#endif
 	return e;
 }
 

q931.c

@@ -641,14 +641,15 @@ static int transmit_bearer_capability(struct pri *pri, q931_call *call, int msgt
 	ie->data[1] = call->transmoderate | 0x80;
 	if (call->transmoderate != TRANS_MODE_PACKET) {
 		/* If you have an AT&T 4ESS, you don't send any more info */
-		if (pri->switchtype == PRI_SWITCH_ATT4ESS)
+		if ((pri->switchtype != PRI_SWITCH_ATT4ESS) && (call->userl1 > -1)) {
+			ie->data[2] = call->userl1 | 0x80; /* XXX Ext bit? XXX */
+			if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
+				ie->data[3] = call->rateadaption | 0x80;
+				return 6;
+			}
+			return 5;
+		} else
 			return 4;
-		ie->data[2] = call->userl1 | 0x80; /* XXX Ext bit? XXX */
-		if (call->userl1 == PRI_LAYER_1_ITU_RATE_ADAPT) {
-			ie->data[3] = call->rateadaption | 0x80;
-			return 6;
-		}
-		return 5;
 	} else {
 		ie->data[2] = 0x80 | call->userl2;
 		ie->data[3] = 0x80 | call->userl3;
@@ -843,7 +844,11 @@ static int transmit_calling_party_number(struct pri *pri, q931_call *call, int m
 
 static void dump_user_user(q931_ie *ie, int len, char prefix)
 {
-
+	int x;
+	pri_message("%c User-User Information (len=%2d) [ ", prefix, ie->len);
+	for (x=0;x<ie->len;x++)
+		pri_message("%c", ie->data[x] & 0x7f);
+	pri_message(" ]\n");
 }
 
 
@@ -1471,6 +1476,9 @@ static int q931_xmit(struct pri *pri, q931_h *h, int len, int cr)
 	   right order in the log */
 	if (pri->debug & PRI_DEBUG_Q931_DUMP)
 		q931_dump(h, len, 1);
+#ifdef LIBPRI_COUNTERS
+	pri->q931_txcount++;
+#endif
 	return 0;
 }
 
@@ -1636,6 +1644,15 @@ static void pri_release_finaltimeout(void *data)
 	if (pri->debug & PRI_DEBUG_Q931_STATE)
 		pri_message("Final time-out looking for release complete\n");
 	c->t308_timedout++;
+	c->ourcallstate = Q931_CALL_STATE_NULL;
+	c->peercallstate = Q931_CALL_STATE_NULL;
+	pri->schedev = 1;
+	pri->ev.e = PRI_EVENT_HANGUP_ACK;
+	pri->ev.hangup.channel = c->channelno;
+	pri->ev.hangup.cref = c->cr;
+	pri->ev.hangup.cause = c->cause;
+	pri->ev.hangup.call = c;
+	q931_hangup(pri, c, c->cause);
 }
 
 static void pri_disconnect_timeout(void *data)
@@ -1930,6 +1947,9 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 	int missingmand;
 	if (pri->debug & PRI_DEBUG_Q931_DUMP)
 		q931_dump(h, len, 0);
+#ifdef LIBPRI_COUNTERS
+	pri->q931_rxcount++;
+#endif
 	mh = (q931_mh *)(h->contents + h->crlen);
 	if (h->pd == 0x3) {
 		/* This is the weird maintenance stuff.  We majorly
@@ -2242,7 +2262,8 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 			break;
 		}
 		if (c->newcall) {
-			q931_release_complete(pri,c,PRI_CAUSE_WRONG_CALL_STATE);
+			if (c->cr & 0x7fff)
+				q931_release_complete(pri,c,PRI_CAUSE_WRONG_CALL_STATE);
 			break;
 		}
 		/* Do nothing */

testprilib.c

@@ -0,0 +1,234 @@
+/*
+ * libpri: An implementation of Primary Rate ISDN
+ *
+ * Written by Mark Spencer <markster@linux-support.net>
+ *
+ * Copyright (C) 2001, Linux Support Services, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+/*
+ * This program tests libpri call reception using a zaptel interface.
+ * Its state machines are setup for RECEIVING CALLS ONLY, so if you
+ * are trying to both place and receive calls you have to a bit more.
+ */
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/ioctl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/signal.h>
+#include <sys/select.h>
+#include <sys/wait.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <linux/zaptel.h>
+#include <zap.h>
+#include <pthread.h>
+#include <sys/select.h>
+#include "libpri.h"
+
+#define DEBUG_LEVEL	PRI_DEBUG_ALL
+
+#define PRI_DEF_NODETYPE	PRI_CPE
+#define PRI_DEF_SWITCHTYPE	PRI_SWITCH_NI2
+
+static struct pri *first, *cur;
+
+static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+
+#define TEST_CALLS 32
+
+static void event1(struct pri *pri, pri_event *e)
+{
+	/* Network */
+	int x;
+	static q931_call *calls[TEST_CALLS];
+	char name[256], num[256], dest[256];
+	switch(e->gen.e) {
+	case PRI_EVENT_DCHAN_UP:
+		printf("Network is up.  Sending blast of calls!\n");
+		for (x=0;x<TEST_CALLS;x++) {
+			sprintf(name, "Caller %d", x + 1);
+			sprintf(num, "25642860%02d", x+1);
+			sprintf(dest, "60%02d", x + 1);
+			if (!(calls[x] = pri_new_call(pri))) {
+				perror("pri_new_call");
+			} else if (pri_call(pri, calls[x], PRI_TRANS_CAP_DIGITAL, x + 1, 1, 1, num, 
+				PRI_NATIONAL_ISDN, name, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN,
+				dest, PRI_NATIONAL_ISDN, PRI_LAYER_1_ULAW)) {
+					perror("pri_call");
+			}
+		}
+		printf("Setup %d calls!\n", TEST_CALLS);
+		break;
+	default:
+		printf("PRI 1: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+	}
+}
+
+static void event2(struct pri *pri, pri_event *e)
+{
+	/* CPE */
+	switch(e->gen.e) {
+	case PRI_EVENT_DCHAN_UP:
+	default:
+		printf("PRI 2: %s (%d)\n", pri_event2str(e->gen.e), e->gen.e);
+	}
+}
+
+static void testmsg(char *s)
+{
+	char *c;
+	static int keeplast = 0;
+	do {
+		c = strchr(s, '\n');
+		if (c) {
+			*c = '\0';
+			c++;
+		}
+		if (keeplast)
+			printf("%s", s);
+		else if (cur == first)
+			printf("-1 %s", s);
+		else
+			printf("-2 %s", s);
+		if (c)
+			printf("\n");
+		s = c;
+	} while(c && *c);
+	if (!c)
+		keeplast = 1;
+	else
+		keeplast = 0;
+}
+
+static void testerr(char *s)
+{
+	char *c;
+	static int keeplast = 0;
+	do {
+		c = strchr(s, '\n');
+		if (c) {
+			*c = '\0';
+			c++;
+		}
+		if (keeplast)
+			printf("%s", s);
+		else if (cur == first)
+			printf("=1 %s", s);
+		else
+			printf("=2 %s", s);
+		if (c)
+			printf("\n");
+		s = c;
+	} while(c && *c);
+	if (!c)
+		keeplast = 1;
+	else
+		keeplast = 0;
+}
+
+
+static void *dchan(void *data)
+{
+	/* Joint D-channel */
+	struct pri *pri = data;
+	struct timeval *next, tv;
+	pri_event *e;
+	fd_set fds;
+	int res;
+	for(;;) {
+		if (next == pri_schedule_next(pri)) {
+			gettimeofday(&tv, NULL);
+			tv.tv_sec = next->tv_sec - tv.tv_sec;
+			tv.tv_usec = next->tv_usec - tv.tv_usec;
+			if (tv.tv_usec < 0) {
+				tv.tv_usec += 1000000;
+				tv.tv_sec -= 1;
+			}
+			if (tv.tv_sec < 0) {
+				tv.tv_sec = 0;
+				tv.tv_usec = 0;
+			}
+		}
+		FD_ZERO(&fds);
+		FD_SET(pri_fd(pri), &fds);
+		res = select(pri_fd(pri) + 1, &fds, NULL, NULL, next ? &tv : NULL);
+		pthread_mutex_lock(&lock);
+		cur = pri;
+		if (res < 0) {
+			perror("select");
+		} else if (!res) {
+			e = pri_schedule_run(pri);
+		} else {
+			e = pri_check_event(pri);
+		}
+		if (e) {
+			if (first == pri) {
+				event1(pri, e);
+			} else {
+				event2(pri, e);
+			}
+		}
+		pthread_mutex_unlock(&lock);
+	}
+	return NULL;
+}
+
+
+int main(int argc, char *argv[])
+{
+	int pair[2];
+	pthread_t tmp;
+	struct pri *pri;
+	pri_set_message(testmsg);
+	pri_set_error(testerr);
+	if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, pair)) {
+		perror("socketpair");
+		exit(1);
+	}
+	if (!(pri = pri_new(pair[0], PRI_NETWORK, PRI_DEF_SWITCHTYPE))) {
+		perror("pri(0)");
+		exit(1);
+	}
+	first = pri;
+	pri_set_debug(pri, DEBUG_LEVEL);
+	if (pthread_create(&tmp, NULL, dchan, pri)) {
+		perror("thread(0)");
+		exit(1);
+	}
+	if (!(pri = pri_new(pair[1], PRI_CPE, PRI_DEF_SWITCHTYPE))) {
+		perror("pri(1)");
+		exit(1);
+	}
+	pri_set_debug(pri, DEBUG_LEVEL);
+	if (pthread_create(&tmp, NULL, dchan, pri)) {
+		perror("thread(1)");
+		exit(1);
+	}
+	/* Wait for things to run */
+	sleep(5);
+	exit(0);
+}
+