| Summary: | ASTERISK-11060: [patch] Music on hold / MOH will not reload or unload | ||
| Reporter: | Erik Sundberg (sunder) | Labels: | |
| Date Opened: | 2007-12-16 21:04:14.000-0600 | Date Closed: | 2008-04-25 07:11:53 |
| Priority: | Major | Regression? | No |
| Status: | Closed/Complete | Components: | Resources/NewFeature |
| Versions: | Frequency of Occurrence | ||
| Related Issues: | |||
| Environment: | Attachments: | ( 0) asterisk-mohunload.diff.txt ( 1) asterisk-mohunload2.diff.txt ( 2) bug11575_trunk.diff.txt ( 3) M11575_14_rev2.diff ( 4) M11575_14_rev3.diff ( 5) M11575_newline.diff ( 6) M11575_rev2.diff ( 7) M11575.diff | |
| Description: | Asterisk Version 1.4.15 Centos 4.5 res_musiconhold.c Revisions Number: 89053 I Changed the directory in the musiconhold.conf config file. Then in the asterisk console and typed 'reload' and moh did not reload. Then i typed 'moh reload' and still nothing. Then i tried to unloading the res_musiconhold.so module and it would not unload and give me an error. OLD DIRECTORY: /var/lig/asterisk/moh NEW DIRECTORY: /var/lib/asterisk/moh-new A reload and moh reload does nothing asterisk*CLI> moh reload == Parsing '/etc/asterisk/musiconhold.conf': Found asterisk*CLI> moh show files Class: default File: /var/lib/asterisk/moh/fpm-world-mix File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-calm-river asterisk*CLI> moh classes show Class: default Mode: files Directory: /var/lib/asterisk/moh Use Count: 0 CONFIG FILE: /etc/asterisk/musiconhold.conf [default] mode=files directory=/var/lib/asterisk/moh-new random=yes FULL DEBUG [Dec 16 20:33:14] VERBOSE[10474] logger.c: == Parsing '/etc/asterisk/musiconhold.conf': [Dec 16 20:33:14] DEBUG[10474] config.c: Parsing /etc/asterisk/musiconhold.conf [Dec 16 20:33:14] VERBOSE[10474] logger.c: Found [Dec 16 20:33:14] DEBUG[10474] res_musiconhold.c: Music on Hold class 'default' left alone from initial load. SIDE NOTE: NO END OF LINE CHARACTER ON THE FIRST DEBUG LINE. THIS NEEDS TO BE FIXED AS WELL. [root@asterisk root]# ls -al /var/lib/asterisk/moh-new/ total 31056 drwxr-xr-x 2 root root 4096 Dec 16 20:32 . drwxrwx--- 12 asterisk asterisk 4096 Dec 16 20:32 .. -rw-r--r-- 1 root root 31753960 Dec 16 20:32 moh.wav asterisk*CLI> module unload res_musiconhold.so Unable to unload resource res_musiconhold.so [Dec 16 20:44:40] WARNING[10531]: loader.c:494 ast_unload_resource: Firm unload failed for res_musiconhold.so And the only was to get the change to take affect is a 'restart now' After the restart asterisk*CLI> moh show files Class: default File: /var/lib/asterisk/moh-new/moh asterisk*CLI> moh show classes Class: default Mode: files Directory: /var/lib/asterisk/moh-new Use Count: 0 ****** ADDITIONAL INFORMATION ****** HEAD of res_musiconhold has no mention of fixing a reloading issues, just cleanup and realtime moh, I lookup up to rev 92402. | ||
| Comments: | By: Clod Patry (junky) 2007-12-16 22:33:32.000-0600 Let me know if this has solved your issues for 1.4 By: Clod Patry (junky) 2007-12-16 22:47:10.000-0600 This is for the newline, thanks for this little attention, we always miss this kind of mistakes. and instead of mesasge like: Music on Hold class 'default' left alone from initial load. you will not get any message, except if the class already exists, like: Music on Hold class 'foobar' already exists This will works for a simple reload or moh reload. By: Erik Sundberg (sunder) 2007-12-17 12:16:39.000-0600 Ill try it tonight and let you know By: James Golovich (jamesgolovich) 2007-12-17 13:36:05.000-0600 I put up a patch that got applied to trunk to handle the reload issue, but I'm not sure if it was ever applied to 1.4. Bug ASTERISK-1047536 By: Erik Sundberg (sunder) 2007-12-17 20:16:01.000-0600 I have applied the patch "M11575.diff" I still can't unload the module res_musiconhold.so asterisk*CLI> module unload res_musiconhold.so Unable to unload resource res_musiconhold.so [Dec 17 20:15:38] WARNING[19327]: loader.c:494 ast_unload_resource: Firm unload failed for res_musiconhold.so By: Erik Sundberg (sunder) 2007-12-17 20:17:55.000-0600 I did apply the patch from http://bugs.digium.com/view.php?id=10536 and a MOH reloads properly. So the only issue to fix now is trying to find out why the res_musiconhold.so will not unload? By: Clod Patry (junky) 2007-12-17 20:24:59.000-0600 both patches are doing the same stuff, which reload the directory and not to be able to unload this module. I dont know why the module can't be unloaded, exactly, maybe file or corydon know the exact reason. By: Erik Sundberg (sunder) 2007-12-17 21:01:16.000-0600 NOTE: I did not apply the patch from M11575.diff i used the patch from 10536. Question? Is res_musiconhold.so never suppose to be unloaded becuase it would cause a crash since maybe other modules, channels, apps, resouce are using it. And to unload the module you would have to hangup that call/channels that is being using any MOH resource? Or did no one ever write the code for the unload_moudle() function? By: James Golovich (jamesgolovich) 2007-12-17 21:03:57.000-0600 musiconhold used to be one of those modules that was unable to be unloaded, but I think we should be able to unload it now since we can call ast_uninstall_music_function to unlink the functions. It might have to wait until all users are done using it, but we might be able to forcibly stop it. I'll play around with it and see what I can come up with to handle the unload By: James Golovich (jamesgolovich) 2007-12-17 23:51:23.000-0600 I just uploaded asterisk-mohunload.diff.txt that pretty much forcibly unloads the module. I've tested this without any channels using moh, but I'm unable to do more extensive testing since I'm in a hotel room. We need to see what will happen if a channel is active and also test it with realtime moh. If we end up leaking memory (or worse) when unloading with active moh we probably need to do something like: 1> Go through the chan list and stop all moh 2> Call ast_install_music_function with a NULL start function but the stop and cleanup functions valid, and then wait until all channels are done in use (but not allow new ones to startup) 3> Call ast_install_music_function with a new stop and cleanup function that doesn't reside in this module, not sure that this will really work at all I think that #1 is probably the best option since this requires manual intervention to cause this to happen, and a user unloading moh should expect it to stop for anyone in use By: Clod Patry (junky) 2007-12-18 06:53:11.000-0600 james: why not use the usecount and if the module is currently in use, do not unload it. Since with module unload, you can force the unloading anyway that could be this exact behavior. And instead of returning an explicit 0, why not returning res from all unregister functions, like in app_queue (or mainly all apps) ? By: James Golovich (jamesgolovich) 2007-12-18 11:31:45.000-0600 Good suggestions junky, thanks. Heres a new patch that does all that. By: Tilghman Lesher (tilghman) 2008-01-04 13:16:35.000-0600 I think this just needs some testing, before it goes in? By: Clod Patry (junky) 2008-01-04 13:46:30.000-0600 one patch is so when new files are added (and not changed) they will be added to classes. one (asterisk-mohunload2.diff.txt) adds the reload functionality and the other force a correct reload ( M11575.diff ), since if you add a file in your directory and you dont change it your musiconhold.conf, that new file will not be added. So they are both for 2 differents purposes. And M11575_newline.diff is really trivial, just add a \n as pointed from the reporter. sunder: have you been able to test these patches? i will test those during the week-end. By: Clod Patry (junky) 2008-01-04 19:53:28.000-0600 Tested james's unloading with success. unload doesnt happen when there's active MOH, otherwise, there no proble, And if res_musiconhold.so isnt loaded, im getting: [Jan 4 20:51:03] WARNING[22522]: pbx.c:2642 pbx_extension_helper: No application 'StartMusicOnHold' for extension (default, 107, 1) == Spawn extension (default, 107, 1) exited non-zero on 'SIP/10-081e55c0' which is great. here's the tests i've made for my patch: rabbit*CLI> moh show files Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine4 File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine5 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 File: /var/lib/asterisk/moh/fpm-world-mix rabbit*CLI> !cp /var/lib/asterisk/moh/fpm-sunshine.wav /var/lib/asterisk/moh/fpm-sunshine6.wav rabbit*CLI> moh show files Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine4 File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine5 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 File: /var/lib/asterisk/moh/fpm-world-mix rabbit*CLI> moh reload == Parsing '/etc/asterisk/musiconhold.conf': == Found [Jan 4 20:45:38] WARNING[22522]: res_musiconhold.c:937 moh_register: Music on Hold class 'default' already exists [Jan 4 20:45:38] WARNING[22522]: res_musiconhold.c:937 moh_register: Music on Hold class 'babysue' already exists [Jan 4 20:45:38] WARNING[22522]: res_musiconhold.c:937 moh_register: Music on Hold class 'babysue' already exists rabbit*CLI> moh show files Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine4 File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine5 File: /var/lib/asterisk/moh/fpm-sunshine6 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 rabbit*CFile: /var/lib/asterisk/moh/fpm-world-mix rabbit*CLI> exit so fpm-sunshine6.wav is dynamicly added to moh class. rabbit*CLI> moh show files Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine4 File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine5 File: /var/lib/asterisk/moh/fpm-sunshine6 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 File: /var/lib/asterisk/moh/fpm-world-mix [Jan 4 20:47:18] NOTICE[22522]: chan_unistim.c:3588 parsing: 192.168.1.50 Warning : received a retransmitted packet : #0x0000 (we are at #0x0001) -- Device 'junky' successfuly registered rabbit*CLI> !rm -f /var/lib/asterisk/moh/fpm-sunshine4.wav rabbit*CLI> moh reload == Parsing '/etc/asterisk/musiconhold.conf': == Found [Jan 4 20:47:33] WARNING[22522]: res_musiconhold.c:937 moh_register: Music on Hold class 'default' already exists [Jan 4 20:47:33] WARNING[22522]: res_musiconhold.c:937 moh_register: Music on Hold class 'babysue' already exists [Jan 4 20:47:33] WARNING[22522]: res_musiconhold.c:937 moh_register: Music on Hold class 'babysue' already exists rabbit*CLI> moh show files Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine5 File: /var/lib/asterisk/moh/fpm-sunshine6 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 File: /var/lib/asterisk/moh/fpm-world-mix rabbit*CLI> Si fpm-sunshine4.wav is dynamicly removed from the class. so when new files are present, we make sure they are added/removed on "moh reload". I also delete the moh_diff() since this was only checking if the dir was the same and now this is checking if new files are added by that specific dir. _rev2.diff contains james' patch+my patch. By: Tilghman Lesher (tilghman) 2008-01-04 22:54:20.000-0600 junky: this patch does not apply to 1.4 cleanly. By: Clod Patry (junky) 2008-01-05 09:40:23.000-0600 yes, this was for trunk. Code is different from trunk to 1.4, so here's the new patch for 1.4 (M11575_14_rev2.diff) Also, this is my tests for records: rabbit*CLI> moh reload == Parsing '/etc/asterisk/musiconhold.conf': Found [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky2 or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky3 or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky4 or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky5 or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/djpicasso or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/teamo or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/teamo2 or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/sk8ter22 or dir does not exist [Jan 5 10:35:47] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/vero or dir does not exist rabbit*CLI> moh show files Class: conf50 File: /var/lib/asterisk/moh/50/2 File: /var/lib/asterisk/moh/50/3 Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine6 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 File: /var/lib/asterisk/moh/fpm-world-mix rabbit*CLI> !cp /var/lib/asterisk/moh/50/2.wav /var/lib/asterisk/moh/50/21.wav rabbit*CLI> moh reload == Parsing '/etc/asterisk/musiconhold.conf': Found [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky2 or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky3 or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky4 or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky5 or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/djpicasso or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/teamo or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/teamo2 or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/sk8ter22 or dir does not exist [Jan 5 10:36:05] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/vero or dir does not exist rabbit*CLI> moh show files Class: conf50 File: /var/lib/asterisk/moh/50/2 File: /var/lib/asterisk/moh/50/21 File: /var/lib/asterisk/moh/50/3 Class: default File: /var/lib/asterisk/moh/fpm-sunshine File: /var/lib/asterisk/moh/fpm-sunshine2 File: /var/lib/asterisk/moh/fpm-sunshine6 File: /var/lib/asterisk/moh/fpm-calm-river File: /var/lib/asterisk/moh/fpm-sunshine3 File: /var/lib/asterisk/moh/fpm-world-mix rabbit*CLI> the idea here was to tests if not found dirs and no files in a in dir was sucessfully not added to moh show classes. and james's stuff: rabbit*CLI> module unload res_musiconhold.so == Destroying musiconhold processes == Unregistered application 'MusicOnHold' == Unregistered application 'WaitMusicOnHold' == Unregistered application 'SetMusicOnHold' == Unregistered application 'StartMusicOnHold' == Unregistered application 'StopMusicOnHold' rabbit*CLI> module load res_musiconhold.so == Registered application 'MusicOnHold' == Registered application 'WaitMusicOnHold' == Registered application 'SetMusicOnHold' == Registered application 'StartMusicOnHold' == Registered application 'StopMusicOnHold' == Parsing '/etc/asterisk/musiconhold.conf': Found [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky2 or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky3 or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky4 or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/junky5 or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/djpicasso or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/teamo or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/teamo2 or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/sk8ter22 or dir does not exist [Jan 5 10:38:30] WARNING[23636]: res_musiconhold.c:804 moh_scan_files: Cannot open dir /var/lib/asterisk/moh/vero or dir does not exist Loaded res_musiconhold.so => (Music On Hold Resource) rabbit*CLI> -- Executing [108@default:1] StartMusicOnHold("SIP/10-081f8be8", "babysue") in new stack [Jan 5 10:38:52] WARNING[23673]: res_musiconhold.c:651 get_mohbyname: Music on Hold class 'babysue' not found -- Started music on hold, class 'default', on SIP/10-081f8be8 -- Executing [108@default:2] Wait("SIP/10-081f8be8", "22222") in new stack rabbit*CLI> module unload res_musiconhold.so Unable to unload resource res_musiconhold.so [Jan 5 10:38:55] WARNING[23636]: res_musiconhold.c:1328 unload_module: Unable to unload res_musiconhold due to active MOH channels [Jan 5 10:38:55] WARNING[23636]: loader.c:495 ast_unload_resource: Firm unload failed for res_musiconhold.so rabbit*CLI> So everything seems okay to me. sunder: could you test that one with me? By: Caio Begotti (caio1982) 2008-01-05 10:02:38.000-0600 Tested M11575_14_rev2.diff here and at least on 1.4 it works beatifully. The same for M11575_rev2.dif on trunk revision 96621 :-) By: Clod Patry (junky) 2008-01-05 10:33:54.000-0600 Since no warning are triggers when a dir is empty (bug?) i removed that code and implement it somewhere else as suggestion of caio1982 on IRC. By: Caio Begotti (caio1982) 2008-01-05 10:39:03.000-0600 M11575_14_rev3.diff works like a charm and the fix for the verbose is really useful, thanks JunK-Y! By: jmls (jmls) 2008-02-17 12:46:21.000-0600 if this all works, can we merge the patch and close ? By: James Golovich (jamesgolovich) 2008-02-17 13:18:38.000-0600 I plan on testing this one later today. There are some whitespace issues with the latest patch that need to be resolved, trivial though. By: James Golovich (jamesgolovich) 2008-02-17 23:26:20.000-0600 Everything tested out good tonight with this patch. I've uploaded a new patch that is identical to junky's except it has the whitespace fixes and is updated to trunk. By: Jason Parker (jparker) 2008-02-18 12:17:12.000-0600 If it works, commit at well. I do see a very minor "issue" with the latest patch though. if (!mohclass->delete) mohclass->delete = 0; That second part isn't necessary. By: Clod Patry (junky) 2008-02-18 12:39:16.000-0600 I've noticed few little bugs with that. Let me verify all this tonight before commit. By: Tilghman Lesher (tilghman) 2008-03-12 15:42:39 Is there anything holding up the commit of this patch? By: Nick Barnes (bcnit) 2008-04-23 10:05:23 How is this progressing? I'm having exactly the same problem with 1.6.0beta8. By: Digium Subversion (svnbot) 2008-04-23 13:23:39 Repository: asterisk Revision: 114594 U branches/1.4/res/res_musiconhold.c ------------------------------------------------------------------------ r114594 | qwell | 2008-04-23 13:23:32 -0500 (Wed, 23 Apr 2008) | 8 lines Fix reload/unload for res_musiconhold module. (closes issue ASTERISK-11060) Reported by: sunder Patches: M11575_14_rev3.diff uploaded by junky (license 177) bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176) ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114594 By: Digium Subversion (svnbot) 2008-04-23 13:28:18 Repository: asterisk Revision: 114595 _U trunk/ U trunk/res/res_musiconhold.c ------------------------------------------------------------------------ r114595 | qwell | 2008-04-23 13:28:17 -0500 (Wed, 23 Apr 2008) | 16 lines Merged revisions 114594 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114594 | qwell | 2008-04-23 13:28:44 -0500 (Wed, 23 Apr 2008) | 8 lines Fix reload/unload for res_musiconhold module. (closes issue ASTERISK-11060) Reported by: sunder Patches: M11575_14_rev3.diff uploaded by junky (license 177) bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176) ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114595 By: Digium Subversion (svnbot) 2008-04-23 13:29:29 Repository: asterisk Revision: 114596 _U branches/1.6.0/ U branches/1.6.0/res/res_musiconhold.c ------------------------------------------------------------------------ r114596 | qwell | 2008-04-23 13:29:29 -0500 (Wed, 23 Apr 2008) | 24 lines Merged revisions 114595 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r114595 | qwell | 2008-04-23 13:33:28 -0500 (Wed, 23 Apr 2008) | 16 lines Merged revisions 114594 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114594 | qwell | 2008-04-23 13:28:44 -0500 (Wed, 23 Apr 2008) | 8 lines Fix reload/unload for res_musiconhold module. (closes issue ASTERISK-11060) Reported by: sunder Patches: M11575_14_rev3.diff uploaded by junky (license 177) bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176) ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114596 By: Digium Subversion (svnbot) 2008-04-25 07:11:53 Repository: asterisk Revision: 114643 _U team/seanbright/resolve-shadow-warnings/ U team/seanbright/resolve-shadow-warnings/apps/app_alarmreceiver.c U team/seanbright/resolve-shadow-warnings/apps/app_chanspy.c U team/seanbright/resolve-shadow-warnings/apps/app_dial.c U team/seanbright/resolve-shadow-warnings/apps/app_disa.c U team/seanbright/resolve-shadow-warnings/apps/app_externalivr.c U team/seanbright/resolve-shadow-warnings/apps/app_followme.c U team/seanbright/resolve-shadow-warnings/apps/app_meetme.c U team/seanbright/resolve-shadow-warnings/apps/app_queue.c U team/seanbright/resolve-shadow-warnings/channels/chan_alsa.c U team/seanbright/resolve-shadow-warnings/channels/chan_gtalk.c U team/seanbright/resolve-shadow-warnings/channels/chan_h323.c U team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c U team/seanbright/resolve-shadow-warnings/channels/chan_jingle.c U team/seanbright/resolve-shadow-warnings/channels/chan_local.c U team/seanbright/resolve-shadow-warnings/channels/chan_mgcp.c U team/seanbright/resolve-shadow-warnings/channels/chan_misdn.c U team/seanbright/resolve-shadow-warnings/channels/chan_oss.c U team/seanbright/resolve-shadow-warnings/channels/chan_sip.c U team/seanbright/resolve-shadow-warnings/channels/chan_skinny.c U team/seanbright/resolve-shadow-warnings/channels/chan_unistim.c U team/seanbright/resolve-shadow-warnings/channels/chan_zap.c U team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h U team/seanbright/resolve-shadow-warnings/include/asterisk/manager.h U team/seanbright/resolve-shadow-warnings/main/channel.c U team/seanbright/resolve-shadow-warnings/main/http.c U team/seanbright/resolve-shadow-warnings/main/manager.c U team/seanbright/resolve-shadow-warnings/res/res_musiconhold.c ------------------------------------------------------------------------ r114643 | seanbright | 2008-04-25 07:11:47 -0500 (Fri, 25 Apr 2008) | 263 lines Merged revisions 114585,114588,114592,114595,114598,114601,114604,114606,114609,114612,114617,114622,114625,114629,114633,114635,114637 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r114585 | oej | 2008-04-23 12:53:34 -0400 (Wed, 23 Apr 2008) | 10 lines Merged revisions 114584 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114584 | oej | 2008-04-23 18:51:41 +0200 (Ons, 23 Apr 2008) | 2 lines Add 502 support for both directions, not only one... (see r114571) ........ ................ r114588 | russell | 2008-04-23 13:18:29 -0400 (Wed, 23 Apr 2008) | 10 lines Merged revisions 114587 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114587 | russell | 2008-04-23 12:16:32 -0500 (Wed, 23 Apr 2008) | 2 lines Fix find_callno_locked() to actually return the callno locked in some more cases. ........ ................ r114592 | russell | 2008-04-23 14:01:00 -0400 (Wed, 23 Apr 2008) | 13 lines Merged revisions 114591 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114591 | russell | 2008-04-23 12:55:31 -0500 (Wed, 23 Apr 2008) | 5 lines Store the manager session ID explicitly as 4 byte ID instead of a ulong. The mansession_id cookie is coded to be limited to 8 characters of hex, and this could break logins from 64-bit machines in some cases. (inspired by AST-20) ........ ................ r114595 | qwell | 2008-04-23 14:33:28 -0400 (Wed, 23 Apr 2008) | 16 lines Merged revisions 114594 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114594 | qwell | 2008-04-23 13:28:44 -0500 (Wed, 23 Apr 2008) | 8 lines Fix reload/unload for res_musiconhold module. (closes issue ASTERISK-11060) Reported by: sunder Patches: M11575_14_rev3.diff uploaded by junky (license 177) bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176) ........ ................ r114598 | russell | 2008-04-23 16:53:05 -0400 (Wed, 23 Apr 2008) | 18 lines Merged revisions 114597 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114597 | russell | 2008-04-23 15:49:18 -0500 (Wed, 23 Apr 2008) | 10 lines Fix an issue that caused getting the correct next channel to not always work. Also, remove setting the amount of time to wait for a digit from 5 seconds back down to 1/10 of a second. I believe this was so the beep didn't get played over and over really fast, but a while back I put in another fix for that issue. (closes issue ASTERISK-11895) Reported by: jsmith Patches: app_chanspy_channel_walk.trunk.patch uploaded by jsmith (license 15) ........ ................ r114601 | russell | 2008-04-23 18:53:20 -0400 (Wed, 23 Apr 2008) | 14 lines Merged revisions 114600 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114600 | russell | 2008-04-23 17:18:12 -0500 (Wed, 23 Apr 2008) | 6 lines Improve some broken cookie parsing code. Previously, manager login over HTTP would only work if the mansession_id cookie was first. Now, the code builds a list of all of the cookies in the Cookie header. This fixes a problem observed by users of the Asterisk GUI. (closes AST-20) ........ ................ r114604 | russell | 2008-04-24 10:55:21 -0400 (Thu, 24 Apr 2008) | 3 lines Change a verbose message to debug. (closes issue ASTERISK-11911) ................ r114606 | oej | 2008-04-24 10:59:05 -0400 (Thu, 24 Apr 2008) | 11 lines Merged revisions 114603 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114603 | oej | 2008-04-24 16:55:18 +0200 (Tor, 24 Apr 2008) | 3 lines Only have one max-forwards header in outbound REFERs. Discovered in the Asterisk SIP Masterclass in Orlando. Thanks Joe! ........ ................ r114609 | russell | 2008-04-24 11:56:55 -0400 (Thu, 24 Apr 2008) | 12 lines Merged revisions 114608 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114608 | russell | 2008-04-24 10:55:21 -0500 (Thu, 24 Apr 2008) | 4 lines Fix a silly mistake in a change I made yesterday that caused chan_iax2 to blow up very quickly. (issue ASTERISK-11912) ........ ................ r114612 | qwell | 2008-04-24 12:47:01 -0400 (Thu, 24 Apr 2008) | 17 lines Merged revisions 51989 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue ASTERISK-11893) Reported by: daniele Patches: misdn-moh-1.6.0-beta7.1.patch uploaded by daniele (license 471) Tested by: daniele Technically, I didn't use the patch above except to find out what revision to merge - but it's the same thing as this revision. ........ r51989 | crichter | 2007-01-24 06:57:22 -0600 (Wed, 24 Jan 2007) | 1 line added fix from ASTERISK-8652 ........ ................ r114617 | tilghman | 2008-04-24 15:24:31 -0400 (Thu, 24 Apr 2008) | 6 lines Fix DST calculation, and fix bug in calculation of whether conf has started yet or not (Closes issue ASTERISK-11715) Reported by: DEA Patches: app_meetme-rt-dst-sched-fix.txt uploaded by DEA (license 3) ................ r114622 | tilghman | 2008-04-24 15:54:57 -0400 (Thu, 24 Apr 2008) | 12 lines Merged revisions 114621 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114621 | tilghman | 2008-04-24 14:53:36 -0500 (Thu, 24 Apr 2008) | 4 lines Ensure that when we set the accountcode, it actually shows up in the CDR. (Fix for AMI Originate) (Closes issue ASTERISK-11451) ........ ................ r114625 | mmichelson | 2008-04-24 16:06:06 -0400 (Thu, 24 Apr 2008) | 18 lines Merged revisions 114624 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114624 | mmichelson | 2008-04-24 15:04:24 -0500 (Thu, 24 Apr 2008) | 10 lines Resolve a deadlock in chan_local by releasing the channel lock temporarily. (closes issue ASTERISK-11181) Reported by: callguy Patches: 11712.patch uploaded by putnopvut (license 60) Tested by: acunningham ........ ................ r114629 | mmichelson | 2008-04-24 16:43:52 -0400 (Thu, 24 Apr 2008) | 16 lines Merged revisions 114628 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114628 | mmichelson | 2008-04-24 15:43:03 -0500 (Thu, 24 Apr 2008) | 8 lines Output of channel variables when eventwhencalled=vars was set was being truncated two characters. This patch corrects the problem. (closes issue ASTERISK-11891) Reported by: davidw ........ ................ r114633 | mmichelson | 2008-04-24 17:35:39 -0400 (Thu, 24 Apr 2008) | 19 lines Merged revisions 114632 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114632 | mmichelson | 2008-04-24 16:35:08 -0500 (Thu, 24 Apr 2008) | 11 lines Re-invite RTP during a masquerade so that, for instance, an AMI redirect of two channels which are natively bridged will preserve audio on both channels. This prevents a problem with Asterisk not re-inviting due to one of the channels having being a zombie. (closes issue ASTERISK-11910) Reported by: mneuhauser Patches: asterisk-1.4-114602_restore-RTP-on-fixup.patch uploaded by mneuhauser (license 425) ........ ................ r114635 | file | 2008-04-24 18:11:46 -0400 (Thu, 24 Apr 2008) | 4 lines Hey look, it builds. (closes issue ASTERISK-11916) Reported by: falves11 ................ r114637 | mvanbaak | 2008-04-24 18:16:48 -0400 (Thu, 24 Apr 2008) | 8 lines Pass the hangup cause all the way to the calling app/channel. (closes issue ASTERISK-10842) Reported by: rain Patches: 20071207__pass_cause_in_hangup_control_frame.diff.txt uploaded by Corydon76 (license 14) brought up-to-date to trunk by me ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114643 | ||