diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-23 15:59:44 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-23 15:59:44 +0000 |
| commit | 8186a1c6f67e9eaf6a054e2195a8a967f53d4421 (patch) | |
| tree | b04ddbf4244de491f77a5168c312b9bfba3174d5 /channels/sig_pri.h | |
| parent | a8d3801e656b84adac8864dbe61c28abd9800461 (diff) | |
Fix sending of interface identifier unconditionally in sig_pri
The wrong logic was being used in chan_dahdi to convert a sig_pri_chan
to the proper libpri channel number. The most significant bit must only
be set only when trunk groups are being used.
(closes issue #15452)
Reported by: alecdavis
Patches:
bug15452.patch uploaded by jpeeler (license 325)
Tested by: alecdavis
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@208267 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/sig_pri.h')
| -rw-r--r-- | channels/sig_pri.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/sig_pri.h b/channels/sig_pri.h index 89d598b74..7cb38884b 100644 --- a/channels/sig_pri.h +++ b/channels/sig_pri.h @@ -139,7 +139,6 @@ 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 */ - int mastertrunkgroup; unsigned int alerting:1; /*!< TRUE if channel is alerting/ringing */ unsigned int alreadyhungup:1; /*!< TRUE if the call has already gone/hungup */ @@ -159,6 +158,7 @@ struct sig_pri_chan { int prioffset; /*!< channel number in span */ int logicalspan; /*!< logical span number within trunk group */ + int mastertrunkgroup; /*!< what trunk group is our master */ struct sig_pri_callback *calls; void *chan_pvt; @@ -245,7 +245,7 @@ void pri_event_noalarm(struct sig_pri_pri *pri, int index, int before_start_pri) struct ast_channel *sig_pri_request(struct sig_pri_chan *p, enum sig_pri_law law, const struct ast_channel *requestor); -struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_callback *callback, struct sig_pri_pri *pri, int logicalspan, int channo); +struct sig_pri_chan *sig_pri_chan_new(void *pvt_data, struct sig_pri_callback *callback, struct sig_pri_pri *pri, int logicalspan, int channo, int trunkgroup); int pri_is_up(struct sig_pri_pri *pri); |