mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-21 09:10:36 +00:00
Merged revisions 56740 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r56740 | russell | 2007-02-25 19:04:40 -0600 (Sun, 25 Feb 2007) | 2 lines Move a comment to be in the correct struct. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -400,9 +400,6 @@ struct sla_trunk {
|
|||||||
/*! Number of stations that have this trunk on hold. */
|
/*! Number of stations that have this trunk on hold. */
|
||||||
unsigned int hold_stations;
|
unsigned int hold_stations;
|
||||||
struct ast_channel *chan;
|
struct ast_channel *chan;
|
||||||
/*! Ring timeout to use when this trunk is ringing on this specific
|
|
||||||
* station. This takes higher priority than a ring timeout set at
|
|
||||||
* the station level. */
|
|
||||||
unsigned int ring_timeout;
|
unsigned int ring_timeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -411,6 +408,9 @@ struct sla_trunk_ref {
|
|||||||
struct sla_trunk *trunk;
|
struct sla_trunk *trunk;
|
||||||
enum sla_trunk_state state;
|
enum sla_trunk_state state;
|
||||||
struct ast_channel *chan;
|
struct ast_channel *chan;
|
||||||
|
/*! Ring timeout to use when this trunk is ringing on this specific
|
||||||
|
* station. This takes higher priority than a ring timeout set at
|
||||||
|
* the station level. */
|
||||||
unsigned int ring_timeout;
|
unsigned int ring_timeout;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user