kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add to chan_dahdi ISDN HOLD, Call deflection, and keypad facility support.

Browse Source 
* Added handling of received HOLD/RETRIEVE messages and the optional ability
  to transfer a held call on disconnect similar to an analog phone.
* Added CallRerouting/CallDeflection support for Q.SIG, ETSI PTP, ETSI PTMP.
  Will reroute/deflect an outgoing call when receive the message.
  Can use the DAHDISendCallreroutingFacility to send the message for the
  supported switches.
* Added ability to send/receive keypad digits in the SETUP message.
  Send keypad digits in SETUP message: Dial(DAHDI/g1[/K<keypad_digits>][/extension])
  Access any received keypad digits in SETUP message by: ${CHANNEL(keypad_digits)}
* Added support for BRI PTMP NT mode.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@225692 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-10-23 16:57:33 +00:00
parent 52a2ded0cd
commit cff6d02b53
8 changed files with 1890 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGES
View File

@@ -224,6 +224,16 @@ libpri channel driver (chan_dahdi) DAHDI changes
configured via the rxdrc and txdrc parameters in chan_dahdi.conf.
* Added support for ISDN calling and called subaddress with partial support
for connected line subaddress.
* Added support for BRI PTMP NT mode. (Requires latest LibPRI.)
* Added handling of received HOLD/RETRIEVE messages and the optional ability
to transfer a held call on disconnect similar to an analog phone.
* Added CallRerouting/CallDeflection support for Q.SIG, ETSI PTP, ETSI PTMP.
Will reroute/deflect an outgoing call when receive the message.
Can use the DAHDISendCallreroutingFacility to send the message for the
supported switches.
* Added ability to send/receive keypad digits in the SETUP message.
Send keypad digits in SETUP message: Dial(DAHDI/g1[/K<keypad_digits>][/extension])
Access any received keypad digits in SETUP message by: ${CHANNEL(keypad_digits)}
Asterisk Manager Interface
--------------------------

337
channels/chan_dahdi.c
View File

@@ -684,6 +684,9 @@ struct mwisend_info {
enum DAHDI_IFLIST {
DAHDI_IFLIST_NONE, /*!< The dahdi_pvt is not in any list. */
DAHDI_IFLIST_MAIN, /*!< The dahdi_pvt is in the main interface list */
#if defined(HAVE_PRI)
DAHDI_IFLIST_NO_B_CHAN, /*!< The dahdi_pvt is in a no B channel interface list */
#endif /* defined(HAVE_PRI) */
};
struct dahdi_pvt {
@@ -1261,6 +1264,15 @@ struct dahdi_pvt {
static struct dahdi_pvt *iflist = NULL; /*!< Main interface list start */
static struct dahdi_pvt *ifend = NULL; /*!< Main interface list end */
#if defined(HAVE_PRI)
static struct dahdi_parms_pseudo {
int buf_no; /*!< Number of buffers */
int buf_policy; /*!< Buffer policy */
int faxbuf_no; /*!< Number of Fax buffers */
int faxbuf_policy; /*!< Fax buffer policy */
} dahdi_pseudo_parms;
#endif /* defined(HAVE_PRI) */
/*! \brief Channel configuration from chan_dahdi.conf .
* This struct is used for parsing the [channels] section of chan_dahdi.conf.
* Generally there is a field here for every possible configuration item.
@@ -2762,6 +2774,8 @@ static void my_pri_set_rdnis(void *pvt, const char *rdnis)
ast_copy_string(p->rdnis, rdnis, sizeof(p->rdnis));
}
static int dahdi_new_pri_nobch_channel(struct sig_pri_pri *pri);
static struct sig_pri_callback dahdi_pri_callbacks =
{
.handle_dchan_exception = my_handle_dchan_exception,
@@ -2776,6 +2790,7 @@ static struct sig_pri_callback dahdi_pri_callbacks =
.set_callerid = my_pri_set_callerid,
.set_dnid = my_pri_set_dnid,
.set_rdnis = my_pri_set_rdnis,
.new_nobch_intf = dahdi_new_pri_nobch_channel,
};
#endif /* defined(HAVE_PRI) */
@@ -4085,6 +4100,14 @@ static void dahdi_enable_ec(struct dahdi_pvt *p)
if (p->echocancel.head.tap_length) {
switch (p->sig) {
case SIG_PRI_LIB_HANDLE_CASES:
if (((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) {
/*
* PRI nobch pseudo channel. Does not need ec anyway.
* Does not handle ioctl(DAHDI_AUDIOMODE)
*/
return;
}
/* Fall through */
case SIG_SS7:
x = 1;
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &x);
@@ -4339,6 +4362,11 @@ static inline int dahdi_confmute(struct dahdi_pvt *p, int muted)
x = muted;
switch (p->sig) {
case SIG_PRI_LIB_HANDLE_CASES:
if (((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) {
/* PRI nobch pseudo channel. Does not handle ioctl(DAHDI_AUDIOMODE) */
break;
}
/* Fall through */
case SIG_SS7:
y = 1;
res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_AUDIOMODE, &y);
@@ -4860,6 +4888,101 @@ static void dahdi_iflist_extract(struct dahdi_pvt *pvt)
pvt->next = NULL;
}
#if defined(HAVE_PRI)
/*!
* \internal
* \brief Insert the given chan_dahdi interface structure into the no B channel list.
* \since 1.6.3
*
* \param pri sig_pri span control structure holding no B channel list.
* \param pvt chan_dahdi private interface structure to insert.
*
* \details
* The interface list is a doubly linked list sorted by the chan_dahdi channel number.
* Any duplicates are inserted after the existing entries.
*
* \note The new interface must not already be in the list.
*
* \return Nothing
*/
static void dahdi_nobch_insert(struct sig_pri_pri *pri, struct dahdi_pvt *pvt)
{
struct dahdi_pvt *cur;
pvt->which_iflist = DAHDI_IFLIST_NO_B_CHAN;
/* Find place in middle of list for the new interface. */
for (cur = pri->no_b_chan_iflist; cur; cur = cur->next) {
if (pvt->channel < cur->channel) {
/* New interface goes before the current interface. */
pvt->prev = cur->prev;
pvt->next = cur;
if (cur->prev) {
/* Insert into the middle of the list. */
cur->prev->next = pvt;
} else {
/* Insert at head of list. */
pri->no_b_chan_iflist = pvt;
}
cur->prev = pvt;
return;
}
}
/* New interface goes onto the end of the list */
pvt->prev = pri->no_b_chan_end;
pvt->next = NULL;
if (pri->no_b_chan_end) {
((struct dahdi_pvt *) pri->no_b_chan_end)->next = pvt;
}
pri->no_b_chan_end = pvt;
if (!pri->no_b_chan_iflist) {
/* List was empty */
pri->no_b_chan_iflist = pvt;
}
}
#endif /* defined(HAVE_PRI) */
#if defined(HAVE_PRI)
/*!
* \internal
* \brief Extract the given chan_dahdi interface structure from the no B channel list.
* \since 1.6.3
*
* \param pri sig_pri span control structure holding no B channel list.
* \param pvt chan_dahdi private interface structure to extract.
*
* \note
* The given interface structure can be either in the interface list or a stand alone
* structure that has not been put in the list if the next and prev pointers are NULL.
*
* \return Nothing
*/
static void dahdi_nobch_extract(struct sig_pri_pri *pri, struct dahdi_pvt *pvt)
{
/* Extract from the forward chain. */
if (pvt->prev) {
pvt->prev->next = pvt->next;
} else if (pri->no_b_chan_iflist == pvt) {
/* Node is at the head of the list. */
pri->no_b_chan_iflist = pvt->next;
}
/* Extract from the reverse chain. */
if (pvt->next) {
pvt->next->prev = pvt->prev;
} else if (pri->no_b_chan_end == pvt) {
/* Node is at the end of the list. */
pri->no_b_chan_end = pvt->prev;
}
/* Node is no longer in the list. */
pvt->which_iflist = DAHDI_IFLIST_NONE;
pvt->prev = NULL;
pvt->next = NULL;
}
#endif /* defined(HAVE_PRI) */
#if defined(HAVE_PRI)
/*!
* \internal
@@ -4906,6 +5029,13 @@ static void destroy_dahdi_pvt(struct dahdi_pvt *pvt)
case DAHDI_IFLIST_MAIN:
dahdi_iflist_extract(p);
break;
#if defined(HAVE_PRI)
case DAHDI_IFLIST_NO_B_CHAN:
if (p->pri) {
dahdi_nobch_extract(p->pri, p);
}
break;
#endif /* defined(HAVE_PRI) */
}
if (p->sig_pvt) {
@@ -4956,6 +5086,10 @@ static void destroy_channel(struct dahdi_pvt *cur, int now)
static void destroy_all_channels(void)
{
int chan;
#if defined(HAVE_PRI)
unsigned span;
struct sig_pri_pri *pri;
#endif /* defined(HAVE_PRI) */
struct dahdi_pvt *p;
while (num_restart_pending) {
@@ -4989,6 +5123,21 @@ static void destroy_all_channels(void)
}
ifcount = 0;
ast_mutex_unlock(&iflock);
#if defined(HAVE_PRI)
/* Destroy all of the no B channel interface lists */
for (span = 0; span < NUM_SPANS; ++span) {
pri = &pris[span].pri;
ast_mutex_lock(&pri->lock);
while (pri->no_b_chan_iflist) {
p = pri->no_b_chan_iflist;
/* Free associated memory */
destroy_dahdi_pvt(p);
}
ast_mutex_unlock(&pri->lock);
}
#endif /* defined(HAVE_PRI) */
}
#if defined(HAVE_PRI)
@@ -5024,7 +5173,7 @@ static char *dahdi_send_callrerouting_facility_app = "DAHDISendCallreroutingFaci
static int dahdi_send_callrerouting_facility_exec(struct ast_channel *chan, const char *data)
{
/* Data will be our digit string */
struct dahdi_pvt *p;
struct dahdi_pvt *pvt;
char *parse;
int res = -1;
AST_DECLARE_APP_ARGS(args,
@@ -5037,13 +5186,23 @@ static int dahdi_send_callrerouting_facility_exec(struct ast_channel *chan, cons
ast_log(LOG_DEBUG, "No data sent to application!\n");
return -1;
}
p = (struct dahdi_pvt *)chan->tech_pvt;
if (!p) {
if (chan->tech != &dahdi_tech) {
ast_log(LOG_DEBUG, "Only DAHDI technology accepted!\n");
return -1;
}
pvt = (struct dahdi_pvt *) chan->tech_pvt;
if (!pvt) {
ast_log(LOG_DEBUG, "Unable to find technology private\n");
return -1;
}
switch (pvt->sig) {
case SIG_PRI_LIB_HANDLE_CASES:
break;
default:
ast_log(LOG_DEBUG, "callrerouting attempted on non-ISDN channel %s\n",
chan->name);
return -1;
}
parse = ast_strdupa(data);
AST_STANDARD_APP_ARGS(args, parse);
@@ -5063,7 +5222,8 @@ static int dahdi_send_callrerouting_facility_exec(struct ast_channel *chan, cons
args.reason = NULL;
}
pri_send_callrerouting_facility_exec(p->sig_pvt, chan->_state, args.destination, args.original, args.reason);
pri_send_callrerouting_facility_exec(pvt->sig_pvt, chan->_state, args.destination,
args.original, args.reason);
return res;
}
@@ -5865,6 +6025,12 @@ static int dahdi_setoption(struct ast_channel *chan, int option, void *data, int
ast_dsp_set_digitmode(p->dsp, ((*cp) ? DSP_DIGITMODE_RELAXDTMF : DSP_DIGITMODE_DTMF) | p->dtmfrelax);
break;
case AST_OPTION_AUDIO_MODE: /* Set AUDIO mode (or not) */
if (dahdi_sig_pri_lib_handles(p->sig)
&& ((struct sig_pri_chan *) p->sig_pvt)->no_b_channel) {
/* PRI nobch pseudo channel. Does not handle ioctl(DAHDI_AUDIOMODE) */
break;
}
cp = (char *) data;
if (!*cp) {
ast_debug(1, "Set option AUDIO MODE, value: OFF(0) on %s\n", chan->name);
@@ -5954,6 +6120,7 @@ static int dahdi_func_read(struct ast_channel *chan, const char *function, char
ast_mutex_lock(&p->lock);
snprintf(buf, len, "%f", p->txgain);
ast_mutex_unlock(&p->lock);
#if defined(HAVE_PRI)
#if defined(HAVE_PRI_REVERSE_CHARGE)
} else if (!strcasecmp(data, "reversecharge")) {
ast_mutex_lock(&p->lock);
@@ -5968,6 +6135,22 @@ static int dahdi_func_read(struct ast_channel *chan, const char *function, char
}
ast_mutex_unlock(&p->lock);
#endif
#if defined(HAVE_PRI_SETUP_KEYPAD)
} else if (!strcasecmp(data, "keypad_digits")) {
ast_mutex_lock(&p->lock);
switch (p->sig) {
case SIG_PRI_LIB_HANDLE_CASES:
ast_copy_string(buf, ((struct sig_pri_chan *) p->sig_pvt)->keypad_digits,
len);
break;
default:
*buf = '\0';
res = -1;
break;
}
ast_mutex_unlock(&p->lock);
#endif /* defined(HAVE_PRI_SETUP_KEYPAD) */
#endif /* defined(HAVE_PRI) */
} else {
*buf = '\0';
res = -1;
@@ -6226,6 +6409,21 @@ static enum ast_bridge_result dahdi_bridge(struct ast_channel *c0, struct ast_ch
return AST_BRIDGE_RETRY;
}
if ((dahdi_sig_pri_lib_handles(p0->sig)
&& ((struct sig_pri_chan *) p0->sig_pvt)->no_b_channel)
|| (dahdi_sig_pri_lib_handles(p1->sig)
&& ((struct sig_pri_chan *) p1->sig_pvt)->no_b_channel)) {
/*
* PRI nobch channels (hold and call waiting) are equivalent to
* pseudo channels and cannot be done here.
*/
ast_mutex_unlock(&p0->lock);
ast_mutex_unlock(&p1->lock);
ast_channel_unlock(c0);
ast_channel_unlock(c1);
return AST_BRIDGE_FAILED_NOWARN;
}
if ((oi0 == SUB_REAL) && (oi1 == SUB_REAL)) {
if (p0->owner && p1->owner) {
/* If we don't have a call-wait in a 3-way, and we aren't in a 3-way, we can be master */
@@ -11115,6 +11313,10 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
#ifdef HAVE_PRI_INBANDDISCONNECT
pris[span].pri.inbanddisconnect = conf->pri.pri.inbanddisconnect;
#endif
#if defined(HAVE_PRI_CALL_HOLD)
pris[span].pri.hold_disconnect_transfer =
conf->pri.pri.hold_disconnect_transfer;
#endif /* defined(HAVE_PRI_CALL_HOLD) */
pris[span].pri.facilityenable = conf->pri.pri.facilityenable;
ast_copy_string(pris[span].pri.msn_list, conf->pri.pri.msn_list, sizeof(pris[span].pri.msn_list));
ast_copy_string(pris[span].pri.idledial, conf->pri.pri.idledial, sizeof(pris[span].pri.idledial));
@@ -11520,6 +11722,16 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
ast_copy_string(pchan->mohinterpret, tmp->mohinterpret, sizeof(pchan->mohinterpret));
pchan->stripmsd = tmp->stripmsd;
}
if (tmp->channel == CHAN_PSEUDO) {
/*
* Save off pseudo channel buffer policy values for dynamic creation of
* no B channel interfaces.
*/
dahdi_pseudo_parms.buf_no = tmp->buf_no;
dahdi_pseudo_parms.buf_policy = tmp->buf_policy;
dahdi_pseudo_parms.faxbuf_no = tmp->faxbuf_no;
dahdi_pseudo_parms.faxbuf_policy = tmp->faxbuf_policy;
}
#endif /* defined(HAVE_PRI) */
}
if (tmp && !here) {
@@ -11591,6 +11803,110 @@ static inline int available(struct dahdi_pvt *p, int channelmatch, ast_group_t g
return 0;
}
#if defined(HAVE_PRI)
/*!
* \internal
* \brief Create a no B channel interface.
* \since 1.6.3
*
* \param pri sig_pri span controller to add interface.
*
* \note Assumes the pri->lock is already obtained.
*
* \retval array-index into private pointer array on success.
* \retval -1 on error.
*/
static int dahdi_new_pri_nobch_channel(struct sig_pri_pri *pri)
{
int pvt_idx;
int res;
unsigned idx;
struct dahdi_pvt *pvt;
struct sig_pri_chan *chan;
struct dahdi_bufferinfo bi;
static int nobch_channel = CHAN_PSEUDO;
/* Find spot in the private pointer array for new interface. */
for (pvt_idx = 0; pvt_idx < pri->numchans; ++pvt_idx) {
if (!pri->pvts[pvt_idx]) {
break;
}
}
if (pri->numchans == pvt_idx) {
if (MAX_CHANNELS <= pvt_idx) {
ast_log(LOG_ERROR, "Unable to add a no-B-channel interface!\n");
return -1;
}
/* Add new spot to the private pointer array. */
pri->pvts[pvt_idx] = NULL;
++pri->numchans;
}
pvt = ast_calloc(1, sizeof(*pvt));
if (!pvt) {
return -1;
}
ast_mutex_init(&pvt->lock);
for (idx = 0; idx < ARRAY_LEN(pvt->subs); ++idx) {
pvt->subs[idx].dfd = -1;
}
pvt->buf_no = dahdi_pseudo_parms.buf_no;
pvt->buf_policy = dahdi_pseudo_parms.buf_policy;
pvt->faxbuf_no = dahdi_pseudo_parms.faxbuf_no;
pvt->faxbuf_policy = dahdi_pseudo_parms.faxbuf_policy;
chan = sig_pri_chan_new(pvt, &dahdi_pri_callbacks, pri, 0, 0, 0);
if (!chan) {
destroy_dahdi_pvt(pvt);
return -1;
}
chan->no_b_channel = 1;
pvt->sig = pri->sig;
pvt->pri = pri;
pvt->sig_pvt = chan;
pri->pvts[pvt_idx] = chan;
pvt->subs[SUB_REAL].dfd = dahdi_open("/dev/dahdi/pseudo");
if (pvt->subs[SUB_REAL].dfd < 0) {
ast_log(LOG_ERROR, "Unable to open no B channel interface pseudo channel: %s\n",
strerror(errno));
destroy_dahdi_pvt(pvt);
return -1;
}
memset(&bi, 0, sizeof(bi));
res = ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_GET_BUFINFO, &bi);
if (!res) {
pvt->bufsize = bi.bufsize;
bi.txbufpolicy = pvt->buf_policy;
bi.rxbufpolicy = pvt->buf_policy;
bi.numbufs = pvt->buf_no;
res = ioctl(pvt->subs[SUB_REAL].dfd, DAHDI_SET_BUFINFO, &bi);
if (res < 0) {
ast_log(LOG_WARNING,
"Unable to set buffer policy on no B channel interface: %s\n",
strerror(errno));
}
} else
ast_log(LOG_WARNING,
"Unable to check buffer policy on no B channel interface: %s\n",
strerror(errno));
--nobch_channel;
if (CHAN_PSEUDO < nobch_channel) {
nobch_channel = CHAN_PSEUDO - 1;
}
pvt->channel = nobch_channel;
chan->channel = pvt->channel;
dahdi_nobch_insert(pri, pvt);
return pvt_idx;
}
#endif /* defined(HAVE_PRI) */
/* This function can *ONLY* be used for copying pseudo (CHAN_PSEUDO) private
structures; it makes no attempt to safely copy regular channel private
structures that might contain reference-counted object pointers and other
@@ -15771,7 +16087,12 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
confp->chan.sig = SIG_BRI_PTMP;
confp->pri.pri.nodetype = PRI_CPE;
} else if (!strcasecmp(v->value, "bri_net_ptmp")) {
#if defined(HAVE_PRI_CALL_HOLD)
confp->chan.sig = SIG_BRI_PTMP;
confp->pri.pri.nodetype = PRI_NETWORK;
#else
ast_log(LOG_WARNING, "How cool would it be if someone implemented this mode! For now, sucks for you. (line %d)\n", v->lineno);
#endif /* !defined(HAVE_PRI_CALL_HOLD) */
#endif
#ifdef HAVE_SS7
} else if (!strcasecmp(v->value, "ss7")) {
@@ -16004,6 +16325,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
#endif /* PRI_GETSET_TIMERS */
} else if (!strcasecmp(v->name, "facilityenable")) {
confp->pri.pri.facilityenable = ast_true(v->value);
#if defined(HAVE_PRI_CALL_HOLD)
} else if (!strcasecmp(v->name, "hold_disconnect_transfer")) {
confp->pri.pri.hold_disconnect_transfer = ast_true(v->value);
#endif /* defined(HAVE_PRI_CALL_HOLD) */
#endif /* HAVE_PRI */
#ifdef HAVE_SS7
} else if (!strcasecmp(v->name, "ss7type")) {

753
channels/sig_pri.c
View File

File diff suppressed because it is too large Load Diff

21
channels/sig_pri.h
View File

@@ -76,6 +76,7 @@ struct sig_pri_callback {
void (* const set_dnid)(void *pvt, const char *dnid);
void (* const set_rdnis)(void *pvt, const char *rdnis);
void (* const queue_control)(void *pvt, int subclass);
int (* const new_nobch_intf)(struct sig_pri_pri *pri);
};
#define NUM_DCHANS 4 /*!< No more than 4 d-channels */
@@ -144,6 +145,10 @@ struct sig_pri_chan {
/* Internal variables -- Don't touch */
/* Probably will need DS0 number, DS1 number, and a few other things */
char dialdest[256]; /* Queued up digits for overlap dialing. They will be sent out as information messages when setup ACK is received */
#if defined(HAVE_PRI_SETUP_KEYPAD)
/*! \brief Keypad digits that came in with the SETUP message. */
char keypad_digits[AST_MAX_EXTENSION];
#endif /* defined(HAVE_PRI_SETUP_KEYPAD) */
unsigned int alerting:1; /*!< TRUE if channel is alerting/ringing */
unsigned int alreadyhungup:1; /*!< TRUE if the call has already gone/hungup */
@@ -155,6 +160,8 @@ struct sig_pri_chan {
unsigned int outgoing:1;
unsigned int digital:1;
/*! \brief TRUE if this interface has no B channel. (call hold and call waiting) */
unsigned int no_b_channel:1;
struct ast_channel *owner;
@@ -187,6 +194,10 @@ struct sig_pri_pri {
#ifdef HAVE_PRI_INBANDDISCONNECT
unsigned int inbanddisconnect:1; /*!< Should we support inband audio after receiving DISCONNECT? */
#endif
#if defined(HAVE_PRI_CALL_HOLD)
/*! \brief TRUE if held calls are transferred on disconnect. */
unsigned int hold_disconnect_transfer:1;
#endif /* defined(HAVE_PRI_CALL_HOLD) */
int dialplan; /*!< Dialing plan */
int localdialplan; /*!< Local dialing plan */
char internationalprefix[10]; /*!< country access code ('00' for european dialplans) */
@@ -217,6 +228,16 @@ struct sig_pri_pri {
/* Everything after here is internally set */
struct pri *dchans[NUM_DCHANS]; /*!< Actual d-channels */
struct pri *pri; /*!< Currently active D-channel */
/*!
* List of private structures of the user of this module for no B channel
* interfaces. (hold and call waiting interfaces)
*/
void *no_b_chan_iflist;
/*!
* List of private structures of the user of this module for no B channel
* interfaces. (hold and call waiting interfaces)
*/
void *no_b_chan_end;
int numchans; /*!< Num of channels we represent */
struct sig_pri_chan *pvts[MAX_CHANNELS]; /*!< Member channel pvt structs */
pthread_t master; /*!< Thread of master */

6
configs/chan_dahdi.conf.sample
View File

@@ -182,6 +182,12 @@
;
;inbanddisconnect=yes
;
; Allow a held call to be transferred to the active call on disconnect.
; This is useful on BRI PTMP NT lines where an ISDN phone can simulate the
; transfer feature of an analog phone.
; The default is no.
;hold_disconnect_transfer=yes
;
; PRI Out of band indications.
; Enable this to report Busy and Congestion on a PRI using out-of-band
; notification. Inband indication, as used by Asterisk doesn't seem to work

860
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 219007 .
# From configure.ac Revision: 225357 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for asterisk 1.6.
#
@@ -835,6 +835,18 @@ PBX_PRI_VERSION
PRI_VERSION_DIR
PRI_VERSION_INCLUDE
PRI_VERSION_LIB
PBX_PRI_SETUP_KEYPAD
PRI_SETUP_KEYPAD_DIR
PRI_SETUP_KEYPAD_INCLUDE
PRI_SETUP_KEYPAD_LIB
PBX_PRI_CALL_REROUTING
PRI_CALL_REROUTING_DIR
PRI_CALL_REROUTING_INCLUDE
PRI_CALL_REROUTING_LIB
PBX_PRI_CALL_HOLD
PRI_CALL_HOLD_DIR
PRI_CALL_HOLD_INCLUDE
PRI_CALL_HOLD_LIB
PBX_PRI_SUBADDR
PRI_SUBADDR_DIR
PRI_SUBADDR_INCLUDE
@@ -9737,6 +9749,63 @@ PBX_PRI_SUBADDR=0
PRI_CALL_HOLD_DESCRIP="ISDN PRI call hold"
PRI_CALL_HOLD_OPTION=pri
for i in ${ac_mandatory_list}; do
if test "xPRI" = "x$i"; then
ac_mandatory_list="${ac_mandatory_list} PRI_CALL_HOLD"
break
fi
done
PBX_PRI_CALL_HOLD=0
PRI_CALL_REROUTING_DESCRIP="ISDN PRI call rerouting and call deflection"
PRI_CALL_REROUTING_OPTION=pri
for i in ${ac_mandatory_list}; do
if test "xPRI" = "x$i"; then
ac_mandatory_list="${ac_mandatory_list} PRI_CALL_REROUTING"
break
fi
done
PBX_PRI_CALL_REROUTING=0
PRI_SETUP_KEYPAD_DESCRIP="ISDN PRI keypad facility in SETUP"
PRI_SETUP_KEYPAD_OPTION=pri
for i in ${ac_mandatory_list}; do
if test "xPRI" = "x$i"; then
ac_mandatory_list="${ac_mandatory_list} PRI_SETUP_KEYPAD"
break
fi
done
PBX_PRI_SETUP_KEYPAD=0
# ------------------------------------v
# TODO: The code can be changed to always include these features now.
# These features will always be present if pri_connected_line_update is available.
@@ -32749,6 +32818,795 @@ _ACEOF
fi
if test "x${PBX_PRI_CALL_HOLD}" != "x1" -a "${USE_PRI_CALL_HOLD}" != "no"; then
pbxlibdir=""
# if --with-PRI_CALL_HOLD=DIR has been specified, use it.
if test "x${PRI_CALL_HOLD_DIR}" != "x"; then
if test -d ${PRI_CALL_HOLD_DIR}/lib; then
pbxlibdir="-L${PRI_CALL_HOLD_DIR}/lib"
else
pbxlibdir="-L${PRI_CALL_HOLD_DIR}"
fi
fi
pbxfuncname="pri_hold_enable"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PRI_CALL_HOLD_FOUND=yes
else
as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpri ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char ${pbxfuncname} ();
int
main ()
{
return ${pbxfuncname} ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
eval "$as_ac_Lib=yes"
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Lib=no"
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
ac_res=`eval 'as_val=${'$as_ac_Lib'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
as_val=`eval 'as_val=${'$as_ac_Lib'}
$as_echo "$as_val"'`
if test "x$as_val" = x""yes; then
AST_PRI_CALL_HOLD_FOUND=yes
else
AST_PRI_CALL_HOLD_FOUND=no
fi
fi
# now check for the header.
if test "${AST_PRI_CALL_HOLD_FOUND}" = "yes"; then
PRI_CALL_HOLD_LIB="${pbxlibdir} -lpri "
# if --with-PRI_CALL_HOLD=DIR has been specified, use it.
if test "x${PRI_CALL_HOLD_DIR}" != "x"; then
PRI_CALL_HOLD_INCLUDE="-I${PRI_CALL_HOLD_DIR}/include"
fi
PRI_CALL_HOLD_INCLUDE="${PRI_CALL_HOLD_INCLUDE} "
if test "xlibpri.h" = "x" ; then # no header, assume found
PRI_CALL_HOLD_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_CALL_HOLD_INCLUDE}"
if test "${ac_cv_header_libpri_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for libpri.h" >&5
$as_echo_n "checking for libpri.h... " >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
$as_echo_n "(cached) " >&6
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
$as_echo "$ac_cv_header_libpri_h" >&6; }
else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking libpri.h usability" >&5
$as_echo_n "checking libpri.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <libpri.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:$LINENO: checking libpri.h presence" >&5
$as_echo_n "checking libpri.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libpri.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for libpri.h" >&5
$as_echo_n "checking for libpri.h... " >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_header_libpri_h=$ac_header_preproc
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
$as_echo "$ac_cv_header_libpri_h" >&6; }
fi
if test "x$ac_cv_header_libpri_h" = x""yes; then
PRI_CALL_HOLD_HEADER_FOUND=1
else
PRI_CALL_HOLD_HEADER_FOUND=0
fi
CPPFLAGS="${saved_cppflags}"
fi
if test "x${PRI_CALL_HOLD_HEADER_FOUND}" = "x0" ; then
PRI_CALL_HOLD_LIB=""
PRI_CALL_HOLD_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
PRI_CALL_HOLD_LIB=""
fi
PBX_PRI_CALL_HOLD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_CALL_HOLD 1
#define HAVE_PRI_CALL_HOLD_VERSION
_ACEOF
fi
fi
fi
if test "x${PBX_PRI_CALL_REROUTING}" != "x1" -a "${USE_PRI_CALL_REROUTING}" != "no"; then
pbxlibdir=""
# if --with-PRI_CALL_REROUTING=DIR has been specified, use it.
if test "x${PRI_CALL_REROUTING_DIR}" != "x"; then
if test -d ${PRI_CALL_REROUTING_DIR}/lib; then
pbxlibdir="-L${PRI_CALL_REROUTING_DIR}/lib"
else
pbxlibdir="-L${PRI_CALL_REROUTING_DIR}"
fi
fi
pbxfuncname="pri_reroute_enable"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PRI_CALL_REROUTING_FOUND=yes
else
as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpri ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char ${pbxfuncname} ();
int
main ()
{
return ${pbxfuncname} ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
eval "$as_ac_Lib=yes"
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Lib=no"
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
ac_res=`eval 'as_val=${'$as_ac_Lib'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
as_val=`eval 'as_val=${'$as_ac_Lib'}
$as_echo "$as_val"'`
if test "x$as_val" = x""yes; then
AST_PRI_CALL_REROUTING_FOUND=yes
else
AST_PRI_CALL_REROUTING_FOUND=no
fi
fi
# now check for the header.
if test "${AST_PRI_CALL_REROUTING_FOUND}" = "yes"; then
PRI_CALL_REROUTING_LIB="${pbxlibdir} -lpri "
# if --with-PRI_CALL_REROUTING=DIR has been specified, use it.
if test "x${PRI_CALL_REROUTING_DIR}" != "x"; then
PRI_CALL_REROUTING_INCLUDE="-I${PRI_CALL_REROUTING_DIR}/include"
fi
PRI_CALL_REROUTING_INCLUDE="${PRI_CALL_REROUTING_INCLUDE} "
if test "xlibpri.h" = "x" ; then # no header, assume found
PRI_CALL_REROUTING_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_CALL_REROUTING_INCLUDE}"
if test "${ac_cv_header_libpri_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for libpri.h" >&5
$as_echo_n "checking for libpri.h... " >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
$as_echo_n "(cached) " >&6
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
$as_echo "$ac_cv_header_libpri_h" >&6; }
else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking libpri.h usability" >&5
$as_echo_n "checking libpri.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <libpri.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:$LINENO: checking libpri.h presence" >&5
$as_echo_n "checking libpri.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libpri.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for libpri.h" >&5
$as_echo_n "checking for libpri.h... " >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_header_libpri_h=$ac_header_preproc
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
$as_echo "$ac_cv_header_libpri_h" >&6; }
fi
if test "x$ac_cv_header_libpri_h" = x""yes; then
PRI_CALL_REROUTING_HEADER_FOUND=1
else
PRI_CALL_REROUTING_HEADER_FOUND=0
fi
CPPFLAGS="${saved_cppflags}"
fi
if test "x${PRI_CALL_REROUTING_HEADER_FOUND}" = "x0" ; then
PRI_CALL_REROUTING_LIB=""
PRI_CALL_REROUTING_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
PRI_CALL_REROUTING_LIB=""
fi
PBX_PRI_CALL_REROUTING=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_CALL_REROUTING 1
#define HAVE_PRI_CALL_REROUTING_VERSION
_ACEOF
fi
fi
fi
if test "x${PBX_PRI_SETUP_KEYPAD}" != "x1" -a "${USE_PRI_SETUP_KEYPAD}" != "no"; then
pbxlibdir=""
# if --with-PRI_SETUP_KEYPAD=DIR has been specified, use it.
if test "x${PRI_SETUP_KEYPAD_DIR}" != "x"; then
if test -d ${PRI_SETUP_KEYPAD_DIR}/lib; then
pbxlibdir="-L${PRI_SETUP_KEYPAD_DIR}/lib"
else
pbxlibdir="-L${PRI_SETUP_KEYPAD_DIR}"
fi
fi
pbxfuncname="pri_sr_set_keypad_digits"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PRI_SETUP_KEYPAD_FOUND=yes
else
as_ac_Lib=`$as_echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
$as_echo_n "checking for ${pbxfuncname} in -lpri... " >&6; }
if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpri ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char ${pbxfuncname} ();
int
main ()
{
return ${pbxfuncname} ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
eval "$as_ac_Lib=yes"
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Lib=no"
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
ac_res=`eval 'as_val=${'$as_ac_Lib'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
as_val=`eval 'as_val=${'$as_ac_Lib'}
$as_echo "$as_val"'`
if test "x$as_val" = x""yes; then
AST_PRI_SETUP_KEYPAD_FOUND=yes
else
AST_PRI_SETUP_KEYPAD_FOUND=no
fi
fi
# now check for the header.
if test "${AST_PRI_SETUP_KEYPAD_FOUND}" = "yes"; then
PRI_SETUP_KEYPAD_LIB="${pbxlibdir} -lpri "
# if --with-PRI_SETUP_KEYPAD=DIR has been specified, use it.
if test "x${PRI_SETUP_KEYPAD_DIR}" != "x"; then
PRI_SETUP_KEYPAD_INCLUDE="-I${PRI_SETUP_KEYPAD_DIR}/include"
fi
PRI_SETUP_KEYPAD_INCLUDE="${PRI_SETUP_KEYPAD_INCLUDE} "
if test "xlibpri.h" = "x" ; then # no header, assume found
PRI_SETUP_KEYPAD_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PRI_SETUP_KEYPAD_INCLUDE}"
if test "${ac_cv_header_libpri_h+set}" = set; then
{ $as_echo "$as_me:$LINENO: checking for libpri.h" >&5
$as_echo_n "checking for libpri.h... " >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
$as_echo_n "(cached) " >&6
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
$as_echo "$ac_cv_header_libpri_h" >&6; }
else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking libpri.h usability" >&5
$as_echo_n "checking libpri.h usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <libpri.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:$LINENO: checking libpri.h presence" >&5
$as_echo_n "checking libpri.h presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <libpri.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: libpri.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for libpri.h" >&5
$as_echo_n "checking for libpri.h... " >&6; }
if test "${ac_cv_header_libpri_h+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_cv_header_libpri_h=$ac_header_preproc
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5
$as_echo "$ac_cv_header_libpri_h" >&6; }
fi
if test "x$ac_cv_header_libpri_h" = x""yes; then
PRI_SETUP_KEYPAD_HEADER_FOUND=1
else
PRI_SETUP_KEYPAD_HEADER_FOUND=0
fi
CPPFLAGS="${saved_cppflags}"
fi
if test "x${PRI_SETUP_KEYPAD_HEADER_FOUND}" = "x0" ; then
PRI_SETUP_KEYPAD_LIB=""
PRI_SETUP_KEYPAD_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
PRI_SETUP_KEYPAD_LIB=""
fi
PBX_PRI_SETUP_KEYPAD=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PRI_SETUP_KEYPAD 1
#define HAVE_PRI_SETUP_KEYPAD_VERSION
_ACEOF
fi
fi
fi
# ------------------------------------v
# TODO: The code can be changed to always include these features now.
# These features will always be present if pri_connected_line_update is available.

6
configure.ac
View File

@@ -289,6 +289,9 @@ AST_EXT_LIB_SETUP([POPT], [popt], [popt])
AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_SUBADDR], [ISDN PRI subaddressing], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_CALL_HOLD], [ISDN PRI call hold], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_CALL_REROUTING], [ISDN PRI call rerouting and call deflection], [PRI], [pri])
AST_EXT_LIB_SETUP_DEPENDENT([PRI_SETUP_KEYPAD], [ISDN PRI keypad facility in SETUP], [PRI], [pri])
# ------------------------------------v
# TODO: The code can be changed to always include these features now.
# These features will always be present if pri_connected_line_update is available.
@@ -1443,6 +1446,9 @@ AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
AST_EXT_LIB_CHECK([PRI], [pri], [pri_connected_line_update], [libpri.h])
AST_EXT_LIB_CHECK([PRI_SUBADDR], [pri], [pri_sr_set_called_subaddress], [libpri.h])
AST_EXT_LIB_CHECK([PRI_CALL_HOLD], [pri], [pri_hold_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_CALL_REROUTING], [pri], [pri_reroute_enable], [libpri.h])
AST_EXT_LIB_CHECK([PRI_SETUP_KEYPAD], [pri], [pri_sr_set_keypad_digits], [libpri.h])
# ------------------------------------v
# TODO: The code can be changed to always include these features now.

10
include/asterisk/autoconfig.h.in
View File

@@ -656,6 +656,13 @@
/* Define to 1 if you have the ISDN PRI library. */
#undef HAVE_PRI
/* Define to 1 if you have the ISDN PRI call hold library. */
#undef HAVE_PRI_CALL_HOLD
/* Define to 1 if you have the ISDN PRI call rerouting and call deflection
library. */
#undef HAVE_PRI_CALL_REROUTING
/* Define to 1 if you have the ISDN PRI set_inbanddisconnect library. */
#undef HAVE_PRI_INBANDDISCONNECT
@@ -668,6 +675,9 @@
/* Define to 1 if you have the ISDN service messages library. */
#undef HAVE_PRI_SERVICE_MESSAGES
/* Define to 1 if you have the ISDN PRI keypad facility in SETUP library. */
#undef HAVE_PRI_SETUP_KEYPAD
/* Define to 1 if you have the ISDN PRI subaddressing library. */
#undef HAVE_PRI_SUBADDR