377 + return -1; |
377 + return -1; |
378 + } |
378 + } |
379 |
379 |
380 /* Unique ID */ |
380 /* Unique ID */ |
381 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) |
381 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) |
382 Index: chan_capi-1.1.5.20110914/chan_capi20.h |
382 Index: chan_capi-1.1.5.20120324/chan_capi20.h |
383 diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h |
383 diff -Nau chan_capi-1.1.5.20120324/chan_capi20.h.orig chan_capi-1.1.5.20120324/chan_capi20.h |
384 --- chan_capi-1.1.5.20110914/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200 |
384 --- chan_capi-1.1.5.20120324/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200 |
385 +++ chan_capi-1.1.5.20110914/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100 |
385 +++ chan_capi-1.1.5.20120324/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100 |
386 @@ -4,10 +4,13 @@ |
386 @@ -4,10 +4,13 @@ |
387 * first. Else the checks below will fail. |
387 * first. Else the checks below will fail. |
388 */ |
388 */ |
389 |
389 |
390 +#include <stddef.h> |
390 +#include <stddef.h> |
404 +#endif |
404 +#endif |
405 + |
405 + |
406 #ifndef HEADER_CID |
406 #ifndef HEADER_CID |
407 #define HEADER_CID(x) ((x)->adr.adrNCCI) |
407 #define HEADER_CID(x) ((x)->adr.adrNCCI) |
408 #endif |
408 #endif |
409 Index: chan_capi-1.1.5.20110914/chan_capi_utils.c |
409 Index: chan_capi-1.1.5.20120324/chan_capi_utils.c |
410 diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c |
410 diff -Nau chan_capi-1.1.5.20120324/chan_capi_utils.c.orig chan_capi-1.1.5.20120324/chan_capi_utils.c |
411 --- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200 |
411 --- chan_capi-1.1.5.20120324/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200 |
412 +++ chan_capi-1.1.5.20110914/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100 |
412 +++ chan_capi-1.1.5.20120324/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100 |
413 @@ -1158,6 +1158,9 @@ |
413 @@ -1160,6 +1160,9 @@ |
414 { |
414 { |
415 MESSAGE_EXCHANGE_ERROR error; |
415 MESSAGE_EXCHANGE_ERROR error; |
416 int waitcount = 50; |
416 int waitcount = 50; |
417 +#ifndef CAPI_MANUFACTURER_LEN |
417 +#ifndef CAPI_MANUFACTURER_LEN |
418 +#define CAPI_MANUFACTURER_LEN 64 |
418 +#define CAPI_MANUFACTURER_LEN 64 |
419 +#endif |
419 +#endif |
420 unsigned char manbuf[CAPI_MANUFACTURER_LEN]; |
420 unsigned char manbuf[CAPI_MANUFACTURER_LEN]; |
421 _cmsg CMSG; |
421 _cmsg CMSG; |
422 |
422 |
423 Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c |
423 Index: chan_capi-1.1.5.20120324/libcapi20/capi20.c |
424 diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c |
424 diff -Nau chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig chan_capi-1.1.5.20120324/libcapi20/capi20.c |
425 --- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100 |
425 --- chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100 |
426 +++ chan_capi-1.1.5.20110914/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100 |
426 +++ chan_capi-1.1.5.20120324/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100 |
427 @@ -19,8 +19,10 @@ |
427 @@ -19,8 +19,10 @@ |
428 #include <stdio.h> |
428 #include <stdio.h> |
429 #include <ctype.h> |
429 #include <ctype.h> |
430 #include <assert.h> |
430 #include <assert.h> |
431 +#ifdef __linux__ |
431 +#ifdef __linux__ |
715 return CapiNoError; |
715 return CapiNoError; |
716 +#endif |
716 +#endif |
717 } |
717 } |
718 /* |
718 /* |
719 * functions added to the CAPI2.0 spec |
719 * functions added to the CAPI2.0 spec |
720 Index: chan_capi-1.1.5.20110914/libcapi20/convert.c |
720 Index: chan_capi-1.1.5.20120324/libcapi20/convert.c |
721 diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c |
721 diff -Nau chan_capi-1.1.5.20120324/libcapi20/convert.c.orig chan_capi-1.1.5.20120324/libcapi20/convert.c |
722 --- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200 |
722 --- chan_capi-1.1.5.20120324/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200 |
723 +++ chan_capi-1.1.5.20110914/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100 |
723 +++ chan_capi-1.1.5.20120324/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100 |
724 @@ -11,7 +11,14 @@ |
724 @@ -11,7 +11,14 @@ |
725 #include <stddef.h> |
725 #include <stddef.h> |
726 #include <time.h> |
726 #include <time.h> |
727 #include <ctype.h> |
727 #include <ctype.h> |
728 +#ifdef __FreeBSD__ |
728 +#ifdef __FreeBSD__ |
734 #include <byteswap.h> |
734 #include <byteswap.h> |
735 +#endif |
735 +#endif |
736 |
736 |
737 #include "capi20.h" |
737 #include "capi20.h" |
738 |
738 |
739 Index: chan_capi-1.1.5.20110914/Makefile |
739 Index: chan_capi-1.1.5.20120324/Makefile |
740 diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile |
740 diff -Nau chan_capi-1.1.5.20120324/Makefile.orig chan_capi-1.1.5.20120324/Makefile |
741 --- chan_capi-1.1.5.20110914/Makefile.orig 2011-02-04 18:41:46.000000000 +0100 |
741 --- chan_capi-1.1.5.20120324/Makefile.orig 2011-02-04 18:41:46.000000000 +0100 |
742 +++ chan_capi-1.1.5.20110914/Makefile 2012-03-18 17:47:07.888451260 +0100 |
742 +++ chan_capi-1.1.5.20120324/Makefile 2012-03-18 17:47:07.888451260 +0100 |
743 @@ -114,6 +114,9 @@ |
743 @@ -114,6 +114,9 @@ |
744 CFLAGS+=-O2 |
744 CFLAGS+=-O2 |
745 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) |
745 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) |
746 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) |
746 CFLAGS+=$(shell if uname -m | grep -q "ppc\|arm\|s390"; then echo "-fsigned-char"; fi) |
747 +ifeq (${USE_OWN_LIBCAPI},yes) |
747 +ifeq (${USE_OWN_LIBCAPI},yes) |