408 + return -1; |
408 + return -1; |
409 + } |
409 + } |
410 |
410 |
411 /* Unique ID */ |
411 /* Unique ID */ |
412 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) |
412 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) |
413 Index: chan_capi-1.1.5.20120615/chan_capi20.h |
413 Index: chan_capi-1.1.6/chan_capi20.h |
414 diff -Nau chan_capi-1.1.5.20120615/chan_capi20.h.orig chan_capi-1.1.5.20120615/chan_capi20.h |
414 diff -Nau chan_capi-1.1.6/chan_capi20.h.orig chan_capi-1.1.6/chan_capi20.h |
415 --- chan_capi-1.1.5.20120615/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200 |
415 --- chan_capi-1.1.6/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200 |
416 +++ chan_capi-1.1.5.20120615/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100 |
416 +++ chan_capi-1.1.6/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100 |
417 @@ -4,10 +4,13 @@ |
417 @@ -4,10 +4,13 @@ |
418 * first. Else the checks below will fail. |
418 * first. Else the checks below will fail. |
419 */ |
419 */ |
420 |
420 |
421 +#include <stddef.h> |
421 +#include <stddef.h> |
435 +#endif |
435 +#endif |
436 + |
436 + |
437 #ifndef HEADER_CID |
437 #ifndef HEADER_CID |
438 #define HEADER_CID(x) ((x)->adr.adrNCCI) |
438 #define HEADER_CID(x) ((x)->adr.adrNCCI) |
439 #endif |
439 #endif |
440 Index: chan_capi-1.1.5.20120615/chan_capi_utils.c |
440 Index: chan_capi-1.1.6/chan_capi_utils.c |
441 diff -Nau chan_capi-1.1.5.20120615/chan_capi_utils.c.orig chan_capi-1.1.5.20120615/chan_capi_utils.c |
441 diff -Nau chan_capi-1.1.6/chan_capi_utils.c.orig chan_capi-1.1.6/chan_capi_utils.c |
442 --- chan_capi-1.1.5.20120615/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200 |
442 --- chan_capi-1.1.6/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200 |
443 +++ chan_capi-1.1.5.20120615/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100 |
443 +++ chan_capi-1.1.6/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100 |
444 @@ -1160,6 +1160,9 @@ |
444 @@ -1160,6 +1160,9 @@ |
445 { |
445 { |
446 MESSAGE_EXCHANGE_ERROR error; |
446 MESSAGE_EXCHANGE_ERROR error; |
447 int waitcount = 50; |
447 int waitcount = 50; |
448 +#ifndef CAPI_MANUFACTURER_LEN |
448 +#ifndef CAPI_MANUFACTURER_LEN |
449 +#define CAPI_MANUFACTURER_LEN 64 |
449 +#define CAPI_MANUFACTURER_LEN 64 |
450 +#endif |
450 +#endif |
451 unsigned char manbuf[CAPI_MANUFACTURER_LEN]; |
451 unsigned char manbuf[CAPI_MANUFACTURER_LEN]; |
452 _cmsg CMSG; |
452 _cmsg CMSG; |
453 |
453 |
454 Index: chan_capi-1.1.5.20120615/libcapi20/capi20.c |
454 Index: chan_capi-1.1.6/libcapi20/capi20.c |
455 diff -Nau chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig chan_capi-1.1.5.20120615/libcapi20/capi20.c |
455 diff -Nau chan_capi-1.1.6/libcapi20/capi20.c.orig chan_capi-1.1.6/libcapi20/capi20.c |
456 --- chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100 |
456 --- chan_capi-1.1.6/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100 |
457 +++ chan_capi-1.1.5.20120615/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100 |
457 +++ chan_capi-1.1.6/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100 |
458 @@ -19,8 +19,10 @@ |
458 @@ -19,8 +19,10 @@ |
459 #include <stdio.h> |
459 #include <stdio.h> |
460 #include <ctype.h> |
460 #include <ctype.h> |
461 #include <assert.h> |
461 #include <assert.h> |
462 +#ifdef __linux__ |
462 +#ifdef __linux__ |
746 return CapiNoError; |
746 return CapiNoError; |
747 +#endif |
747 +#endif |
748 } |
748 } |
749 /* |
749 /* |
750 * functions added to the CAPI2.0 spec |
750 * functions added to the CAPI2.0 spec |
751 Index: chan_capi-1.1.5.20120615/libcapi20/convert.c |
751 Index: chan_capi-1.1.6/libcapi20/convert.c |
752 diff -Nau chan_capi-1.1.5.20120615/libcapi20/convert.c.orig chan_capi-1.1.5.20120615/libcapi20/convert.c |
752 diff -Nau chan_capi-1.1.6/libcapi20/convert.c.orig chan_capi-1.1.6/libcapi20/convert.c |
753 --- chan_capi-1.1.5.20120615/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200 |
753 --- chan_capi-1.1.6/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200 |
754 +++ chan_capi-1.1.5.20120615/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100 |
754 +++ chan_capi-1.1.6/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100 |
755 @@ -11,7 +11,14 @@ |
755 @@ -11,7 +11,14 @@ |
756 #include <stddef.h> |
756 #include <stddef.h> |
757 #include <time.h> |
757 #include <time.h> |
758 #include <ctype.h> |
758 #include <ctype.h> |
759 +#ifdef __FreeBSD__ |
759 +#ifdef __FreeBSD__ |
765 #include <byteswap.h> |
765 #include <byteswap.h> |
766 +#endif |
766 +#endif |
767 |
767 |
768 #include "capi20.h" |
768 #include "capi20.h" |
769 |
769 |
770 Index: chan_capi-1.1.5.20120615/Makefile |
770 Index: chan_capi-1.1.6/Makefile |
771 diff -Nau chan_capi-1.1.5.20120615/Makefile.orig chan_capi-1.1.5.20120615/Makefile |
771 diff -Nau chan_capi-1.1.6/Makefile.orig chan_capi-1.1.6/Makefile |
772 --- chan_capi-1.1.5.20120615/Makefile.orig 2011-02-04 18:41:46.000000000 +0100 |
772 --- chan_capi-1.1.6/Makefile.orig 2011-02-04 18:41:46.000000000 +0100 |
773 +++ chan_capi-1.1.5.20120615/Makefile 2012-03-18 17:47:07.888451260 +0100 |
773 +++ chan_capi-1.1.6/Makefile 2012-03-18 17:47:07.888451260 +0100 |
774 @@ -115,6 +115,9 @@ |
774 @@ -115,6 +115,9 @@ |
775 CFLAGS+=-O2 |
775 CFLAGS+=-O2 |
776 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) |
776 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) |
777 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) |
777 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) |
778 +ifeq (${USE_OWN_LIBCAPI},yes) |
778 +ifeq (${USE_OWN_LIBCAPI},yes) |