Commit Graph

97 Commits

Author SHA1 Message Date
Russell Bryant
8e7cb1aa7a Fix a couple potential minor memory leaks. load_moh_classes() could return
without destroying the loaded configuration.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@75107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-13 20:35:22 +00:00
Russell Bryant
ab2a84f410 Ensure that adding a user to the list of users of a specific music on hold
class is not done at the same time as any of the other operations on this list
to prevent list corruption.  Using the global moh_data lock for this is not
ideal, but it is what is used to protect these lists everywhere else in the
module, and I am only changing what is necessary to fix the bug.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@75059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-13 20:07:21 +00:00
Joshua Colp
577c0ebedd Only print out a warning for situations where it is actually helpful. (issue #10187 reported by denke)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@74814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-12 15:51:24 +00:00
Russell Bryant
319b105e17 When the specified class isn't found, properly fall back to the channel's music
class or the default.
(issue #10123, reported by blitzrage, patches from juggie, qwell, and me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@74165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-09 21:00:17 +00:00
Joshua Colp
8ea5a33c9e Return previous behavior of having MOH pick up where it was left off. (issue #8672 reported by sinistermidget)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@53084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-01 21:03:10 +00:00
Joshua Colp
e1dc278941 Yield before reading from zaptel timing source under Solaris so that other threads get a chance to do things. (issue #7875 reported by bob)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@51512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-23 01:41:35 +00:00
Tilghman Lesher
983d09bc21 When doing a fork() and exec(), two problems existed (Issue 8086):
1) Ignored signals stayed ignored after the exec().
2) Signals could possibly fire between the fork() and exec(), causing Asterisk
signal handlers within the child to execute, which caused nasty race conditions.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-11 00:33:59 +00:00
Russell Bryant
d79533bd94 Ensure that the file position is not incremented beyond the total number of
files available for playback.  (issue #8539, ulogic)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-07 18:14:13 +00:00
Tilghman Lesher
9bb51868ca Random MOH wasn't really random (bug 8381)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 17:15:54 +00:00
Russell Bryant
7c651a64a7 If random order is enabled for files mode music on hold, set a random initial
position, instead of always starting at the first file, and doing the random
operation only when switching to the next file.
(bug reported by John Lange on the asterisk-dev mailing list)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@47238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-07 01:22:58 +00:00
Russell Bryant
f18766c30a ignore files in a music on hold directory that begin with '.'
(issue #8249, cboie)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@46964 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-02 17:47:56 +00:00
Russell Bryant
bf20deeba1 We should always be using _exit() after a fork() or vfork() instead of exit().
This is because exit() does some extra cleanup which in some implementations
of vfork(), for example, can actually modify the state of the parent process,
causing very weird bugs or crashes.  (issue #7971, Nick Gavrikov)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@46361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-27 17:36:07 +00:00
Joshua Colp
87803a8ac6 Put in missing \ns on the end of ast_logs (issue #7936 reported by wojtekka)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@43924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 18:00:30 +00:00
Joshua Colp
a56f08e345 Treat the file as invalid if we have no valid formats for it (issue #7643 reported by KNK)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-03 19:54:02 +00:00
Joshua Colp
83f9228c1d Close the stream when file based MOH stop. This won't get rid of their position in the file but it will cause the translation path to be setup again. (issue #7634 reported by asimpson)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-01 19:20:05 +00:00
Russell Bryant
9c5890a138 when using moh files mode, don't look for a file past the number of files
that have been loaded, or worse, past the size of the files array


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@31775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-03 17:02:49 +00:00
Kevin P. Fleming
3feead3415 remove pointless forcing of the channel into SLINEAR mode; the write format will be set later based on the file that is chosen to be played to the channel
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@31555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-01 21:46:50 +00:00
Tilghman Lesher
00c0af845d Bug 6864 - drop realtime priority on ALL external processes
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@24019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-01 20:44:24 +00:00
Tilghman Lesher
6abf8e5e92 Bug 6544 - when we remove a music class, the thread servicing it should die
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@20966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-17 17:00:16 +00:00
Joshua Colp
52aa07e2b2 Do not exceed the array size for maximum allowed moh files. (issue #6842)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@16534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-30 17:55:28 +00:00
Kevin P. Fleming
a563eab49a remove extraneous svn:executable properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:24:39 +00:00
Russell Bryant
bffc815375 issue #5791
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-2@7147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-20 23:21:40 +00:00
Kevin P. Fleming
544a2ecbd3 issue #5766
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-16 17:48:18 +00:00
Kevin P. Fleming
a0a9769616 issue #5648
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-08 01:55:31 +00:00
Russell Bryant
3453e3efa5 Doxygen documentation update from oej (issue #5505)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-10-24 20:12:06 +00:00
Mark Spencer
e5afdbbe16 Fix res_musiconhold lock
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-10-19 03:51:25 +00:00
Kevin P. Fleming
5da915dcfd update MANY more files with proper copyright/license info (thanks Ian!)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-09-14 20:46:50 +00:00
Kevin P. Fleming
25f3403b21 don't access freed memory if the frame was malloc'd
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-09-01 19:34:49 +00:00
Russell Bryant
746efc536a ensure that the MOH_QUIET flag gets set for the mode "quietmp3nb"
add mode to the output of the "moh classes show" cli command


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-31 01:16:48 +00:00
Kevin P. Fleming
fcc3a3ac32 don't install moh functions if no classes are configured (issue #5025 with mods)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-25 23:29:30 +00:00
Kevin P. Fleming
ff971379f4 support new format for musiconhold.conf (issue #4908)
support non-SLINEAR moh streams (issue #4908)
add external app to feed TCP stream into Asterisk for moh (issue #4908)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-08-22 19:29:29 +00:00
Mark Spencer
86ec024624 Fix music on hold leak (bug #4842)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-07-28 18:37:55 +00:00
Kevin P. Fleming
22b0f5d306 add a library of timeval manipulation functions, and change a large number of usses to use the new functions (bug #4504)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-07-15 23:00:47 +00:00
Kevin P. Fleming
37184c4244 revert patch from bug #4532 until CPU consumption problem can be resolved
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-07-12 18:57:20 +00:00
Kevin P. Fleming
771f699cdd fix threading portability problem with FreeBSD (bug #4532)
ensure that all mpg123 child processes get killed when the parent is killed (bug #4532)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-07-11 21:42:25 +00:00
Anthony Minessale II
de87676975 Apply NODIR Patch (Bug #4619)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6017 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-06-30 18:08:27 +00:00
Kevin P. Fleming
2b8338cb52 more file version tags
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-06-06 22:12:19 +00:00
Kevin P. Fleming
4f299de252 major Makefile and build process improvements, including removal of all hardcoded paths (modules must now use run-time paths as they should) (bug #4116)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-06-06 03:04:58 +00:00
Kevin P. Fleming
1bac31d6bd more efficient (and understandable) ast_channel_walk_locked, and vastly more efficient ast_channel_by_name_locked (bug #4265)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-06-06 02:29:18 +00:00
Kevin P. Fleming
1f9ab2380a use double-quotes instead of angle-brackets for non-system include files (bug #4058)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-04-21 06:02:45 +00:00
Kevin P. Fleming
b052fe894b ensure that the random number generator(s) are always seeded with a different value during Asterisk startup
don't reinitialize random number generators in other modules
(bug #4017)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-04-13 04:47:39 +00:00
Mark Spencer
4b03dace5f Fix little formatting thingy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-04-07 14:53:31 +00:00
Mark Spencer
badc4dec46 Make mpg123 behave more nicely
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-03-05 03:20:55 +00:00
Mark Spencer
18d9b26cf9 Rework channel structure to eliminate "pvt" portion of channel (bug #3573)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5137 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-03-04 06:47:24 +00:00
Mark Spencer
f8fc683adc Add "StartMusicOnHold and "StopMusicOnHold" apps (bug #3703)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-03-03 05:03:06 +00:00
Mark Spencer
5f726ad8c7 Merge config updates (bug #3406)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-25 06:10:20 +00:00
Russell Bryant
0c30452423 update copyright headers for 2005
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-21 07:06:25 +00:00
Mark Spencer
2c1f9b84ff Check moh files at runtime (bug #3314)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-10 22:12:58 +00:00
Mark Spencer
03458dc73a Various moh fixes (bug #3291)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-09 09:00:41 +00:00
Mark Spencer
e83f71679f Fix typo in moh output (bug #3265)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-01-07 14:47:51 +00:00