retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added compat to new ast_config* API of current Asterisk CVS HEAD.

This commit is contained in:
MelwareDE 2005-06-15 07:31:28 +00:00
parent 887913bffc
commit ec9b3886c6
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
chan_capi.c
View File

@ -52,6 +52,13 @@
#include "chan_capi_app.h"
#include "chan_capi_pvt.h"
#define CC_VERSION "cm-0.5"
#ifdef CAPI_ULAW
#define LAW_STRING "uLaw"
#else
#define LAW_STRING "aLaw"
#endif
/*
* personal stuff
@ -61,18 +68,10 @@ unsigned ast_capi_ApplID;
static _cword ast_capi_MessageNumber = 1;
static char *desc = "Common ISDN API for Asterisk";
#ifdef CC_AST_HAVE_TECH_PVT
#ifdef CAPI_ULAW
static const char tdesc[] = "Common ISDN API Driver (0.4.0) muLaw "ASTERISKVERSION;
#else
static const char tdesc[] = "Common ISDN API Driver (0.4.0) aLaw "ASTERISKVERSION;
#endif
static const char tdesc[] = "Common ISDN API Driver (" CC_VERSION ") " LAW_STRING " " ASTERISKVERSION;
static const char type[] = "CAPI";
#else
#ifdef CAPI_ULAW
static char *tdesc = "Common ISDN API Driver (0.4.0) muLaw "ASTERISKVERSION;
#else
static char *tdesc = "Common ISDN API Driver (0.4.0) aLaw "ASTERISKVERSION;
#endif
static char *tdesc = "Common ISDN API Driver (" CC_VERSION ") " LAW_STRING " "ASTERISKVERSION;
static char *type = "CAPI";
#endif
@ -3020,7 +3019,7 @@ int load_module(void)
unsigned int group = 0;
struct ast_capi_controller *cp;
cfg = ast_load(config);
cfg = ast_config_load(config);
/* We *must* have a config file otherwise stop immediately, well no */
if (!cfg) {
@ -3224,7 +3223,7 @@ int load_module(void)
}
v = v->next;
}
ast_destroy(cfg);
ast_config_destroy(cfg);
for (controller = 1; controller <= capi_num_controllers; controller++) {
if (capi_used_controllers & (1 << controller)) {

8
create_config.sh
View File

@ -74,6 +74,14 @@ else
echo " * no 'transfercapability'"
fi
if grep -q "ast_config_load" $INCLUDEDIR/config.h; then
echo " * found 'ast_config_load'"
else
echo "#define ast_config_load(x) ast_load(x)" >>$CONFIGFILE
echo "#define ast_config_destroy(x) ast_destroy(x)" >>$CONFIGFILE
echo " * no 'ast_config_load'"
fi
echo "" >>$CONFIGFILE
echo "#endif /* CHAN_CAPI_CONFIG_H */" >>$CONFIGFILE