diff --git a/ChangeLog b/ChangeLog index 04fd55e..7c85ee8 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,21 @@ +libpri 1.0.4 + -- Makefile fix for SELinux +libpri 1.0.3 + -- Fix Endian to compile for FreeBSD + +... libpri 0.3.0 --- Fix talking to switch --- Add pri dump --- Add test application --- Fix strncpy stuff + -- Fix talking to switch + -- Add pri dump + -- Add test application + -- Fix strncpy stuff libpri 0.1.2 --- Added PRI_EVENT_HANGUP_ACK so you can know when the disconnect was -acknowledged + -- Added PRI_EVENT_HANGUP_ACK so you can know when the disconnect was + acknowledged libpri 0.1.1 --- Added PRI_DEBUG_Q931_ANOMALY flag so that certain non-error-related -messages would not be output unless specifically desired. + -- Added PRI_DEBUG_Q931_ANOMALY flag so that certain non-error-related + messages would not be output unless specifically desired. libpri 0.1.0 -- Initial release diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..a52b16e --- /dev/null +++ b/LICENSE @@ -0,0 +1,341 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/Makefile b/Makefile index a82d6ad..ecbc657 100755 --- a/Makefile +++ b/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: @@ -57,6 +66,7 @@ install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY) mkdir -p $(INSTALL_PREFIX)/usr/include install -m 644 libpri.h $(INSTALL_PREFIX)/usr/include install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib + if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then restorecon -v $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi ( cd $(INSTALL_PREFIX)/usr/lib ; ln -sf libpri.so.1 libpri.so ) install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/usr/lib /sbin/ldconfig @@ -69,16 +79,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 diff --git a/README b/README index f2d6e3f..6ee1e2e 100755 --- a/README +++ b/README @@ -1,31 +1,40 @@ libpri: An implementation of Primate Rate ISDN -Written by Mark Spencer +Written by Mark Spencer What is libpri? =============== libpri is a C implementation of the Primary Rate ISDN specification. It was based on the Bellcore specification SR-NWT-002343 for National ISDN. As of -May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, and Lucent 5E Custom protocols on switches from Nortel and Lucent. +May 12, 2001, it has been tested work with NI-2, Nortel DMS-100, and +Lucent 5E Custom protocols on switches from Nortel and Lucent. What is the license for libpri? =============================== -libpri is distributed under the terms of the GNU General Public License, which permit its use and linking with other GPL'd software only. +libpri is distributed under the terms of the GNU General Public License, +which permit its use and linking with other GPL'd software only. +The GNU GPL is included in the file LICENSE in this directory. + +If you wish to use libpri in an application for which the GPL is not +appropriate (e.g. a proprietary embedded system), licenses for libpri +under more flexible terms can be readily obtained through Digium, Inc. +at reasonable cost. -If you wish to use libpri in an application for which the GPL is not appropriate (e.g. a proprietary embedded system), licenses for libpri under more flexible terms can be readily obtained through Linux Support Services, Inc. at reasonable cost. How do I report bugs or contribute? =================================== -For now, contact the author directly. In the future if there is sufficient interest, we will setup a mailing list. +For now, contact the author directly. In the future if there is +sufficient interest, we will setup a mailing list. Does anything use this library so far? ====================================== -Yes, the Asterisk Open Source PBX does. http://www.asteriskpbx.com +Yes, the Asterisk Open Source PBX does. http://www.asterisk.org Also, the Zapata library has hooks for it. http://www.zapatatelephony.org Special thanks ============== -Special thanks to Jim Dixon for his help in testing and fixing the implementation. +Special thanks to Jim Dixon for his help in +testing and fixing the implementation. diff --git a/libpri.h b/libpri.h index db55dfb..0a8087d 100755 --- a/libpri.h +++ b/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 */ @@ -458,8 +459,8 @@ extern void pri_set_error(void (*__pri_error)(char *)); #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); +#define PRI_DUMP_INFO_STR +extern char *pri_dump_info_str(struct pri *pri); /* Get file descriptor */ extern int pri_fd(struct pri *pri); diff --git a/pri.c b/pri.c index 95cb650..2873a9c 100755 --- a/pri.c +++ b/pri.c @@ -417,7 +417,7 @@ void pri_message(char *fmt, ...) if (__pri_message) __pri_message(tmp); else - fprintf(stdout, tmp); + fputs(tmp, stdout); } void pri_error(char *fmt, ...) @@ -430,8 +430,9 @@ void pri_error(char *fmt, ...) if (__pri_error) __pri_error(tmp); else - fprintf(stderr, tmp); + fputs(tmp, stderr); } + /* Set overlap mode */ void pri_set_overlapdial(struct pri *pri,int state) { @@ -443,37 +444,41 @@ int pri_fd(struct pri *pri) return pri->fd; } -void pri_dump_info(struct pri *pri) +char *pri_dump_info_str(struct pri *pri) { + char buf[4096]; + int len = 0; #ifdef LIBPRI_COUNTERS struct q921_frame *f; int q921outstanding = 0; #endif if (!pri) - return; + return NULL; /* 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)); + len += sprintf(buf + len, "Switchtype: %s\n", pri_switch2str(pri->switchtype)); + len += sprintf(buf + len, "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); + len += sprintf(buf + len, "Q931 RX: %d\n", pri->q931_rxcount); + len += sprintf(buf + len, "Q931 TX: %d\n", pri->q931_txcount); + len += sprintf(buf + len, "Q921 RX: %d\n", pri->q921_rxcount); + len += sprintf(buf + len, "Q921 TX: %d\n", pri->q921_txcount); f = pri->txqueue; while (f) { q921outstanding++; f = f->next; } - pri_message("Q921 Outstanding: %d\n", q921outstanding); + len += sprintf(buf + len, "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); + len += sprintf(buf + len, "Window Length: %d/%d\n", pri->windowlen, pri->window); + len += sprintf(buf + len, "Sentrej: %d\n", pri->sentrej); + len += sprintf(buf + len, "SolicitFbit: %d\n", pri->solicitfbit); + len += sprintf(buf + len, "Retrans: %d\n", pri->retrans); + len += sprintf(buf + len, "Busy: %d\n", pri->busy); + len += sprintf(buf + len, "Overlap Dial: %d\n", pri->overlapdial); + + return strdup(buf); } int pri_get_crv(struct pri *pri, q931_call *call, int *callmode) diff --git a/pri_q921.h b/pri_q921.h index 6a7eb4a..cb04f86 100755 --- a/pri_q921.h +++ b/pri_q921.h @@ -30,6 +30,9 @@ #include #elif defined(__FreeBSD__) #include +#define __BYTE_ORDER _BYTE_ORDER +#define __BIG_ENDIAN _BIG_ENDIAN +#define __LITTLE_ENDIAN _LITTLE_ENDIAN #endif /* Timer values */ diff --git a/q931.c b/q931.c index 8bf3f44..2a5e6d7 100755 --- a/q931.c +++ b/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; @@ -756,6 +758,7 @@ char *pri_pres2str(int pres) { PRES_PROHIB_USER_NUMBER_PASSED_SCREEN, "Presentation prohibited, user number passed network screening" }, { PRES_PROHIB_USER_NUMBER_FAILED_SCREEN, "Presentation prohibited, user number failed network screening" }, { PRES_PROHIB_NETWORK_NUMBER, "Presentation prohibited of network provided number" }, + { PRES_NUMBER_NOT_AVAILABLE, "Number not available" }, }; return code2str(pres, press, sizeof(press) / sizeof(press[0])); } @@ -865,12 +868,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 +947,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 +1418,7 @@ static FUNC_DUMP(dump_line_information) static FUNC_RECV(receive_line_information) { + call->ani2 = ie->data[0]; return 0; } @@ -1526,7 +1544,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 +2113,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 +2651,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;