diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 6b5355ae7b..4abfdb3c3c 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -192,8 +192,8 @@ AST_APP_OPTIONS(sla_opts, { static const char *app = "MeetMe"; static const char *app2 = "MeetMeCount"; static const char *app3 = "MeetMeAdmin"; -static const char *appslas = "SLAS"; -static const char *appslat = "SLAT"; +static const char *appslas = "SLAStation"; +static const char *appslat = "SLATrunk"; static const char *synopsis = "MeetMe conference bridge"; static const char *synopsis2 = "MeetMe participant count"; @@ -278,13 +278,13 @@ static const char *descrip3 = ""; static const char *descripslas = -" SLAS(sla[,options]): Run Shared Line Appearance for station\n" +" 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 = -" SLAT(sla[,options]): Run Shared Line Appearance for trunk\n" +" 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"; @@ -2460,13 +2460,13 @@ static void do_invite(struct ast_channel *orig, const char *tech, const char *de 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, "SLAS", sla->name); + 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, "SLAT", sla->name); + do_invite(orig, sla->trunktech, sla->trunkdest, "SLATrunk", sla->name); } @@ -3063,6 +3063,8 @@ static int unload_module(void *mod) res |= ast_unregister_application(app3); res |= ast_unregister_application(app2); res |= ast_unregister_application(app); + res |= ast_unregister_application(appslas); + res |= ast_unregister_application(appslat); ast_devstate_prov_del("Meetme"); ast_devstate_prov_del("SLA"); diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample index 090a46d42d..e7fc472c19 100644 --- a/configs/sla.conf.sample +++ b/configs/sla.conf.sample @@ -1 +1,26 @@ -; this space is available for rent. Contact our sales people for more information. +; Configuration file for SLAs (Shared Line Appearances). + +; Defining a SLA uses the following syntax: +; +; type => Technology/TechData +; +; type => trunk or station +; Technology => the channel driver (see show channeltypes) +; TechData => the data specific to the channel driver +; +; The Technology/TechData information is the same as that provided to the +; Dial application. +; + +; define a SLA called junky +[junky] +trunk => SIP/10 +station => SIP/15 +station => SIP/16 + +;define a SLA called markster +[markster] +trunk => Zap/1 +station => SIP/20 + +; Also you can see SLA infos via the CLI, by typing "sla show"