- removed getting ASTERISKVERSION (we don't need that).

- reverted change for set NCCI in CONNECT_B3_ACTIVE_IND, because
  CONNECT_B3_IND assigned the NCCI.
- reverted change for setting 'ton' in capi_new(), because I don't see
  the fix here and it breaks the feature anyway.

Makefile

@@ -37,8 +37,6 @@ ifeq (${OSNAME},NetBSD)
 ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/pkg/include
 endif
 
-ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
-
 MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
 
 ifeq (${OSNAME},FreeBSD)
@@ -85,8 +83,6 @@ CFLAGS+=-O6
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
 CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
 
-CFLAGS+=-DASTERISKVERSION=\"$(ASTERISKVERSION)\"
-
 LIBS=-ldl -lpthread -lm
 CC=gcc
 INSTALL=install

chan_capi.c

@@ -111,11 +111,11 @@ static char *ccdesc = "Common ISDN API for OpenPBX";
 static char *ccdesc = "Common ISDN API for Asterisk";
 #endif
 #ifdef CC_AST_HAVE_TECH_PVT
-static const char tdesc[] = "Common ISDN API Driver (" CC_VERSION ") " ASTERISKVERSION;
+static const char tdesc[] = "Common ISDN API Driver (" CC_VERSION ")";
 static const char channeltype[] = "CAPI";
 static const struct ast_channel_tech capi_tech;
 #else
-static char *tdesc = "Common ISDN API Driver (" CC_VERSION ") " ASTERISKVERSION;
+static char *tdesc = "Common ISDN API Driver (" CC_VERSION ")";
 static char *channeltype = "CAPI";
 #endif
 
@@ -1978,9 +1978,7 @@ static struct ast_channel *capi_new(struct capi_pvt *i, int state)
 		}
 		tmp->cid.cid_dnid = strdup(i->dnid);
 	}
-	tmp->cid.cid_ton = 0; /* NOTE: number is already prefixed! 
-			       * (was: i->cid_ton) 
-			       */
+	tmp->cid.cid_ton = i->cid_ton;
 #else
 	if (!ast_strlen_zero(i->cid)) {
 		if (tmp->callerid) {
@@ -3151,8 +3149,6 @@ static void capi_handle_connect_b3_active_indication(_cmsg *CMSG, unsigned int P
 
 	return_on_no_interface("CONNECT_ACTIVE_B3_IND");
 
-	i->NCCI = NCCI;
-
 	cc_mutex_lock(&contrlock);
 	if (i->controller > 0) {
 		capi_controllers[i->controller]->nfreebchannels--;

openpbx.ctrl

@@ -1,8 +1,6 @@
 
 #define PBX_IS_OPBX
 
-#define ASTERISKVERSION            OPBX_VERSION_INFO
-
 #define CC_AST_HAS_TYPE_IN_CHANNEL
 #undef  CC_AST_HAS_STRINGFIELD_IN_CHANNEL
 #define CC_AST_HAVE_TECH_PVT