Importing files for 1.4.4 release

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

.version

@@ -1 +1 @@
-1.4.7
+1.4.4

ChangeLog

@@ -1,75 +1,3 @@
-2008-08-05 Kevin P. Fleming <kpfleming@digium.com>
-
-	* libpri 1.4.7 released.
-
-2008-08-05 22:18 +0000 [r611]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pritest.c, pri.c, pri_internal.h, q921.c, q931.c, copy_string.c,
-	  prisched.c, pri_q921.h, pri_q931.h, pri_facility.c, /,
-	  compiler.h, pridump.c, testprilib.c, pri_timers.h,
-	  pri_facility.h, libpri.h: Merged revisions 610 via svnmerge from
-	  https://origsvn.digium.com/svn/libpri/branches/1.2 ........ r610
-	  | kpfleming | 2008-08-05 17:16:58 -0500 (Tue, 05 Aug 2008) | 2
-	  lines clean up license headers, and explicitly grant additional
-	  permissions when used with Asterisk ........
-
-2008-07-30 15:43 +0000 [r606-607]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* /: update ignore list
-
-	* Makefile, mkdep (removed): use better version.c creation process,
-	  and better dependency tracking process too
-
-2008-07-29 22:47 +0000 [r598-602]  Jason Parker <jparker@digium.com>
-
-	* build_tools/make_version: I believe this is what was meant. (it
-	  matches how Asterisk does it)
-
-	* build_tools/make_version: libpri is not libss7 :D
-
-2008-07-22 22:36 +0000 [r594]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pri_internal.h, libpri.h: correct comments to match code
-
-2008-07-22 Kevin P. Fleming <kpfleming@digium.com>
-
-	* Libpri 1.4.6 released.
-
-2008-07-22 19:43 +0000 [r589]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* pri.c, pri_internal.h, q931.c, libpri.h: rename API call and
-	  option (nothing has been released to use it yet so this should be
-	  safe) to be more accurate in describing what it does (closes
-	  issue #13042)
-
-2008-07-11 Jason Parker <jparker@digium.com>
-
-	* Libpri 1.4.5 released.
-
-2008-07-11 16:44 +0000 [r574-579]  Kevin P. Fleming <kpfleming@digium.com>
-
-	* /: ignore generated files
-
-	* pri.c, pri_internal.h, q931.c, libpri.h: modify work done for
-	  issue #10552, making the support of inband audio after RELEASE a
-	  configurable option, since it is causing problems for a number of
-	  users (closes issue #13042)
-
-2008-06-04 17:02 +0000 [r562]  Dwayne M. Hubbard <dhubbard@digium.com>
-
-	* q931.c: While working on issue 3450 I noticed that the
-	  information channel selection field in the channel identification
-	  IE was displayed incorrectly when using 'pri intense debug'. I
-	  wanted another pair of eyes to look at the code because
-	  everything looked correct until Shaun Ruffell noticed the missing
-	  comma in the msg_chan_sel array.
-
-2008-05-07 19:51 +0000 [r557]  Matthew Fredrickson <creslin@digium.com>
-
-	* pri.c, pritest.c, pri_internal.h, pri_q921.h, Makefile, q921.c,
-	  q931.c, pri_facility.c, prisched.c, testprilib.c, pri_timers.h,
-	  pri_facility.h, libpri.h: Moving trunk changes back into 1.4
-
 2008-05-07 Matthew Fredrickson <creslin@digium.com>
 
 	* Libpri 1.4.4 released.

Makefile

@@ -76,7 +76,7 @@ PROC=ultrasparc
 CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
-all: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 
 update:
 	@if [ -d .svn ]; then \
@@ -131,13 +131,12 @@ testprilib: testprilib.o
 pridump: pridump.o
 	$(CC) -o pridump pridump.o -L. -lpri $(CFLAGS)
 
-MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+ifneq ($(wildcard .depend),)
+include .depend
+endif
 
-%.o: %.c
-	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
-
-%.lo: %.c
-	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
+%.lo : %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)
@@ -148,7 +147,7 @@ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
 	ln -sf libpri.so.$(SONAME) libpri.so
 
-version.c: FORCE
+version.c:
 	@build_tools/make_version_c > $@.tmp
 	@cmp -s $@.tmp $@ || mv $@.tmp $@
 	@rm -f $@.tmp
@@ -157,12 +156,11 @@ clean:
 	rm -f *.o *.so *.lo *.so.$(SONAME)
 	rm -f testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
 	rm -f pritest pridump
-	rm -f .*.d
+	rm -f .depend
 
-.PHONY:
+depend: .depend
 
-FORCE:
+.depend: 
+	CC="$(CC)" ./mkdep ${CFLAGS} `ls *.c`
 
-ifneq ($(wildcard .*.d),)
-   include .*.d
-endif
+.PHONY: version.c

build_tools/make_version

@@ -31,18 +31,18 @@ elif [ -d .svn ]; then
 
       if [ ${BRANCH} != 0 ] ; then
         if [ -z ${RESULT} ] ; then
-          RESULT="${PART}"
+          RESULT="2${PART}"
         else
-          RESULT="${RESULT}-${PART}"
+          RESULT="3${RESULT}-${PART}"
         fi
 	    break
       fi
 
       if [ ${TEAM} != 0 ] ; then
         if [ -z ${RESULT} ] ; then
-           RESULT="${PART}"
+           RESULT="4${PART}"
         else
-          RESULT="${RESULT}-${PART}"
+          RESULT="5${RESULT}-${PART}"
         fi
         continue
       fi
@@ -64,6 +64,8 @@ elif [ -d .svn ]; then
       fi
     done
 
+ 	RESULT="libss7"
+
     if [ ${TAG} != 0 ] ; then
 	echo ${RESULT}
     else

compiler.h

@@ -4,26 +4,9 @@
  * Compiler-specific macros and other items
  *
  * Copyright (C) 2005, Digium, Inc.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
  * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
- *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
+ * the GNU General Public License
  */
 
 #ifndef _ASTERISK_COMPILER_H

copy_string.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2005, Digium, Inc.
+ * Copyright (C) 2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
  
 #include <string.h>

libpri.h

@@ -1,30 +1,25 @@
 /*
  * libpri: An implementation of Primary Rate ISDN
  *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
  *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
  
 #ifndef _LIBPRI_H
@@ -629,9 +624,6 @@ int pri_progress(struct pri *pri, q931_call *c, int channel, int info);
 /* Send call proceeding */
 int pri_proceeding(struct pri *pri, q931_call *c, int channel, int info);
 
-/* Enable inband progress when a DISCONNECT is received */
-void pri_set_inbanddisconnect(struct pri *pri, unsigned int enable);
-
 /* Enslave a PRI to another, so they share the same call list
    (and maybe some timers) */
 void pri_enslave(struct pri *master, struct pri *slave);

mkdep

@@ -0,0 +1,125 @@
+#!/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 "$@" 2>/dev/null | sed -e 's; \./; ;g' > $TMP
+else
+	${CC:-cc} -M "$@" 2>/dev/null | 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
+	cat $TMP | sed -e 's/\.o:/.lo:/g' >>$D
+	if [ $? != 0 ]; then
+		echo 'mkdep: append failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+else
+	cat $TMP > $D
+	if [ $? != 0 ]; then
+		echo 'mkdep: overwrite failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+	cat $TMP | sed -e 's/\.o:/.lo:/g' >>$D
+	if [ $? != 0 ]; then
+		echo 'mkdep: append failed.'
+		rm -rf $DTMP
+		exit 1
+	fi
+fi
+
+rm -rf $DTMP
+exit 0

pri.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 #include <unistd.h>
@@ -787,11 +782,6 @@ void pri_set_overlapdial(struct pri *pri,int state)
 	pri->overlapdial = state;
 }
 
-void pri_set_inbanddisconnect(struct pri *pri, unsigned int enable)
-{
-	pri->acceptinbanddisconnect = (enable != 0);
-}
-
 int pri_fd(struct pri *pri)
 {
 	return pri->fd;

pri_facility.c

@@ -3,28 +3,23 @@
  *
  * Written by Matthew Fredrickson <creslin@digium.com>
  *
- * Copyright (C) 2004-2005, Digium, Inc.
+ * Copyright (C) 2004-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 #include "compat.h"

pri_facility.h

@@ -7,26 +7,6 @@
    Copyright (C) Digium, Inc. 2004-2005
 */
 
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
- *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
- */
-
 #ifndef _PRI_FACILITY_H
 #define _PRI_FACILITY_H
 #include "pri_q931.h"

pri_internal.h

@@ -1,30 +1,25 @@
 /*
  * libpri: An implementation of Primary Rate ISDN
  *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
  *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
  
 #ifndef _PRI_INTERNAL_H
@@ -66,11 +61,10 @@ struct pri {
 	int localtype;		/* Local network type (unknown, network, cpe) */
 	int remotetype;		/* Remote network type (unknown, network, cpe) */
 
+	int bri;
 	int sapi;
 	int tei;
 	int protodisc;
-	unsigned int bri:1;
-	unsigned int acceptinbanddisconnect:1;	/* Should we allow inband progress after DISCONNECT? */
 	
 	/* Q.921 State */
 	int q921_state;	

pri_q921.h

@@ -1,30 +1,25 @@
 /*
  * libpri: An implementation of Primary Rate ISDN
  *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
  *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
  
 #ifndef _PRI_Q921_H

pri_q931.h

@@ -1,30 +1,25 @@
 /*
  * libpri: An implementation of Primary Rate ISDN
  *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
  *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
  
 #ifndef _PRI_Q931_H

pri_timers.h

@@ -1,30 +1,25 @@
 /*
  * libpri: An implementation of Primary Rate ISDN
  *
- * Written by Mark Spencer <markster@digium.com>
+ * Written by Mark Spencer <markster@linux-support.net>
  *
- * Copyright (C) 2001, Digium, Inc.
+ * Copyright (C) 2001, Linux Support Services, Inc.
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
  
 #ifndef _PRI_TIMERS_H

pridump.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 /*

prisched.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 #include <stdio.h>

pritest.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 /*

q921.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 #include <stdio.h>

q931.c

@@ -3,28 +3,23 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
 #include "compat.h"
@@ -426,7 +421,7 @@ static FUNC_DUMP(dump_channel_id)
 	int x;
 	int res = 0;
 	static const char*	msg_chan_sel[] = {
-		"No channel selected", "B1 channel", "B2 channel","Any channel selected",  
+		"No channel selected", "B1 channel", "B2 channel","Any channel selected" 
 		"No channel selected", "As indicated in following octets", "Reserved","Any channel selected"
 	};
 
@@ -3787,7 +3782,7 @@ int q931_receive(struct pri *pri, q931_h *h, int len)
 
 		/* wait for a RELEASE so that sufficient time has passed
 		   for the inband audio to be heard */
-		if (pri->acceptinbanddisconnect && (c->progressmask & PRI_PROG_INBAND_AVAILABLE))
+		if (c->progressmask & PRI_PROG_INBAND_AVAILABLE)
 			break;
 
 		/* Return such an event */

testprilib.c

@@ -3,31 +3,25 @@
  *
  * Written by Mark Spencer <markster@digium.com>
  *
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2005, Digium
  * All Rights Reserved.
- */
-
-/*
- * See http://www.asterisk.org for more information about
- * the Asterisk project. Please do not directly contact
- * any of the maintainers of this project for assistance;
- * the project provides a web site, mailing lists and IRC
- * channels for your use.
  *
- * This program is free software, distributed under the terms of
- * the GNU General Public License Version 2 as published by the
- * Free Software Foundation. See the LICENSE file included with
- * this program for more details.
+ * 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. 
  *
- * In addition, when this program is distributed with Asterisk in
- * any form that would qualify as a 'combined work' or as a
- * 'derivative work' (but not mere aggregation), you can redistribute
- * and/or modify the combination under the terms of the license
- * provided with that copy of Asterisk, instead of the license
- * terms granted here.
  */
 
-
 /*
  * This program tests libpri call reception using a zaptel interface.
  * Its state machines are setup for RECEIVING CALLS ONLY, so if you