Commit Graph

548 Commits

Author SHA1 Message Date
Joshua Colp
1be69d516b I like it when app_meetme builds under dev mode, don't you?
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57873 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-05 18:45:28 +00:00
Russell Bryant
3d6e6e07ef Merged revisions 57364 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57364 | russell | 2007-03-01 17:42:53 -0600 (Thu, 01 Mar 2007) | 16 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Originally, I put in the documentation that only Zap interfaces would be
  supported on the trunk side.  However, after a discussion with Qwell, we came
  up with a way to make IP trunks work as well, using some things already in
  Asterisk.  So, here it is, this now officially supports IP trunks.
* Update the SLA documentation to reflect how to setup IP trunks.
* Add a section in sla.txt that describes how to set up an SLA system with
  voicemail.
* Simplify the way DTMF passthrough is handled in MeetMe.
* Fix a bug that exposed itself when using a Local channel on the trunk side
  in SLA.  The station's channel needs to be passed to the dial API when
  dialing the trunk.
* Change a WARNING message to DEBUG in channel.h.  This message is of no use
  to users.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-01 23:44:09 +00:00
Russell Bryant
9c58ead89b Merged revisions 57203 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57203 | russell | 2007-02-28 16:07:05 -0600 (Wed, 28 Feb 2007) | 7 lines

Merge more changes from svn/asterisk/team/russell/sla_updates

* Add support for private hold.  By setting "hold=private" for a trunk, only
  the station that put the call on hold will be able to retrieve it from hold.
  Also, by setting "hold=private" for a station, any call that station puts
  on hold can only be retrieved by that station.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 22:09:33 +00:00
Russell Bryant
00ab6324e8 Merged revisions 57146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57146 | russell | 2007-02-28 13:58:56 -0600 (Wed, 28 Feb 2007) | 2 lines

Minor formatting change

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 19:59:26 +00:00
Russell Bryant
69b0eb24ed Merged revisions 57144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57144 | russell | 2007-02-28 13:56:20 -0600 (Wed, 28 Feb 2007) | 6 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Add support for the "barge=no" option for trunks.  If this option is set,
  then stations will not be able to join in on a call that is on progress
  on this trunk.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 19:57:41 +00:00
Russell Bryant
4fd59356ef Merged revisions 57089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57089 | russell | 2007-02-28 12:20:05 -0600 (Wed, 28 Feb 2007) | 8 lines

Merge current set of changes from svn/asterisk/team/russell/sla_updates

* Add support for station ring delays.  Ring delays can be set globally for a
  station or for specific trunks on the station.
* Fix a few bugs in existing code.
* Restructure and Reorganize code to improve readability and maintainability.
* Improve formatting of the "sla show (trunks|stations)" CLI commands.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-28 18:21:47 +00:00
Russell Bryant
12432b9b9e 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
2007-02-26 01:05:15 +00:00
Olle Johansson
75d387acbc Doxygen additions, corrections
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-24 20:29:41 +00:00
Joshua Colp
e6bd19bfa5 Make Meetme build again under dev mode.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-24 01:56:41 +00:00
Russell Bryant
9138e53bc9 Merged revisions 56277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56277 | russell | 2007-02-22 17:08:36 -0600 (Thu, 22 Feb 2007) | 18 lines

Merge changes from team/russell/sla_updates.

This batch of changes to the SLA code does a few different things.

* I made the SLA code event driven instead of having to act in a lot of busy
  loops while dialing things to wait for state changes.  This makes the code
  more efficient and readable at the same time.

* I have implemented a couple of new features.  The first is inbound trunk
  ringing timeouts.  This is an option that defines how long to let an incoming
  call on a trunk to ring.

* I have also implemented ring timeouts for stations.  They may be specified
  for the entire station, meaning it is how long to let the station ring before
  giving up.  You can also specify a ring timeout for a specific trunk on a
  station.  So, you can say that you only want a specific station to ring 5
  seconds if it is line1 ringing, but otherwise, there is no timeout.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-22 23:12:26 +00:00
Joshua Colp
7e06a97fdd Merged revisions 55957 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r55957 | file | 2007-02-21 15:35:40 -0500 (Wed, 21 Feb 2007) | 10 lines

Merged revisions 55956 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r55956 | file | 2007-02-21 15:32:16 -0500 (Wed, 21 Feb 2007) | 2 lines

Change naughty warning message to provide useful information. If a write now fails on a channel in meetme it will tell you the channel name instead of spitting out the wrong error message.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 20:41:53 +00:00
Russell Bryant
f5bd40d925 Merged revisions 55951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55951 | russell | 2007-02-21 14:22:33 -0600 (Wed, 21 Feb 2007) | 3 lines

Simplify the last change to app_meetme, and move the call to dispose_conf()
up into the block where we know a conf exists.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 20:23:03 +00:00
Joshua Colp
80e8ca4f9b Merged revisions 55949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55949 | file | 2007-02-21 15:16:34 -0500 (Wed, 21 Feb 2007) | 2 lines

Only dispose of the conference if one was created.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 20:18:16 +00:00
Russell Bryant
e57e5aca4a Merged revisions 55758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55758 | russell | 2007-02-20 19:03:25 -0600 (Tue, 20 Feb 2007) | 4 lines

Improve the reference counting to fix bugs where people report seeing
conferences listed that have no members.
(issue #9073)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-21 01:05:00 +00:00
Russell Bryant
f11d0b3d54 Merged revisions 55006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r55006 | russell | 2007-02-16 16:49:42 -0600 (Fri, 16 Feb 2007) | 17 lines

Merged revisions 55005 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r55005 | russell | 2007-02-16 16:48:22 -0600 (Fri, 16 Feb 2007) | 9 lines

Revert the change I did in revisions 54955, 54969, and 54970, in 1.2, 1.4, 
and trunk.  I decided that once a conference is created from meetme.conf,
it is acceptable behavior that the pin can not be changed until the
conference goes away.  I also added a note in meetme.conf to describe this
behavior.

We still have another issue in 1.4 and trunk where some conferences with no
users don't go away.  That is the real bug that needs to be addressed here.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 22:50:22 +00:00
Russell Bryant
566c71d0f7 Merged revisions 54969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r54969 | russell | 2007-02-16 15:12:18 -0600 (Fri, 16 Feb 2007) | 13 lines

Merged revisions 54955 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r54955 | russell | 2007-02-16 14:56:58 -0600 (Fri, 16 Feb 2007) | 5 lines

For conferences that are configured in meetme.conf, check the configuration
file every time someone joins the conference instead of only when the
conference is first created.  This is to ensure that changes to the pin
numbers in the config file are always honored.  (issue #9073)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-16 21:13:51 +00:00
Russell Bryant
f60efe347a This introduces a new dialplan function, DEVSTATE, which allows you to do some
pretty cool things.

First, you can get the device state of anything in the dialplan:
  NoOp(SIP/mypeer has state ${DEVSTATE(SIP/mypeer)})
  NoOp(The conference room 1234 has state ${DEVSTATE(MeetMe:1234)})

Most importantly, this allows you to create custom device states so you can
control phone lamps directly from the dialplan.
  Set(DEVSTATE(Custom:mycustomlamp)=BUSY)
  ...
  exten => mycustomlamp,hint,Custom:mycustomlamp


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-13 22:02:20 +00:00
Russell Bryant
2a5477b35e Merged revisions 54066 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54066 | russell | 2007-02-12 11:58:43 -0600 (Mon, 12 Feb 2007) | 4 lines

- Add the ability to register a callback to monitor state changes in an
  asynchronous dial operation.
- Rename the various references to "status" to "state" in the dial API

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@54067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-12 18:01:15 +00:00
Russell Bryant
5715b49c30 Merged revisions 53810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53810 | russell | 2007-02-09 18:35:09 -0600 (Fri, 09 Feb 2007) | 24 lines

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.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-10 00:40:57 +00:00
Russell Bryant
b233892198 Merged revisions 53046 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r53046 | russell | 2007-01-31 15:32:08 -0600 (Wed, 31 Jan 2007) | 11 lines

Merged revisions 53045 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r53045 | russell | 2007-01-31 15:25:11 -0600 (Wed, 31 Jan 2007) | 3 lines

Fix a bunch of places where pthread_attr_init() was called, but
pthread_attr_destroy() was not.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@53047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-31 21:35:15 +00:00
Russell Bryant
d26bb9ccb6 Merged revisions 51343 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51343 | russell | 2007-01-19 18:13:06 -0600 (Fri, 19 Jan 2007) | 2 lines

Remove an unused instance of an unnamed enum.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-20 00:13:52 +00:00
Russell Bryant
c39e1b8246 Merged revisions 51341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51341 | russell | 2007-01-19 16:19:10 -0600 (Fri, 19 Jan 2007) | 2 lines

Remove another duplicated definition

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51342 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 22:34:13 +00:00
Russell Bryant
cde480e400 Merged revisions 51339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51339 | russell | 2007-01-19 15:20:20 -0600 (Fri, 19 Jan 2007) | 2 lines

Remove a variable that was declared twice.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 21:21:03 +00:00
Luigi Rizzo
1b35a441d9 include "asterisk/zapata.h" instead of testing for
the location of the header files.

On passing, add a cast to insure -Werror clean compilation
on FreeBSD 6.x, where time_t does not match %ld



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 16:21:24 +00:00
Kevin P. Fleming
87b9abc892 Merged revisions 49676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r49676 | kpfleming | 2007-01-05 16:16:33 -0600 (Fri, 05 Jan 2007) | 2 lines

reduce stack consumption for AMI and AMI/HTTP requests by nearly 20K in most cases

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-05 22:43:18 +00:00
Joshua Colp
b3ca8342fd Merged revisions 48966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48966 | file | 2006-12-26 00:20:08 -0500 (Tue, 26 Dec 2006) | 2 lines

Get rid of a needless memory allocation and only create a conference structure in find_conf_realtime if data was read from realtime. (issue #8669 reported by robl)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-26 05:23:25 +00:00
Steve Murphy
7b338004bf a quick fix to app_sms.c to get rid of cursed compiler warnings so I can compile under --enable-dev-mode
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-21 19:44:20 +00:00
Joshua Colp
c0c1c35e9a Merged revisions 48379 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48379 | file | 2006-12-11 00:30:01 -0500 (Mon, 11 Dec 2006) | 2 lines

Use the correct API call to say a device state changed. (Yes, I'm a nub.)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11 05:34:53 +00:00
Joshua Colp
f5c2b80787 Merged revisions 48377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48377 | file | 2006-12-10 23:57:38 -0500 (Sun, 10 Dec 2006) | 2 lines

Don't access the conference structure after it has been freed.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11 05:01:37 +00:00
Russell Bryant
5824af9cbc Resolve some pointer signedness compiler warnings in app_osplookup, and
constify a bunch of usage strings for CLI commands.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-06 07:39:39 +00:00
Joshua Colp
9a40c9c4f2 Merged revisions 47748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47748 | file | 2006-11-16 12:52:48 -0500 (Thu, 16 Nov 2006) | 2 lines

Don't unreference the SLA object if there is no SLA object in the devicestate callback. (issue #8354 reported by loloski)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-16 17:53:58 +00:00
Joshua Colp
4546bd26fc Don't play the "entering conference number <insert number here>" prompts if the 'q' option is used. If others believe this should be in 1.2/1.4 then we can put it in, but I'm uncomfortable doing so right now as it is a change of behavior. (issue #8138 reported by tmancill)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-13 17:55:24 +00:00
Russell Bryant
0ca6a42d7e fix various spelling mistakes in comments (issue #8237, jmls)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-26 17:52:15 +00:00
Russell Bryant
18b7e4b699 Merged revisions 46065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46065 | russell | 2006-10-23 21:04:14 -0400 (Mon, 23 Oct 2006) | 2 lines

Fix the descriptions of some of the MeetMeAdmin options (issue #8098, mflorell)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-24 01:05:11 +00:00
Joshua Colp
2ee00d58c7 Just for Nicholson - here's an option, C, to Meetme that will allow it to continue in the dialplan if the person is kicked out. (issue #7994 reported by mnicholson with mods by myself)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-18 22:19:57 +00:00
Kevin P. Fleming
3c876af5cf Merged revisions 44378 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44378 | kpfleming | 2006-10-04 14:47:22 -0500 (Wed, 04 Oct 2006) | 4 lines

update thread creation code a bit
reduce standard thread stack size slightly to allow the pthreads library to allocate the stack+data and not overflow a power-of-2 allocation in the kernel and waste memory/address space
add a new stack size for 'background' threads (those that don't handle PBX calls) when LOW_MEMORY is defined

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 19:51:38 +00:00
Matt O'Gorman
ae8cc3e18b bug #8076 check option_debug before printing to debug channel.
patch provided in bugnote, with minor changes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-03 15:53:07 +00:00
Joshua Colp
3e4a081e1c Make callerid fields in Manager events more consistent. CallerIDNum for number and CallerIDName for name. (issue #7976 reported by suhler)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 20:35:16 +00:00
Joshua Colp
b201ce0ae0 Merged revisions 43893 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43893 | file | 2006-09-28 12:17:36 -0400 (Thu, 28 Sep 2006) | 10 lines

Merged revisions 43891 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43891 | file | 2006-09-28 12:13:55 -0400 (Thu, 28 Sep 2006) | 2 lines

Stop the stream after waitstream returns so that our formats get restored. (issue #7370 reported by kryptolus)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 16:19:22 +00:00
Jason Parker
ee13556e30 Fire a manager event when a meetme is started/stopped.
Issue #7891, patch by suhler.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-26 22:18:04 +00:00
Tilghman Lesher
70af28270d Constify the result of a config retrieval function, to avoid mutilation (issue 7983).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-20 20:40:39 +00:00
Kevin P. Fleming
fcb999c01c merge qwell's CLI verbification work
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-18 19:54:18 +00:00
Tilghman Lesher
e16104185a Merged revisions 43003 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43003 | tilghman | 2006-09-15 23:44:02 -0500 (Fri, 15 Sep 2006) | 2 lines

When the marked user enters the conference, we should no longer timeout

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16 05:43:54 +00:00
Tilghman Lesher
979ef8d2ed Merged revisions 42783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42783 | tilghman | 2006-09-11 16:47:23 -0500 (Mon, 11 Sep 2006) | 4 lines

When paging, only wait 5 seconds for the marked user to enter the conference.
After that, assume the paging already completed by the time the channel entered
the conference and drop back out.  (Issue 7275)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-11 22:17:46 +00:00
Kevin P. Fleming
0a27d8bfe5 merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
  - support for embedded modules
  - support for static builds
  - simpler cross-compilation support
  - simpler module/loader interface (no exported symbols)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-21 02:11:39 +00:00
Russell Bryant
87ac16847e - unregister SLA apps on module unload and add sample config (issue #7701, junky)
- rename SLAS to SLAStation, and SLAT to SLATrunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39637 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-14 01:32:46 +00:00
Kevin P. Fleming
6d0742fc16 merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19 20:44:39 +00:00
Mark Spencer
f6d03e822a Make app_meetme's do_invite more generic.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-17 02:17:38 +00:00
Mark Spencer
4c90cf59b7 Support hold/unhold in Zap, update IAX2 parser to know about modern commands, forward hold/unhold in dial, add hold device state
and implement holding in the SLA.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-08 02:24:07 +00:00
Kevin P. Fleming
f761d2f6f0 prepare Asterisk for new zaptel.h/tonezone.h installation locations
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-05 16:44:41 +00:00