[svn-commits] russell: branch 1.4 r53810 - in /branches/1.4: apps/
channels/ configs/ doc/ ...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Fri Feb 9 17:35:10 MST 2007
Author: russell
Date: Fri Feb 9 18:35:09 2007
New Revision: 53810
URL: http://svn.digium.com/view/asterisk?view=rev&rev=53810
Log:
Merge team/russell/sla_rewrite
This is a completely new implementation of the SLA functionality introduced in
Asterisk 1.4. It is now functional and ready for testing. However, I will be
adding some additional features over the next week, as well.
For information on how to set this up, see configs/sla.conf.sample
and doc/sla.txt.
In addition to the changes in app_meetme.c for the SLA implementation itself,
this merge brings in various other changes:
chan_sip:
- Add the ability to indicate HOLD state in NOTIFY messages.
- Queue HOLD and UNHOLD control frames even if the channel is not bridged to
another channel.
linkedlists.h:
- Add support for rwlock based linked lists.
dial.c:
- Add the ability to run ast_dial_start() without a reference channel to
inherit information from.
Added:
branches/1.4/doc/sla.txt (with props)
Modified:
branches/1.4/apps/app_meetme.c
branches/1.4/channels/chan_sip.c
branches/1.4/configs/sla.conf.sample
branches/1.4/include/asterisk/app.h
branches/1.4/include/asterisk/dial.h
branches/1.4/include/asterisk/linkedlists.h
branches/1.4/include/asterisk/utils.h
branches/1.4/main/dial.c
Modified: branches/1.4/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=53810&r1=53809&r2=53810
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Fri Feb 9 18:35:09 2007
@@ -60,11 +60,13 @@
#include "asterisk/ulaw.h"
#include "asterisk/astobj.h"
#include "asterisk/devicestate.h"
+#include "asterisk/dial.h"
#include "enter.h"
#include "leave.h"
#define CONFIG_FILE_NAME "meetme.conf"
+#define SLA_CONFIG_FILE "sla.conf"
/*! each buffer is 20ms, so this is 640ms total */
#define DEFAULT_AUDIO_BUFFERS 32
@@ -148,12 +150,10 @@
CONFFLAG_INTROUSERNOREVIEW = (1 << 23),
/*! If set, the user will be initially self-muted */
CONFFLAG_STARTMUTED = (1 << 24),
- /*! If set, the user is a shared line appearance station */
- CONFFLAG_SLA_STATION = (1 << 25),
- /*! If set, the user is a shared line appearance trunk */
- CONFFLAG_SLA_TRUNK = (1 << 26),
- /*! If set, the user has put us on hold */
- CONFFLAG_HOLD = (1 << 27)
+ /*! Pass DTMF through the conference */
+ CONFFLAG_PASS_DTMF = (1 << 25),
+ CONFFLAG_SLA_STATION = (1 << 26),
+ CONFFLAG_SLA_TRUNK = (1 << 27),
};
enum {
@@ -161,7 +161,7 @@
OPT_ARG_ARRAY_SIZE = 1,
};
-AST_APP_OPTIONS(meetme_opts, {
+AST_APP_OPTIONS(meetme_opts, BEGIN_OPTIONS
AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
AST_APP_OPTION('a', CONFFLAG_ADMIN ),
AST_APP_OPTION('b', CONFFLAG_AGI ),
@@ -170,6 +170,7 @@
AST_APP_OPTION('d', CONFFLAG_DYNAMIC ),
AST_APP_OPTION('E', CONFFLAG_EMPTYNOPIN ),
AST_APP_OPTION('e', CONFFLAG_EMPTY ),
+ AST_APP_OPTION('F', CONFFLAG_PASS_DTMF ),
AST_APP_OPTION('i', CONFFLAG_INTROUSER ),
AST_APP_OPTION('I', CONFFLAG_INTROUSERNOREVIEW ),
AST_APP_OPTION('M', CONFFLAG_MOH ),
@@ -187,22 +188,19 @@
AST_APP_OPTION('X', CONFFLAG_EXIT_CONTEXT ),
AST_APP_OPTION('x', CONFFLAG_MARKEDEXIT ),
AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
-});
-
-AST_APP_OPTIONS(sla_opts, {
- /* Just a placeholder for now */
-});
+END_OPTIONS );
+
static const char *app = "MeetMe";
static const char *app2 = "MeetMeCount";
static const char *app3 = "MeetMeAdmin";
-static const char *appslas = "SLAStation";
-static const char *appslat = "SLATrunk";
+static const char *slastation_app = "SLAStation";
+static const char *slatrunk_app = "SLATrunk";
static const char *synopsis = "MeetMe conference bridge";
static const char *synopsis2 = "MeetMe participant count";
static const char *synopsis3 = "MeetMe conference Administration";
-static const char *synopslas = "Shared Line Appearance - Station";
-static const char *synopslat = "Shared Line Appearance - Trunk";
+static const char *slastation_synopsis = "Shared Line Appearance Station";
+static const char *slatrunk_synopsis = "Shared Line Appearance Trunk";
static const char *descrip =
" MeetMe([confno][,[options][,pin]]): Enters the user into a specified MeetMe\n"
@@ -223,6 +221,8 @@
" 'D' -- dynamically add conference, prompting for a PIN\n"
" 'e' -- select an empty conference\n"
" 'E' -- select an empty pinless conference\n"
+" 'F' -- Pass DTMF through the conference. DTMF used to activate any\n"
+" conference features will not be passed through.\n"
" 'i' -- announce user join/leave with review\n"
" 'I' -- announce user join/leave without review\n"
" 'l' -- set listen only mode (Listen only, no talking)\n"
@@ -281,25 +281,20 @@
" 'V' -- Raise entire conference listening volume\n"
"";
-static const char *descripslas =
-" SLAStation(sla[,options]): Run Shared Line Appearance for station\n"
-"Runs the share line appearance for a station calling in. If there are no\n"
-"other participants in the conference, the trunk is called and is dumped into\n"
-"the bridge.\n";
-
-static const char *descripslat =
-" SLATrunk(sla[,options]): Run Shared Line Appearance for trunk\n"
-"Runs the share line appearance for a trunk calling in. If there are no\n"
-"other participants in the conference, all member stations are invited into\n"
-"the bridge.\n";
-
-#define CONFIG_FILE_NAME_SLA "sla.conf"
+static const char *slastation_desc =
+" SLAStation():\n";
+
+static const char *slatrunk_desc =
+" SLATrunk():\n";
+
+#define MAX_CONFNUM 80
+#define MAX_PIN 80
/*! \brief The MeetMe Conference object */
struct ast_conference {
ast_mutex_t playlock; /*!< Conference specific lock (players) */
ast_mutex_t listenlock; /*!< Conference specific lock (listeners) */
- char confno[AST_MAX_EXTENSION]; /*!< Conference */
+ char confno[MAX_CONFNUM]; /*!< Conference */
struct ast_channel *chan; /*!< Announcements channel */
struct ast_channel *lchan; /*!< Listen/Record channel */
int fd; /*!< Announcements fd */
@@ -315,8 +310,8 @@
pthread_attr_t attr; /*!< thread attribute */
const char *recordingfilename; /*!< Filename to record the Conference into */
const char *recordingformat; /*!< Format to record the Conference in */
- char pin[AST_MAX_EXTENSION]; /*!< If protected by a PIN */
- char pinadmin[AST_MAX_EXTENSION]; /*!< If protected by a admin PIN */
+ char pin[MAX_PIN]; /*!< If protected by a PIN */
+ char pinadmin[MAX_PIN]; /*!< If protected by a admin PIN */
struct ast_frame *transframe[32];
struct ast_frame *origframe;
struct ast_trans_pvt *transpath[32];
@@ -340,39 +335,94 @@
int zapchannel; /*!< Is a Zaptel channel */
char usrvalue[50]; /*!< Custom User Value */
char namerecloc[PATH_MAX]; /*!< Name Recorded file Location */
- int control; /*! Queue Control for transmission */
- int dtmf; /*! Queue DTMF for transmission */
time_t jointime; /*!< Time the user joined the conference */
struct volume talk;
struct volume listen;
+ AST_LIST_HEAD_NOLOCK(, ast_frame) frame_q;
AST_LIST_ENTRY(ast_conf_user) list;
};
-/*! SLA station - one device in an SLA configuration */
-struct ast_sla_station {
- ASTOBJ_COMPONENTS(struct ast_sla_station);
- char *dest;
- char tech[0];
+enum sla_trunk_state {
+ SLA_TRUNK_STATE_IDLE,
+ SLA_TRUNK_STATE_RINGING,
+ SLA_TRUNK_STATE_UP,
+ SLA_TRUNK_STATE_ONHOLD,
};
-struct ast_sla_station_box {
- ASTOBJ_CONTAINER_COMPONENTS(struct ast_sla_station);
+struct sla_trunk_ref;
+
+struct sla_station {
+ AST_RWLIST_ENTRY(sla_station) entry;
+ AST_DECLARE_STRING_FIELDS(
+ AST_STRING_FIELD(name);
+ AST_STRING_FIELD(device);
+ AST_STRING_FIELD(autocontext);
+ );
+ AST_LIST_HEAD_NOLOCK(, sla_trunk_ref) trunks;
+ struct ast_dial *dial;
};
-/*! SLA - Shared Line Apperance object. These consist of one trunk (outbound line)
- and stations that receive incoming calls and place outbound calls over the trunk
-*/
-struct ast_sla {
- ASTOBJ_COMPONENTS (struct ast_sla);
- struct ast_sla_station_box stations; /*!< Stations connected to this SLA */
- char confname[80]; /*!< Name for this SLA bridge */
- char trunkdest[256]; /*!< Device (channel) identifier for the trunk line */
- char trunktech[20]; /*!< Technology used for the trunk (channel driver) */
+struct sla_station_ref {
+ AST_LIST_ENTRY(sla_station_ref) entry;
+ struct sla_station *station;
};
-struct ast_sla_box {
- ASTOBJ_CONTAINER_COMPONENTS(struct ast_sla);
-} slas;
+struct sla_trunk {
+ AST_RWLIST_ENTRY(sla_trunk) entry;
+ AST_DECLARE_STRING_FIELDS(
+ AST_STRING_FIELD(name);
+ AST_STRING_FIELD(device);
+ AST_STRING_FIELD(autocontext);
+ );
+ AST_LIST_HEAD_NOLOCK(, sla_station_ref) stations;
+ /*! Number of stations that use this trunk */
+ unsigned int num_stations;
+ /*! Number of stations currently on a call with this trunk */
+ unsigned int active_stations;
+ /*! Number of stations that have this trunk on hold. */
+ unsigned int hold_stations;
+ struct ast_channel *chan;
+ pthread_t station_thread;
+};
+
+struct sla_trunk_ref {
+ AST_LIST_ENTRY(sla_trunk_ref) entry;
+ struct sla_trunk *trunk;
+ enum sla_trunk_state state;
+ struct ast_channel *chan;
+};
+
+static AST_RWLIST_HEAD_STATIC(sla_stations, sla_station);
+static AST_RWLIST_HEAD_STATIC(sla_trunks, sla_trunk);
+
+static const char sla_registrar[] = "SLA";
+
+enum sla_event_type {
+ SLA_EVENT_HOLD,
+ SLA_EVENT_UNHOLD
+};
+
+struct sla_event {
+ enum sla_event_type type;
+ struct sla_station *station;
+ struct sla_trunk_ref *trunk_ref;
+ AST_LIST_ENTRY(sla_event) entry;
+};
+
+/*!
+ * \brief A structure for data used by the sla thread
+ */
+static struct sla {
+ /*! The SLA thread ID */
+ pthread_t thread;
+ ast_cond_t cond;
+ ast_mutex_t lock;
+ AST_LIST_HEAD_NOLOCK(, sla_trunk_ref) ringing_trunks;
+ AST_LIST_HEAD_NOLOCK(, sla_event) event_q;
+ unsigned int stop:1;
+} sla = {
+ .thread = AST_PTHREADT_NULL,
+};
/*! The number of audio buffers to be allocated on pseudo channels
* when in a conference */
@@ -384,7 +434,7 @@
* conversion... the numbers have been modified
* to give the user a better level of adjustability
*/
-static signed char gain_map[] = {
+static const char const gain_map[] = {
-15,
-13,
-10,
@@ -441,7 +491,7 @@
static int set_talk_volume(struct ast_conf_user *user, int volume)
{
- signed char gain_adjust;
+ char gain_adjust;
/* attempt to make the adjustment in the channel driver;
if successful, don't adjust in the frame reading routine
@@ -453,7 +503,7 @@
static int set_listen_volume(struct ast_conf_user *user, int volume)
{
- signed char gain_adjust;
+ char gain_adjust;
/* attempt to make the adjustment in the channel driver;
if successful, don't adjust in the frame reading routine
@@ -467,7 +517,7 @@
{
switch (action) {
case VOL_UP:
- switch (vol->desired) {
+ switch (vol->desired) {
case 5:
break;
case 0:
@@ -564,18 +614,19 @@
ast_autoservice_stop(chan);
}
-static void station_destroy(struct ast_sla_station *station)
-{
- free(station);
-}
-
-static void sla_destroy(struct ast_sla *sla)
-{
- ASTOBJ_CONTAINER_DESTROYALL(&sla->stations, station_destroy);
- ASTOBJ_CONTAINER_DESTROY(&sla->stations);
- free(sla);
-}
-
+/*!
+ * \brief Find or create a conference
+ *
+ * \param confno The conference name/number
+ * \param pin The regular user pin
+ * \param pinadmin The admin pin
+ * \param make Make the conf if it doesn't exist
+ * \param dynamic Mark the newly created conference as dynamic
+ * \param refcount How many references to mark on the conference
+ *
+ * \return A pointer to the conference struct, or NULL if it wasn't found and
+ * make or dynamic were not set.
+ */
static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount)
{
struct ast_conference *cnf;
@@ -588,98 +639,77 @@
break;
}
- if (!cnf && (make || dynamic)) {
- /* Make a new one */
- if ((cnf = ast_calloc(1, sizeof(*cnf)))) {
- ast_mutex_init(&cnf->playlock);
- ast_mutex_init(&cnf->listenlock);
- ast_copy_string(cnf->confno, confno, sizeof(cnf->confno));
- ast_copy_string(cnf->pin, pin, sizeof(cnf->pin));
- ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin));
- cnf->refcount = 0;
- cnf->markedusers = 0;
- cnf->chan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
- if (cnf->chan) {
- ast_set_read_format(cnf->chan, AST_FORMAT_SLINEAR);
- ast_set_write_format(cnf->chan, AST_FORMAT_SLINEAR);
- cnf->fd = cnf->chan->fds[0]; /* for use by conf_play() */
- } else {
- ast_log(LOG_WARNING, "Unable to open pseudo channel - trying device\n");
- cnf->fd = open("/dev/zap/pseudo", O_RDWR);
- if (cnf->fd < 0) {
- ast_log(LOG_WARNING, "Unable to open pseudo device\n");
- free(cnf);
- cnf = NULL;
- goto cnfout;
- }
- }
- memset(&ztc, 0, sizeof(ztc));
- /* Setup a new zap conference */
- ztc.chan = 0;
- ztc.confno = -1;
- ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
- if (ioctl(cnf->fd, ZT_SETCONF, &ztc)) {
- ast_log(LOG_WARNING, "Error setting conference\n");
- if (cnf->chan)
- ast_hangup(cnf->chan);
- else
- close(cnf->fd);
- free(cnf);
- cnf = NULL;
- goto cnfout;
- }
- cnf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
- if (cnf->lchan) {
- ast_set_read_format(cnf->lchan, AST_FORMAT_SLINEAR);
- ast_set_write_format(cnf->lchan, AST_FORMAT_SLINEAR);
- ztc.chan = 0;
- ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
- if (ioctl(cnf->lchan->fds[0], ZT_SETCONF, &ztc)) {
- ast_log(LOG_WARNING, "Error setting conference\n");
- ast_hangup(cnf->lchan);
- cnf->lchan = NULL;
- }
- }
- /* Fill the conference struct */
- cnf->start = time(NULL);
- cnf->zapconf = ztc.confno;
- cnf->isdynamic = dynamic ? 1 : 0;
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Created MeetMe conference %d for conference '%s'\n", cnf->zapconf, cnf->confno);
- AST_LIST_INSERT_HEAD(&confs, cnf, list);
- }
- }
- cnfout:
- if (cnf){
+ if (cnf || (!make && !dynamic))
+ goto cnfout;
+
+ /* Make a new one */
+ if (!(cnf = ast_calloc(1, sizeof(*cnf))))
+ goto cnfout;
+
+ ast_mutex_init(&cnf->playlock);
+ ast_mutex_init(&cnf->listenlock);
+ ast_copy_string(cnf->confno, confno, sizeof(cnf->confno));
+ ast_copy_string(cnf->pin, pin, sizeof(cnf->pin));
+ ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin));
+ cnf->refcount = 0;
+ cnf->markedusers = 0;
+ cnf->chan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
+ if (cnf->chan) {
+ ast_set_read_format(cnf->chan, AST_FORMAT_SLINEAR);
+ ast_set_write_format(cnf->chan, AST_FORMAT_SLINEAR);
+ cnf->fd = cnf->chan->fds[0]; /* for use by conf_play() */
+ } else {
+ ast_log(LOG_WARNING, "Unable to open pseudo channel - trying device\n");
+ cnf->fd = open("/dev/zap/pseudo", O_RDWR);
+ if (cnf->fd < 0) {
+ ast_log(LOG_WARNING, "Unable to open pseudo device\n");
+ free(cnf);
+ cnf = NULL;
+ goto cnfout;
+ }
+ }
+ memset(&ztc, 0, sizeof(ztc));
+ /* Setup a new zap conference */
+ ztc.chan = 0;
+ ztc.confno = -1;
+ ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
+ if (ioctl(cnf->fd, ZT_SETCONF, &ztc)) {
+ ast_log(LOG_WARNING, "Error setting conference\n");
+ if (cnf->chan)
+ ast_hangup(cnf->chan);
+ else
+ close(cnf->fd);
+ free(cnf);
+ cnf = NULL;
+ goto cnfout;
+ }
+ cnf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
+ if (cnf->lchan) {
+ ast_set_read_format(cnf->lchan, AST_FORMAT_SLINEAR);
+ ast_set_write_format(cnf->lchan, AST_FORMAT_SLINEAR);
+ ztc.chan = 0;
+ ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
+ if (ioctl(cnf->lchan->fds[0], ZT_SETCONF, &ztc)) {
+ ast_log(LOG_WARNING, "Error setting conference\n");
+ ast_hangup(cnf->lchan);
+ cnf->lchan = NULL;
+ }
+ }
+ /* Fill the conference struct */
+ cnf->start = time(NULL);
+ cnf->zapconf = ztc.confno;
+ cnf->isdynamic = dynamic ? 1 : 0;
+ if (option_verbose > 2)
+ ast_verbose(VERBOSE_PREFIX_3 "Created MeetMe conference %d for conference '%s'\n", cnf->zapconf, cnf->confno);
+ AST_LIST_INSERT_HEAD(&confs, cnf, list);
+
+cnfout:
+ if (cnf)
cnf->refcount += refcount;
- }
+
AST_LIST_UNLOCK(&confs);
+
return cnf;
-}
-
-/*! \brief CLI command for showing SLAs */
-static int sla_show(int fd, int argc, char *argv[])
-{
- struct ast_sla *sla;
- if (argc != 2)
- return RESULT_SHOWUSAGE;
-
- ast_cli(fd, "Shared line appearances:\n");
- ASTOBJ_CONTAINER_TRAVERSE(&slas, 1, {
- ASTOBJ_RDLOCK(iterator);
- ast_cli(fd, "SLA %s\n", iterator->name);
- if (ast_strlen_zero(iterator->trunkdest) || ast_strlen_zero(iterator->trunktech))
- ast_cli(fd, " Trunk => <unspecified>\n");
- else
- ast_cli(fd, " Trunk => %s/%s\n", iterator->trunktech, iterator->trunkdest);
- sla = iterator;
- ASTOBJ_CONTAINER_TRAVERSE(&sla->stations, 1, {
- ast_cli(fd, " Station: %s/%s\n", iterator->tech, iterator->dest);
- });
- ASTOBJ_UNLOCK(iterator);
- });
-
- return RESULT_SUCCESS;
}
static int meetme_cmd(int fd, int argc, char **argv)
@@ -792,7 +822,7 @@
min = ((now - user->jointime) % 3600) / 60;
sec = (now - user->jointime) % 60;
if ( !concise )
- ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %s %02d:%02d:%02d\n",
+ ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %02d:%02d:%02d\n",
user->user_no,
S_OR(user->chan->cid.cid_num, "<unknown>"),
S_OR(user->chan->cid.cid_name, "<no name>"),
@@ -800,8 +830,7 @@
user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
user->adminflags & ADMINFLAG_MUTED ? "(Admin Muted)" : user->adminflags & ADMINFLAG_SELFMUTED ? "(Muted)" : "",
- istalking(user->talking),
- user->userflags & CONFFLAG_HOLD ? " (On Hold) " : "", hr, min, sec);
+ istalking(user->talking), hr, min, sec);
else
ast_cli(fd, "%d!%s!%s!%s!%s!%s!%s!%d!%02d:%02d:%02d\n",
user->user_no,
@@ -892,18 +921,94 @@
"Usage: meetme (un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
" Executes a command for the conference or on a conferee\n";
-static char sla_show_usage[] =
-"Usage: sla show\n"
-" Lists status of all shared line appearances\n";
+static int sla_show_trunks(int fd, int argc, char **argv)
+{
+ const struct sla_trunk *trunk;
+
+ ast_cli(fd, "--- Configured SLA Trunks -----------------------------------\n"
+ "-------------------------------------------------------------\n\n");
+ AST_RWLIST_RDLOCK(&sla_trunks);
+ AST_RWLIST_TRAVERSE(&sla_trunks, trunk, entry) {
+ struct sla_station_ref *station_ref;
+ ast_cli(fd, "--- Trunk Name: %s\n"
+ "--- ==> Device: %s\n"
+ "--- ==> AutoContext: %s\n"
+ "--- ==> Stations ...\n",
+ trunk->name, trunk->device,
+ S_OR(trunk->autocontext, "(none)"));
+ AST_RWLIST_RDLOCK(&sla_stations);
+ AST_LIST_TRAVERSE(&trunk->stations, station_ref, entry)
+ ast_cli(fd, "--- =====> Station name: %s\n", station_ref->station->name);
+ AST_RWLIST_UNLOCK(&sla_stations);
+ ast_cli(fd, "\n");
+ }
+ AST_RWLIST_UNLOCK(&sla_trunks);
+ ast_cli(fd, "-------------------------------------------------------------\n");
+
+ return RESULT_SUCCESS;
+}
+
+static const char *trunkstate2str(enum sla_trunk_state state)
+{
+#define S(e) case e: return # e;
+ switch (state) {
+ S(SLA_TRUNK_STATE_IDLE)
+ S(SLA_TRUNK_STATE_RINGING)
+ S(SLA_TRUNK_STATE_UP)
+ S(SLA_TRUNK_STATE_ONHOLD)
+ }
+ return "Uknown State";
+#undef S
+}
+
+static const char sla_show_trunks_usage[] =
+"Usage: sla show trunks\n"
+" This will list all trunks defined in sla.conf\n";
+
+static int sla_show_stations(int fd, int argc, char **argv)
+{
+ const struct sla_station *station;
+
+ ast_cli(fd, "--- Configured SLA Stations ---------------------------------\n"
+ "-------------------------------------------------------------\n\n");
+ AST_RWLIST_RDLOCK(&sla_stations);
+ AST_RWLIST_TRAVERSE(&sla_stations, station, entry) {
+ struct sla_trunk_ref *trunk_ref;
+ ast_cli(fd, "--- Station Name: %s\n"
+ "--- ==> Device: %s\n"
+ "--- ==> AutoContext: %s\n"
+ "--- ==> Trunks ...\n",
+ station->name, station->device,
+ S_OR(station->autocontext, "(none)"));
+ AST_RWLIST_RDLOCK(&sla_trunks);
+ AST_LIST_TRAVERSE(&station->trunks, trunk_ref, entry)
+ ast_cli(fd, "--- =====> Trunk Name: %s State: %s\n",
+ trunk_ref->trunk->name, trunkstate2str(trunk_ref->state));
+ AST_RWLIST_UNLOCK(&sla_trunks);
+ ast_cli(fd, "\n");
+ }
+ AST_RWLIST_UNLOCK(&sla_stations);
+ ast_cli(fd, "-------------------------------------------------------------\n");
+
+ return RESULT_SUCCESS;
+}
+
+static const char sla_show_stations_usage[] =
+"Usage: sla show stations\n"
+" This will list all stations defined in sla.conf\n";
static struct ast_cli_entry cli_meetme[] = {
- { { "sla", "show", NULL },
- sla_show, "Show status of Shared Line Appearances",
- sla_show_usage, NULL },
-
{ { "meetme", NULL, NULL },
meetme_cmd, "Execute a command on a conference or conferee",
meetme_usage, complete_meetmecmd },
+
+ { { "sla", "show", "trunks", NULL },
+ sla_show_trunks, "Show SLA Trunks",
+ sla_show_trunks_usage, NULL },
+
+ { { "sla", "show", "stations", NULL },
+ sla_show_stations, "Show SLA Stations",
+ sla_show_stations_usage, NULL },
};
static void conf_flush(int fd, struct ast_channel *chan)
@@ -974,22 +1079,64 @@
return 0;
}
-static void conf_queue_dtmf(struct ast_conference *conf, int digit)
-{
+static void conf_queue_dtmf(const struct ast_conference *conf,
+ const struct ast_conf_user *sender, const struct ast_frame *_f)
+{
+ struct ast_frame *f;
struct ast_conf_user *user;
+
AST_LIST_TRAVERSE(&conf->userlist, user, list) {
- user->dtmf = digit;
- }
-}
-
-static void conf_queue_control(struct ast_conference *conf, int control)
-{
- struct ast_conf_user *user;
- AST_LIST_TRAVERSE(&conf->userlist, user, list) {
- user->control = control;
- }
-}
-
+ if (user == sender)
+ continue;
+ if (!(f = ast_frdup(_f)))
+ return;
+ AST_LIST_INSERT_TAIL(&user->frame_q, f, frame_list);
+ }
+}
+
+static void sla_queue_event(enum sla_event_type type, const struct ast_channel *chan,
+ struct ast_conference *conf)
+{
+ struct sla_event *event;
+ struct sla_station *station;
+ struct sla_trunk_ref *trunk_ref = NULL;
+ char *trunk_name;
+
+ trunk_name = ast_strdupa(conf->confno);
+ strsep(&trunk_name, "_");
+ if (ast_strlen_zero(trunk_name)) {
+ ast_log(LOG_ERROR, "Invalid conference name for SLA - '%s'!\n", conf->confno);
+ return;
+ }
+
+ AST_RWLIST_RDLOCK(&sla_stations);
+ AST_RWLIST_TRAVERSE(&sla_stations, station, entry) {
+ AST_LIST_TRAVERSE(&station->trunks, trunk_ref, entry) {
+ if (trunk_ref->chan == chan && !strcmp(trunk_ref->trunk->name, trunk_name))
+ break;
+ }
+ if (trunk_ref)
+ break;
+ }
+ AST_RWLIST_UNLOCK(&sla_stations);
+
+ if (!trunk_ref) {
+ ast_log(LOG_DEBUG, "Trunk not found for event!\n");
+ return;
+ }
+
+ if (!(event = ast_calloc(1, sizeof(*event))))
+ return;
+
+ event->type = type;
+ event->trunk_ref = trunk_ref;
+ event->station = station;
+
+ ast_mutex_lock(&sla.lock);
+ AST_LIST_INSERT_TAIL(&sla.event_q, event, entry);
+ ast_cond_signal(&sla.cond);
+ ast_mutex_unlock(&sla.lock);
+}
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags, char *optargs[])
{
@@ -1108,8 +1255,6 @@
/* This device changed state now - if this is the first user */
if (conf->users == 1)
ast_device_state_changed("meetme:%s", conf->confno);
- if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
- ast_device_state_changed("SLA:%s", conf->confno + 4);
ast_mutex_unlock(&conf->playlock);
@@ -1506,8 +1651,10 @@
/* If I have been kicked, exit the conference */
if (user->adminflags & ADMINFLAG_KICKME) {
//You have been kicked.
- if (!ast_streamfile(chan, "conf-kicked", chan->language))
+ if (!(confflags & CONFFLAG_QUIET) &&
+ !ast_streamfile(chan, "conf-kicked", chan->language)) {
ast_waitstream(chan, "");
+ }
ret = 0;
break;
}
@@ -1530,6 +1677,14 @@
f = ast_read(c);
if (!f)
break;
+ if (!AST_LIST_EMPTY(&user->frame_q)) {
+ struct ast_frame *f;
+ f = AST_LIST_REMOVE_HEAD(&user->frame_q, frame_list);
+ if (ast_write(chan, f) < 0) {
+ ast_log(LOG_WARNING, "Error writing frame to channel!\n");
+ }
+ ast_frfree(f);
+ }
if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) {
if (user->talk.actual)
ast_frame_adjust_volume(f, user->talk.actual);
@@ -1580,17 +1735,6 @@
if (user->talking || !(confflags & CONFFLAG_OPTIMIZETALKER))
careful_write(fd, f->data, f->datalen, 0);
}
- } else if ((f->frametype == AST_FRAME_DTMF) &&
- (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))) {
- conf_queue_dtmf(conf, f->subclass);
- } else if ((f->frametype == AST_FRAME_CONTROL) &&
- (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))) {
- conf_queue_control(conf, f->subclass);
- if (f->subclass == AST_CONTROL_HOLD)
- confflags |= CONFFLAG_HOLD;
- else if (f->subclass == AST_CONTROL_UNHOLD)
- confflags &= ~CONFFLAG_HOLD;
- user->userflags = confflags;
} else if ((f->frametype == AST_FRAME_DTMF) && (confflags & CONFFLAG_EXIT_CONTEXT)) {
char tmp[2];
@@ -1762,6 +1906,21 @@
}
conf_flush(fd, chan);
+ } else if ((f->frametype == AST_FRAME_DTMF_BEGIN || f->frametype == AST_FRAME_DTMF_END)
+ && confflags & CONFFLAG_PASS_DTMF) {
+ conf_queue_dtmf(conf, user, f);
+ } else if ((confflags & CONFFLAG_SLA_STATION) && f->frametype == AST_FRAME_CONTROL) {
+ switch (f->subclass) {
+ case AST_CONTROL_HOLD:
+ ast_log(LOG_DEBUG, "Got a HOLD frame!\n");
+ sla_queue_event(SLA_EVENT_HOLD, chan, conf);
+ break;
+ case AST_CONTROL_UNHOLD:
+ ast_log(LOG_DEBUG, "Got a UNHOLD frame!\n");
+ sla_queue_event(SLA_EVENT_UNHOLD, chan, conf);
+ default:
+ break;
+ }
} else if (option_debug) {
ast_log(LOG_DEBUG,
"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",
@@ -1769,33 +1928,6 @@
}
ast_frfree(f);
} else if (outfd > -1) {
- if (user->control) {
- switch(user->control) {
- case AST_CONTROL_RINGING:
- case AST_CONTROL_PROGRESS:
- case AST_CONTROL_PROCEEDING:
- ast_indicate(chan, user->control);
- break;
- case AST_CONTROL_ANSWER:
- if (chan->_state != AST_STATE_UP)
- ast_answer(chan);
- break;
- }
- user->control = 0;
- if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
- ast_device_state_changed("SLA:%s", conf->confno + 4);
- continue;
- }
- if (user->dtmf) {
- memset(&fr, 0, sizeof(fr));
- fr.frametype = AST_FRAME_DTMF;
- fr.subclass = user->dtmf;
- if (ast_write(chan, &fr) < 0) {
- ast_log(LOG_WARNING, "Unable to write frame to channel: %s\n", strerror(errno));
- }
- user->dtmf = 0;
- continue;
- }
res = read(outfd, buf, CONF_SIZE);
if (res > 0) {
memset(&fr, 0, sizeof(fr));
@@ -1928,8 +2060,6 @@
/* Change any states */
if (!conf->users)
ast_device_state_changed("meetme:%s", conf->confno);
- if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
- ast_device_state_changed("SLA:%s", conf->confno + 4);
if (AST_LIST_EMPTY(&conf->userlist)) {
/* close this one when no more users and no references*/
@@ -1947,7 +2077,7 @@
}
static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char *confno, int make, int dynamic,
- char *dynamic_pin, int refcount, struct ast_flags *confflags)
+ char *dynamic_pin, size_t pin_buf_len, int refcount, struct ast_flags *confflags)
{
struct ast_variable *var;
struct ast_conference *cnf;
@@ -2004,7 +2134,7 @@
static struct ast_conference *find_conf(struct ast_channel *chan, char *confno, int make, int dynamic,
- char *dynamic_pin, int refcount, struct ast_flags *confflags)
+ char *dynamic_pin, size_t pin_buf_len, int refcount, struct ast_flags *confflags)
{
struct ast_config *cfg;
struct ast_variable *var;
@@ -2034,7 +2164,7 @@
if (dynamic_pin) {
if (dynamic_pin[0] == 'q') {
/* Query the user to enter a PIN */
- if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
+ if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, pin_buf_len - 1, 0) < 0)
return NULL;
}
cnf = build_conf(confno, dynamic_pin, "", make, dynamic, refcount);
@@ -2124,7 +2254,7 @@
AST_STANDARD_APP_ARGS(args, localdata);
- conf = find_conf(chan, args.confno, 0, 0, NULL, 0, NULL);
+ conf = find_conf(chan, args.confno, 0, 0, NULL, 0, 0, NULL);
if (conf)
count = conf->users;
@@ -2150,7 +2280,7 @@
{
int res=-1;
struct ast_module_user *u;
- char confno[AST_MAX_EXTENSION] = "";
+ char confno[MAX_CONFNUM] = "";
int allowretry = 0;
int retrycnt = 0;
struct ast_conference *cnf;
@@ -2158,7 +2288,7 @@
int dynamic = 0;
int empty = 0, empty_no_pin = 0;
int always_prompt = 0;
- char *notdata, *info, the_pin[AST_MAX_EXTENSION] = "";
+ char *notdata, *info, the_pin[MAX_PIN] = "";
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(confno);
AST_APP_ARG(options);
@@ -2312,9 +2442,12 @@
}
if (!ast_strlen_zero(confno)) {
/* Check the validity of the conference */
- cnf = find_conf(chan, confno, 1, dynamic, the_pin, 1, &confflags);
- if (!cnf)
- cnf = find_conf_realtime(chan, confno, 1, dynamic, the_pin, 1, &confflags);
+ cnf = find_conf(chan, confno, 1, dynamic, the_pin,
+ sizeof(the_pin), 1, &confflags);
+ if (!cnf) {
+ cnf = find_conf_realtime(chan, confno, 1, dynamic,
+ the_pin, sizeof(the_pin), 1, &confflags);
+ }
if (!cnf) {
res = ast_streamfile(chan, "conf-invalid", chan->language);
@@ -2328,7 +2461,7 @@
!ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
(!ast_strlen_zero(cnf->pinadmin) &&
ast_test_flag(&confflags, CONFFLAG_ADMIN))) {
- char pin[AST_MAX_EXTENSION]="";
+ char pin[MAX_PIN] = "";
int j;
/* Allow the pin to be retried up to 3 times */
@@ -2409,177 +2542,6 @@
ast_module_user_remove(u);
return res;
-}
-
-struct sla_originate_helper {
- char tech[100];
- char data[200];
- char app[20];
- char appdata[100];
- char cid_name[100];
- char cid_num[100];
-};
-
-static void *sla_originate(void *data)
-{
- struct sla_originate_helper *in = data;
- int reason = 0;
- struct ast_channel *chan = NULL;
-
- ast_pbx_outgoing_app(in->tech, AST_FORMAT_SLINEAR, in->data, 99999, in->app, in->appdata, &reason, 1,
- S_OR(in->cid_num, NULL),
- S_OR(in->cid_name, NULL),
- NULL, NULL, &chan);
- /* Locked by ast_pbx_outgoing_exten or ast_pbx_outgoing_app */
- if (chan)
- ast_channel_unlock(chan);
- free(in);
- return NULL;
-}
-
-/*! Call in stations and trunk to the SLA */
-static void do_invite(struct ast_channel *orig, const char *tech, const char *dest, const char *app, const char *data)
-{
- struct sla_originate_helper *slal;
- pthread_attr_t attr;
- pthread_t th;
-
- if (!(slal = ast_calloc(1, sizeof(*slal))))
- return;
-
- ast_copy_string(slal->tech, tech, sizeof(slal->tech));
- ast_copy_string(slal->data, dest, sizeof(slal->data));
- ast_copy_string(slal->app, app, sizeof(slal->app));
- ast_copy_string(slal->appdata, data, sizeof(slal->appdata));
- if (orig->cid.cid_num)
- ast_copy_string(slal->cid_num, orig->cid.cid_num, sizeof(slal->cid_num));
- if (orig->cid.cid_name)
- ast_copy_string(slal->cid_name, orig->cid.cid_name, sizeof(slal->cid_name));
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- ast_pthread_create(&th, &attr, sla_originate, slal);
-}
-
-static void invite_stations(struct ast_channel *orig, struct ast_sla *sla)
-{
- ASTOBJ_CONTAINER_TRAVERSE(&sla->stations, 1, {
- do_invite(orig, iterator->tech, iterator->dest, "SLAStation", sla->name);
- });
-}
-
-static void invite_trunk(struct ast_channel *orig, struct ast_sla *sla)
-{
- do_invite(orig, sla->trunktech, sla->trunkdest, "SLATrunk", sla->name);
-}
-
-
-static int sla_checkforhold(struct ast_conference *conf, int hangup)
-{
- struct ast_conf_user *user;
- struct ast_channel *onhold=NULL;
- int holdcount = 0;
- int stationcount = 0;
- int amonhold = 0;
- AST_LIST_TRAVERSE(&conf->userlist, user, list) {
- if (user->userflags & CONFFLAG_SLA_STATION) {
- stationcount++;
- if ((user->userflags & CONFFLAG_HOLD)) {
- holdcount++;
- onhold = user->chan;
- }
- }
- }
- if ((holdcount == 1) && (stationcount == 1)) {
- amonhold = 1;
- if (hangup)
- ast_softhangup(onhold, AST_SOFTHANGUP_EXPLICIT);
- } else if (holdcount && (stationcount == holdcount))
- amonhold = 1;
- return amonhold;
-}
-
-
-/*! \brief The slas()/slat() application */
-static int sla_exec(struct ast_channel *chan, void *data, int trunk)
-{
- int res=-1;
- struct ast_module_user *u;
- char confno[AST_MAX_EXTENSION] = "";
- struct ast_sla *sla;
- struct ast_conference *cnf;
- char *info;
- struct ast_flags confflags = {0};
- int dynamic = 1;
- char *options[OPT_ARG_ARRAY_SIZE] = { NULL, };
- AST_DECLARE_APP_ARGS(args,
- AST_APP_ARG(confno);
- AST_APP_ARG(options);
- );
-
- if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "SLA%c requires an argument (line)\n", trunk ? 'T' : 'S');
- return -1;
- }
-
- info = ast_strdupa(data);
-
- AST_STANDARD_APP_ARGS(args, info);
-
- if (ast_strlen_zero(args.confno)) {
- ast_log(LOG_WARNING, "SLA%c requires an SLA line number\n", trunk ? 'T' : 'S');
- return -1;
- }
-
- u = ast_module_user_add(chan);
-
- if (args.options)
- ast_app_parse_options(sla_opts, &confflags, NULL, args.options);
-
- ast_set_flag(&confflags, CONFFLAG_QUIET|CONFFLAG_DYNAMIC);
- if (trunk)
- ast_set_flag(&confflags, CONFFLAG_WAITMARKED|CONFFLAG_MARKEDEXIT|CONFFLAG_SLA_TRUNK);
- else
- ast_set_flag(&confflags, CONFFLAG_MARKEDUSER|CONFFLAG_SLA_STATION);
-
- sla = ASTOBJ_CONTAINER_FIND(&slas, args.confno);
- if (sla) {
- snprintf(confno, sizeof(confno), "sla-%s", args.confno);
- cnf = find_conf(chan, confno, 1, dynamic, "", 1, &confflags);
- if (cnf) {
- sla_checkforhold(cnf, 1);
- if (!cnf->users) {
- if (trunk) {
- ast_indicate(chan, AST_CONTROL_RINGING);
- invite_stations(chan, sla);
- } else
- invite_trunk(chan, sla);
- } else if (chan->_state != AST_STATE_UP)
- ast_answer(chan);
-
- /* Run the conference */
- res = conf_run(chan, cnf, confflags.flags, options);
- } else
- ast_log(LOG_WARNING, "SLA%c: Found SLA '%s' but unable to build conference!\n", trunk ? 'T' : 'S', args.confno);
- ASTOBJ_UNREF(sla, sla_destroy);
- } else {
- ast_log(LOG_WARNING, "SLA%c: SLA '%s' not found!\n", trunk ? 'T' : 'S', args.confno);
- }
-
- ast_module_user_remove(u);
-
- return res;
-}
-
-/*! \brief The slas() wrapper */
-static int slas_exec(struct ast_channel *chan, void *data)
-{
- return sla_exec(chan, data, 0);
-}
-
-/*! \brief The slat() wrapper */
-static int slat_exec(struct ast_channel *chan, void *data)
-{
- return sla_exec(chan, data, 1);
}
static struct ast_conf_user *find_user(struct ast_conference *conf, char *callerident)
@@ -2906,48 +2868,6 @@
return AST_DEVICE_INUSE;
}
-/*! \brief Callback for devicestate providers */
-static int slastate(const char *data)
-{
- struct ast_conference *conf;
- struct ast_sla *sla, *sla2;
-
- ast_log(LOG_DEBUG, "asked for sla state for '%s'\n", data);
-
- /* Find conference */
- AST_LIST_LOCK(&confs);
- AST_LIST_TRAVERSE(&confs, conf, list) {
- if (!strncmp(conf->confno, "sla-", 4) && !strcmp(data, conf->confno + 4))
- break;
- }
- AST_LIST_UNLOCK(&confs);
-
- /* Find conference */
- sla = sla2 = ASTOBJ_CONTAINER_FIND(&slas, data);
-
- if (!sla2)
- return AST_DEVICE_INVALID;
-
- ASTOBJ_UNREF(sla2, sla_destroy);
-
- ast_log(LOG_DEBUG, "for '%s' conf = %p, sla = %p\n", data, conf, sla);
-
- if (!conf && !sla)
- return AST_DEVICE_INVALID;
-
- /* SKREP to fill */
- if (!conf || !conf->users)
- return AST_DEVICE_NOT_INUSE;
-
- if (conf && sla_checkforhold(conf, 0))
- return AST_DEVICE_ONHOLD;
-
- if ((conf->users == 1) && (AST_LIST_FIRST(&conf->userlist)->userflags & CONFFLAG_SLA_TRUNK))
- return AST_DEVICE_RINGING;
-
- return AST_DEVICE_INUSE;
-}
-
static void load_config_meetme(void)
{
struct ast_config *cfg;
@@ -2974,107 +2894,999 @@
ast_config_destroy(cfg);
}
-/*! Append SLA station to station list */
-static void append_station(struct ast_sla *sla, const char *station)
-{
- struct ast_sla_station *s;
- char *c;
-
- s = ast_calloc(1, sizeof(struct ast_sla_station) + strlen(station) + 2);
- if (s) {
- ASTOBJ_INIT(s);
- strcpy(s->tech, station);
- c = strchr(s->tech, '/');
- if (c) {
- *c = '\0';
- s->dest = c + 1;
- ASTOBJ_CONTAINER_LINK(&sla->stations, s);
- } else {
- ast_log(LOG_WARNING, "station '%s' should be in tech/destination format! Ignoring!\n", station);
- free(s);
- }
- }
-}
-
-/*! Parse SLA configuration file and create objects */
-static void parse_sla(const char *cat, struct ast_variable *v)
-{
- struct ast_sla *sla;
-
- sla = ASTOBJ_CONTAINER_FIND(&slas, cat);
- if (!sla) {
- sla = ast_calloc(1, sizeof(struct ast_sla));
- if (sla) {
- ASTOBJ_INIT(sla);
- ast_copy_string(sla->name, cat, sizeof(sla->name));
- snprintf(sla->confname, sizeof(sla->confname), "sla-%s", sla->name);
- ASTOBJ_CONTAINER_LINK(&slas, sla);
- }
- }
- if (sla) {
- ASTOBJ_UNMARK(sla);
- ASTOBJ_WRLOCK(sla);
- ASTOBJ_CONTAINER_DESTROYALL(&sla->stations, station_destroy);
- while (v) {
- if (!strcasecmp(v->name, "trunk")) {
- char *c;
- c = strchr(v->value, '/');
- if (c) {
- ast_copy_string(sla->trunktech, v->value, (c - v->value) + 1);
- ast_copy_string(sla->trunkdest, c + 1, sizeof(sla->trunkdest));
+/*! \brief Find an SLA trunk by name
+ * \note This must be called with the sla_trunks container locked
+ */
+static struct sla_trunk *find_trunk(const char *name)
+{
+ struct sla_trunk *trunk = NULL;
+
+ AST_RWLIST_TRAVERSE(&sla_trunks, trunk, entry) {
+ if (!strcasecmp(trunk->name, name))
+ break;
+ }
+
+ return trunk;
+}
+
+/*! \brief Find an SLA station by name
+ * \note This must be called with the sla_stations container locked
+ */
+static struct sla_station *find_station(const char *name)
+{
+ struct sla_station *station = NULL;
+
+ AST_RWLIST_TRAVERSE(&sla_stations, station, entry) {
+ if (!strcasecmp(station->name, name))
+ break;
+ }
+
+ return station;
+}
+
+static struct sla_trunk_ref *find_trunk_ref(const struct sla_station *station,
+ const char *name)
+{
+ struct sla_trunk_ref *trunk_ref = NULL;
+
+ AST_LIST_TRAVERSE(&station->trunks, trunk_ref, entry) {
+ if (!strcasecmp(trunk_ref->trunk->name, name))
+ break;
+ }
+
+ return trunk_ref;
+}
+
+static struct sla_station_ref *create_station_ref(struct sla_station *station)
+{
+ struct sla_station_ref *station_ref;
+
+ if (!(station_ref = ast_calloc(1, sizeof(*station_ref))))
+ return NULL;
+
+ station_ref->station = station;
+
+ return station_ref;
+}
+
+static void change_trunk_state(const struct sla_trunk *trunk, enum sla_trunk_state state, int inactive_only)
+{
+ struct sla_station *station;
+ struct sla_trunk_ref *trunk_ref;
+
+ ast_log(LOG_DEBUG, "Setting all refs of trunk %s to state %s\n", trunk->name, trunkstate2str(state));
+
[... 1832 lines stripped ...]
More information about the svn-commits
mailing list