Commit graph

58 commits

Author SHA1 Message Date
Mark Spencer
c3c13114fb Merge mochouinard's meetme fixups (bug #2230)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-08-27 04:12:55 +00:00
Mark Spencer
f3522b6c01 Plane commits (a.k.a. the Delta deltas): 1) Make muted reconnect 2) Add "X" option to meetme and add ${MEETME_EXIT_CONTEXT}, 3) Allow SIP call parking with supervised transfer, 4) Only create parking entries when calls actually get parked, 5) Add "sunshine" song, 6) Update hardware documentation, 7) Don't load empty strings from history file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-08-03 06:31:20 +00:00
Mark Spencer
437f625786 Add user number (bug #2203)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-08-02 15:28:12 +00:00
Mark Spencer
8b364485a0 dynamic_pin can be NULL (bug #2202)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-08-02 13:10:15 +00:00
Mark Spencer
f195e423f4 Correct for user selecting 'D' when they should be selecting 'd' (bug #2200)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-08-02 02:58:15 +00:00
Mark Spencer
bf70a01da6 Merge alternate hangup and meetme patches from Matt N.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-07-28 19:25:14 +00:00
Mark Spencer
42837cde4c Allow you to enter the pin again during th "invalid pin" message
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-07-27 03:10:26 +00:00
Mark Spencer
1394a78bd6 Merge tilghman's meetme fix for reentering pin (bug #2143)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-07-27 03:08:00 +00:00
Mark Spencer
4d32c46126 Merge rgagnon's pedantic string checks (apps a-m, bug #2035)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-07-14 07:22:30 +00:00
Mark Spencer
196112076c Fix small typo (bug #1945)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-29 11:40:54 +00:00
Mark Spencer
5fec7176e0 Merge Tilghman's meetme updates (bug #1934)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-28 22:10:50 +00:00
Mark Spencer
5e36feac27 Add 'w' option to meetme which causes us to wait for a "marked" user to enter the bridge
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-23 04:55:04 +00:00
James Golovich
f5c18f62a1 Remove pthread.h from source. We should be using asterisk/lock.h everywhere instead (except in asterisk/lock.h).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-22 19:32:52 +00:00
Mark Spencer
491e5d941c Make 'x' option behave as advertised (bug #1878)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-21 02:37:34 +00:00
Mark Spencer
d11177774a More meetme locking fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-17 05:21:54 +00:00
Mark Spencer
4f72a1da77 Fix doubly-linked list delete
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-17 04:42:03 +00:00
Mark Spencer
4a4e1e348d Must be inside lock when finding start
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-17 02:42:42 +00:00
Mark Spencer
3cf5ea7383 Make meetme operate in linear so as to keep alaw folk happy, minor iax2
authentication cleanup


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-14 03:12:46 +00:00
Mark Spencer
a53d260d5f Minor meetme cleanups
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-09 19:43:23 +00:00
Mark Spencer
727abcdec7 Merge FreeBSD locking fixes (bug #1411)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-09 01:45:08 +00:00
Mark Spencer
103bb4a334 Enhancements for zaptel+bsd (bug #1781)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-04 15:44:14 +00:00
Mark Spencer
8f5498177e WOrk on the proper pointer (bug #1773)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-02 23:27:50 +00:00
Mark Spencer
b6beb440cd Use pseudo channel instead of just /dev/zap/pseudo, now with proper protections (bug #1766)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-02 16:57:14 +00:00
Mark Spencer
31e427d775 Oops slightly premature
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-01 22:54:18 +00:00
Mark Spencer
a435f135b5 Use pseudo channel (but real channel) instead of just directly opening /dev/zap/pseudo to enable future meetme enhancements (bug #1766)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3125 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-06-01 22:53:52 +00:00
Mark Spencer
5ee4f3048c Fix formatting issues
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-30 20:38:05 +00:00
Mark Spencer
0f5ed60d51 Minor RTP video fixes, be more careful about closing fd's in meetme (bug #1743)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-30 20:24:48 +00:00
Mark Spencer
2cd1eb39b1 Don't count as outgoing until we actually send the new INVITE
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-27 16:14:46 +00:00
Mark Spencer
03cb980dc2 Meetme fixes (bug #1729)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-27 14:35:26 +00:00
Mark Spencer
cf24f7ff7e Change 'u' back to 's' since it's required for both user and admin menus
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-23 23:46:43 +00:00
Mark Spencer
25ca4c854c Small fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-23 14:55:50 +00:00
Mark Spencer
50449d5c87 MeetMe documentation improvements (bug #1703)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-23 14:19:45 +00:00
Mark Spencer
a0486afb83 Merge fabeman's extensive meetme improvements (bug #1624)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3038 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-22 04:11:22 +00:00
Mark Spencer
beae1fb946 Add events for join/leave (bug #1625)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-05-13 19:02:47 +00:00
Mark Spencer
5192a1a054 Add support for French, Danish, Portuguese, Spanish, Italian, and Dutch numbers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2809 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-04-29 02:30:14 +00:00
James Golovich
4d7386fc5f Add ability to do PINs with dynamic conf (bug 1026)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-04-08 19:38:26 +00:00
Mark Spencer
13bca43aa8 Get rid of all that old needlock garbage now that we're using recursive mutexes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-04-06 22:17:32 +00:00
Mark Spencer
eeb2ca5b26 Make read/write mode have a lock parameter and use it properly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-03-27 06:50:12 +00:00
Mark Spencer
260072954e Revert meetme work around now that zaptel is fixed
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-02-10 06:47:42 +00:00
Mark Spencer
0dd66bd2e9 Implement temporary work around for pseudo channels with SMP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-02-05 22:28:44 +00:00
Jeremy McNamara
74aea6680a clean up output and print that we are unregistering a channel type
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-14 06:04:46 +00:00
Jeremy McNamara
b1488a63ef Don't return -1 for successful conf in meetme. Bug #824
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-13 04:42:39 +00:00
Jeremy McNamara
2786bc27be Implement pin usage in MeetMe. Bug #816
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-12 23:21:29 +00:00
Mark Spencer
c26e3b15ac Documentation fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-11 20:01:07 +00:00
Jeremy McNamara
06d2506544 Say what is not implemented, yet. Feel free to dive in and code away, ppl. Bug #787
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-11 18:43:43 +00:00
Jeremy McNamara
3135a5e01f Fix dynamic user count, Take 4
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-11 08:07:23 +00:00
Jeremy McNamara
f020200c2c Take 3, count dynamic users also
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-11 06:54:22 +00:00
Jeremy McNamara
c54405c270 fix dynamic conference. Bug #743 take two
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-11 06:31:42 +00:00
Jeremy McNamara
9c116b4d4d Allow dynamic conferences to be joined by channels without dynamic flag. Bug #743
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2004-01-11 06:07:36 +00:00
Mark Spencer
fa45f2e6ba Add meetme option
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2003-11-04 21:47:35 +00:00