capisuite/capisuite-0.4.5-capi4linux_v3.diff

   1 diff -urN capisuite-0.4.5.org/acinclude.m4 capisuite-0.4.5/acinclude.m4
   2 --- capisuite-0.4.5.org/acinclude.m4    2004-11-28 14:35:28.000000000 +0100
   3 +++ capisuite-0.4.5/acinclude.m4        2005-03-08 07:31:42.130970593 +0100
   4 @@ -72,6 +72,21 @@
   5  )
   6  ]) dnl CS_TEST_CAPI4LINUX
   7
   8 +#
   9 +# old capiutils.h missed the Globalconfiguration in BProtocol
  10 +# in library version 3 this was added to the API
  11 +#
  12 +AC_DEFUN([CS_TEST_CAPI4LINUX_V3],
  13 +[AC_MSG_CHECKING([for capi20 ALERT with sending complete])
  14 +AC_TRY_COMPILE([#include <capiutils.h>],
  15 +  [_cmsg cm;void *p; p=CONNECT_REQ_GLOBALCONFIGURATION(&cm);],
  16 +  [
  17 +    AC_DEFINE([HAVE_CAPI4LINUX_V3],1,[we have GLOBALCONFIGURATION in BProtocol])
  18 +    AC_MSG_RESULT([yes])
  19 +  ],
  20 +  [AC_MSG_RESULT([no])]
  21 +)]) dnl CS_TEST_CAPI4LINUX_V3
  22 +
  23  # PGAC_CHECK_PYTHON_DIRS
  24  # -----------------------
  25  # Determine the name of various directory of a given Python installation.
  26 diff -urN capisuite-0.4.5.org/config.h.in capisuite-0.4.5/config.h.in
  27 --- capisuite-0.4.5.org/config.h.in     2004-11-28 14:36:20.000000000 +0100
  28 +++ capisuite-0.4.5/config.h.in 2005-03-08 07:31:42.135969715 +0100
  29 @@ -18,6 +18,9 @@
  30  /* we have new ALERT_REQ implementation */
  31  #undef HAVE_NEW_CAPI4LINUX
  32
  33 +/* we have GLOBALCONFIGURATION in BProtocol */
  34 +#undef HAVE_CAPI4LINUX_V3
  35 +
  36  /* we can #include<ostream> instead of ostream.h - new gcc3 feature */
  37  #undef HAVE_OSTREAM
  38
  39 diff -urN capisuite-0.4.5.org/configure.in capisuite-0.4.5/configure.in
  40 --- capisuite-0.4.5.org/configure.in    2004-11-28 14:35:16.000000000 +0100
  41 +++ capisuite-0.4.5/configure.in        2005-03-08 07:31:42.141968662 +0100
  42 @@ -18,6 +18,7 @@
  43  CS_TEST_GCC3
  44  CS_TEST_SFFTOBMP
  45  CS_TEST_CAPI4LINUX
  46 +CS_TEST_CAPI4LINUX_V3
  47
  48  CS_SET_DOCDIR
  49
  50 diff -urN capisuite-0.4.5.org/src/backend/capi.cpp capisuite-0.4.5/src/backend/capi.cpp
  51 --- capisuite-0.4.5.org/src/backend/capi.cpp    2004-11-28 14:35:25.000000000 +0100
  52 +++ capisuite-0.4.5/src/backend/capi.cpp        2005-03-08 07:35:02.553782154 +0100
  53 @@ -148,7 +148,15 @@
  54                 << " CIPValue 0x" << CIPValue << ", B1proto 0x" << B1protocol << ", B2proto 0x" << B2protocol <<", B3proto 0x" << B3protocol << endl;
  55         }
  56         unsigned info=CONNECT_REQ(&CMSG, applId, messageNumber, controller, CIPValue, calledPartyNumber, callingPartyNumber, NULL, NULL,
  57 -               B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
  58 +               B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration,
  59 +       #ifdef HAVE_CAPI4LINUX_V3
  60 +               NULL,
  61 +       #endif
  62 +               NULL, NULL, NULL, NULL, NULL, NULL, NULL
  63 +       #ifdef HAVE_CAPI4LINUX_V3
  64 +               ,NULL
  65 +       #endif
  66 +       );
  67         if (debug_level >= 2) {
  68                 debug << prefix() << "info: " << info << endl;
  69         }
  70 @@ -181,7 +189,12 @@
  71
  72         if (debug_level >= 2)           debug << prefix() << ">SELECT_B_PROTOCOL_REQ: ApplId 0x" << hex << applId << ", MsgNr 0x" << messageNumber << ", PLCI 0x" << plci
  73                              << ", B1protocol " << B1protocol << ", B2protocol " << B2protocol << ", B3protocol " << B3protocol << endl;
  74 -       unsigned info=SELECT_B_PROTOCOL_REQ(&CMSG, applId, messageNumber++, plci, B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration);
  75 +       unsigned info=SELECT_B_PROTOCOL_REQ(&CMSG, applId, messageNumber++, plci, B1protocol, B2protocol, B3protocol,
  76 +               B1configuration, B2configuration, B3configuration
  77 +       #ifdef HAVE_CAPI4LINUX_V3
  78 +               ,NULL
  79 +       #endif
  80 +       );
  81         if (debug_level >= 2)
  82                         debug << prefix() << "info: " << info << endl;
  83
  84 @@ -295,12 +308,17 @@
  85                  << reject << ", B1proto 0x" << B1protocol << ", B2proto 0x" << B2protocol << ", B3proto 0x" << B3protocol << endl;
  86
  87         _cmsg new_message;
  88 -       unsigned info=CONNECT_RESP(&new_message, applId, messageNumber, plci, reject, B1protocol, B2protocol, B3protocol, B1configuration, B2configuration, B3configuration, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
  89 +       unsigned info=CONNECT_RESP(&new_message, applId, messageNumber, plci, reject, B1protocol, B2protocol, B3protocol,
  90 +               B1configuration, B2configuration, B3configuration,
  91 +       #ifdef HAVE_CAPI4LINUX_V3
  92 +               NULL,
  93 +       #endif
  94 +               NULL, NULL, NULL, NULL, NULL, NULL, NULL);
  95         if (debug_level >= 2)
  96                 debug << prefix() << "info: " << info << endl;
  97
  98         if (info != 0)
  99 -               throw(CapiMsgError(info,"Error while CONNECT_REQ: "+Capi::describeParamInfo(info),"Capi::connect_resp()"));
 100 +               throw(CapiMsgError(info,"Error while CONNECT_RESP: "+Capi::describeParamInfo(info),"Capi::connect_resp()"));
 101
 102  }
 103