aboutsummaryrefslogtreecommitdiffstats
path: root/channels
AgeCommit message (Collapse)AuthorFilesLines
2007-09-11Merged revisions 82249 via svnmerge from crichter2-5/+7
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r82249 | crichter | 2007-09-11 18:01:27 +0200 (Di, 11 Sep 2007) | 1 line fixed a hold/retrieve issue. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82254 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-10Change the IAXPeers command to have manager-style output, instead of ↵tilghman1-18/+22
CLI-style output (closes issue #8254) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82200 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-10(closes issue #10688)file1-6/+7
Reported by: casper Patches: chan_sip.c.82076.diff uploaded by casper (license 55) Remove double check for zombie flag and optimize things a bit. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@82077 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06fix the build ... oopsrussell1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81849 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06Merged revisions 81832 via svnmerge from russell1-1/+10
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81832 | russell | 2007-09-06 17:28:57 -0500 (Thu, 06 Sep 2007) | 16 lines (closes issue #9724, closes issue #10374) Reported by: kenw Patches: 9724.txt uploaded by russell (license 2) Tested by: kenw, russell Resolve a deadlock that occurs when doing a SIP transfer to parking. I come across this type of deadlock fairly often it seems. It is very important to mind the boundary between the channel driver and the core in respect to the channel lock and the channel-pvt lock. Channel drivers lock to lock the pvt and then the channel once it calls into the core, while the core will do it in the opposite order. The way this is avoided is by having channel drivers either release their pvt lock while calling into the core, or such as in this case, unlocking the pvt just long enough to acquire the channel lock. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81839 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06Initialize iax_frames variable to NULL, keeps valgrind happy.file1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81814 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06(closes issue #10377)file1-31/+235
Reported by: mvanbaak Patches: chan_skinny_info.diff uploaded by mvanbaak (license 7) Add skinny show device, skinny show line, and skinny show settings CLI commands. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81782 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06Merged revisions 81743 via svnmerge from phsultan1-6/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81743 | phsultan | 2007-09-06 18:56:29 +0200 (Thu, 06 Sep 2007) | 1 line Various string length fixes. Removed an unused variable in aji_client structure (context) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81745 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-06Patch on 10575. Add support for unequipped CIC (UCIC) message as well as ↵mattf1-0/+18
improve some of our CIC flags in chan_zap git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81742 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-05Doxygen cleanups/fixes.qwell1-5/+6
Closes issue #10654, patch by snuffy git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81560 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-05Merged revisions 81523 via svnmerge from qwell1-5/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #10651) ........ r81523 | qwell | 2007-09-05 10:14:30 -0500 (Wed, 05 Sep 2007) | 5 lines Do not try to unregister a NULL channel tech. Also changed load_module function to use defines rather than numbers for return values. Issue 10651, patch by rbraun_proformatique, with additions by me. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81524 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-04Merged revisions 81448 via svnmerge from russell1-12/+12
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81448 | russell | 2007-09-04 13:37:44 -0500 (Tue, 04 Sep 2007) | 4 lines Remove the typedefs on ao2_container and ao2_iterator. This is simply because we don't typedef objects anywhere else in Asterisk, so we might as well make this follow the same convention. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81449 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-04Merged revisions 81442 via svnmerge from kpfleming1-4/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81442 | kpfleming | 2007-09-04 11:40:39 -0500 (Tue, 04 Sep 2007) | 2 lines there is no point in sending 401 Unauthorized to a UAS that sent us a properly-formatted Authentication header with the expected username and nonce but an incorrect response (which indicates the shared secret does not match)... instead, let's send 403 Forbidden so that the UAS doesn't retry with the same authentication credentials repeatedly ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81443 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-04Merged revisions 81439 via svnmerge from file1-15/+18
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81439 | file | 2007-09-04 11:23:18 -0300 (Tue, 04 Sep 2007) | 6 lines (closes issue #10632) Reported by: jamesgolovich Patches: asterisk-iaxfirmwareleak.diff.txt uploaded by jamesgolovich (license 176) Fix memory leak when unloading chan_iax2. The firmware files were not being freed. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81440 f38db490-d61c-443f-a65b-d21fe96a405b
2007-09-03Merged revisions 81433 via svnmerge from russell1-6/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81433 | russell | 2007-09-03 13:57:53 -0500 (Mon, 03 Sep 2007) | 5 lines Remove a couple of calls to ast_string_field_free_pools() on peers in error handling blocks in the code for building peers. The peer object destructor does this and doing it twice will cause a crash. (closes issue #10625, reported by and patched by pnlarsson) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81434 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-31Merged revisions 81410 via svnmerge from phsultan1-2/+43
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81410 | phsultan | 2007-08-31 19:38:26 +0200 (Fri, 31 Aug 2007) | 3 lines Make the 'gtalk show channels' CLI command available. Closes issue 10548, reported by keepitcool. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81411 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-30Add new queryable fields from zaptel to 'zap show status'tilghman1-2/+38
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81400 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-30Merged revisions 81395 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81395 | file | 2007-08-30 18:23:50 -0300 (Thu, 30 Aug 2007) | 6 lines (closes issue #10514) Reported by: casper Patches: chan_sip.c.80129.diff uploaded by casper (license 55) Remove needless check for AUTH_UNKNOWN_DOMAIN. It was impossible for it to ever be that value. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81396 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-30(closes issue #10565)file1-0/+1
Reported by: tootai Make sure the external IP address has the standard SIP port set for when the user does not specify the port in the externip setting. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81394 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-30Merged revisions 81383 via svnmerge from russell1-0/+8
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81383 | russell | 2007-08-30 10:38:29 -0500 (Thu, 30 Aug 2007) | 3 lines Add missing checks for the PTRACING define. (closes issue #10559, paravoid) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81384 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-30Merged revisions 81373 via svnmerge from crichter1-5/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81373 | crichter | 2007-08-30 16:43:33 +0200 (Do, 30 Aug 2007) | 1 line Fixed some warnings. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81376 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-30Merged revisions 81367 via svnmerge from crichter2-17/+39
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81367 | crichter | 2007-08-30 10:31:59 +0200 (Do, 30 Aug 2007) | 11 lines Fixed a severe issue where a misdn_read would lock the channel, but read would not return because it blocks. later chan_misdn would try to queue a frame like a AST_CONTROL_ANSWER which could result in a deadlock situation. misdn_read will now not block forever anymore, and we don't queue the ANSWER frame at all when we already was called with misdn_answer -> answer would be called twice. Also we don't explicitly send a RELEASE_COMPLETE on receiption of a RELEASE anymore, because mISDN does that for us, this resulted in a problem on some switches, which would block our port after some calls for a short while. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81368 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-29This code was in team/murf/bug8684-trunk; it should fix bug 8684 in trunk. I ↵murf4-7/+7
didn't add it to 1.4 yet, because it's not entirely clear to me if this is a bug fix or an enhancement. A lot of files were affected by small changes like ast_variable_new getting an added arg, for the file name the var was defined in; ast_category_new gets added args of filename and lineno; ast_category and ast_variable structures now record file and lineno for each entry; a list of all #include and #execs in a config file (or any of its inclusions are now kept in the ast_config struct; at save time, each entry is put back into its proper file of origin, in order. #include and #exec directives are folded in properly. Headers indicating that the file was generated, are generated also for each included file. Some changes to main/manager.c to take care of file renaming, via the UpdateConfig command. Multiple inclusions of the same file are handled by exploding these into multiple include files, uniquely named. There's probably more, but I can't remember it right now. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81361 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-29Changed one too many variable settings in issue #9315 (closes issue #10592)tilghman1-24/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81335 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-29Merged revisions 81331 via svnmerge from file1-7/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81331 | file | 2007-08-29 11:13:55 -0300 (Wed, 29 Aug 2007) | 4 lines (closes issue #9690) Reported by: mattv Make rtp timeouts work even if two RTP streams are directly bridged in the RTP stack. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81332 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-28Merged revisions 81291 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81291 | russell | 2007-08-28 16:38:26 -0500 (Tue, 28 Aug 2007) | 3 lines Change the message about receiving a mini-frame before the first full voice frame to a DEBUG message. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81292 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-27Merged revisions 81120 via svnmerge from mmichelson1-0/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81120 | mmichelson | 2007-08-27 16:08:48 -0500 (Mon, 27 Aug 2007) | 7 lines DTMF begin frames should be ignored so that when an agent acks a call with the '#' key, he doesn't cause a queue's announce file to be interrupted. Also went ahead and did the same for the '*' key and for ending a call. (closes issue #10528, reported by deskhack, patched by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81121 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-27Merged revisions 81012 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r81012 | file | 2007-08-27 12:01:59 -0300 (Mon, 27 Aug 2007) | 6 lines (closes issue #10561) Reported by: jesselang Patches: chan_sip-ChannelReload-20080825.patch uploaded by jesselang (license 202) Remove an extra \r\n to make the ChannelReload event conform with every other event. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@81013 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-27Remove places that say if no language is specified it will default to ↵file1-3/+3
english... since on some setups this is untrue. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80991 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-26Merged revisions 80932 via svnmerge from russell1-1/+0
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80932 | russell | 2007-08-26 13:11:26 -0500 (Sun, 26 Aug 2007) | 3 lines Remove an extra signal_condition() for the scheduler thread. (closes issue #10564, patch from casper) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80933 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-25Merged revisions 80895 via svnmerge from russell1-28/+45
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80895 | russell | 2007-08-25 12:37:39 -0500 (Sat, 25 Aug 2007) | 7 lines Fix some issues with the handling of the scheduler in chan_iax2. Most of the places that scheduled items to be executed by the scheduler thread did not signal the scheduler thread to wake up so that it could recalculate the time until the next action. These changes will make the scheduler thread more responsive and ensure that actions get executed as close to when intended as possible instead of it being possible for very long delays. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80898 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-24Merged revisions 80849 via svnmerge from russell1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80849 | russell | 2007-08-24 16:22:50 -0500 (Fri, 24 Aug 2007) | 5 lines If dnsmgr is in use, and no DNS servers are available when Asterisk first starts, then don't give up on poking peers. Allow the poke to get rescheduled so that it will work once the dnsmgr is able to resolve the host. (closes issue #10521, patch by jamesgolovich) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80850 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-24Add VMWI chan_zap support #9909mattf1-0/+5
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80778 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-24Merged revisions 80661 via svnmerge from phsultan1-1/+27
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80661 | phsultan | 2007-08-24 13:42:46 +0200 (Fri, 24 Aug 2007) | 9 lines Closes issue #10509 Googletalk calls are answered too early, which results in CDRs wrongly stating that a call was ANSWERED when the calling party cancelled a call before before being established. We must not answer the call upon reception of a 'transport-accept' iq packet, but this packet still needs to be acknowledged, otherwise the remote peer would close the call (like in #8970). ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80662 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-23Merged revisions 80501 via svnmerge from kpfleming1-2/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80501 | kpfleming | 2007-08-23 12:08:25 -0500 (Thu, 23 Aug 2007) | 2 lines report the actual channel number that was unregistered, instead of assuming that the interface list consists of channels 1 through <x> with no gaps in the sequence ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80508 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-23Merged revisions 80499 via svnmerge from russell1-3/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80499 | russell | 2007-08-23 12:02:50 -0500 (Thu, 23 Aug 2007) | 3 lines Fix some code where it was possible for a reference to a peer to not get released when it should. Thank you to Marta Carbone for pointing this out! ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80500 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-23If no default language has been specified print out that it will default to ↵file1-2/+2
english when using sip show peer or sip show user. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80468 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22allow peers and users to go into a hash tablerussell1-4/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80408 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22Merged revisions 80390 via svnmerge from russell1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80390 | russell | 2007-08-22 16:00:44 -0500 (Wed, 22 Aug 2007) | 3 lines Don't crash when using realtime in chan_sip without an insecure setting in the database. (closes issue #10348, reported by link55, fixed by me) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80391 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22Unsubscribe from MWI events in the peer destructorrussell1-0/+3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80388 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-22Merged revisions 80362 via svnmerge from russell1-358/+429
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80362 | russell | 2007-08-22 15:21:36 -0500 (Wed, 22 Aug 2007) | 34 lines Merge changes from team/russell/iax_refcount. This set of changes fixes problems with the handling of iax2_user and iax2_peer objects. It was very possible for a thread to still hold a reference to one of these objects while a reload operation tries to delete them. The fix here is to ensure that all references to these objects are tracked so that they can't go away while still in use. To accomplish this, I used the astobj2 reference counted object model. This code has been in one of Luigi Rizzo's branches for a long time and was primarily developed by one of his students, Marta Carbone. I wanted to go ahead and bring this in to 1.4 because there are other problems similar to the ones fixed by these changes, so we might as well go ahead and use the new astobj if we're going to go through all of the work necessary to fix the problems. As a nice side benefit of these changes, peer and user handling got more efficient. Using astobj2 lets us not hold the container lock for peers or users nearly as long while iterating. Also, by changing a define at the top of chan_iax2.c, the objects will be distributed in a hash table, drastically increasing lookup speed in these containers, which will have a very big impact on systems that have a large number of users or peers. The use of the hash table will be made the default in trunk. It is not the default in 1.4 because it changes the behavior slightly. Previously, since peers and users were stored in memory in the same order they were specified in the configuration file, you could influence peer and user matching order based on the order they are specified in the configuration. The hash table does not guarantee any order in the container, so this behavior will be going away. It just means that you have to be a little more careful ensuring that peers and users are matched explicitly and not forcing chan_iax2 to have to guess which user is the right one based on secret, host, and access list settings, instead of simply using the username. If you have any questions, feel free to ask on the asterisk-dev list. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80387 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-21Merged revisions 80183 via svnmerge from russell1-3/+19
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80183 | russell | 2007-08-21 13:42:15 -0500 (Tue, 21 Aug 2007) | 7 lines Don't record SIP dialog history if it's not turned on. Also, put an upper limit on how many history entires will be stored for each SIP dialog. It is currently set to 50, but can be increased if deemed necessary. (closes issue #10421, closes issue #10418, patches suggested by jmoldenhauer, patches updated by me) (Security implications documented in AST-2007-020) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80184 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-21Merged revisions 80132 via svnmerge from russell1-10/+7
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80132 | russell | 2007-08-21 10:22:22 -0500 (Tue, 21 Aug 2007) | 3 lines Don't try to dereference the owner channel when it may not exist (issue #10507, maxper) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80133 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-20Fix random segfault issue when loading chan_zap. Trying to access a ↵file1-1/+1
configuration structure that has already been destroyed is bad, mmmk? git-svn-id: http://svn.digium.com/svn/asterisk/trunk@80023 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-20(closes issue #10495)file1-1/+1
Reported by: stevedavies Make sure context pointer is valid or else chan_iax2 will go kaboom. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79990 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-20Fix building of trunk. I'm doing work on a Sunday night just to avoid ↵file1-0/+4
watching Snakes on a Plane which my roommate is watching. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79988 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-18We weren't properly encapsulating the mtime ignores of config files (closes ↵tilghman4-61/+75
issue #10488) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79940 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-17Merged revisions 79912 via svnmerge from russell1-0/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r79912 | russell | 2007-08-17 16:01:43 -0500 (Fri, 17 Aug 2007) | 4 lines Avoid a crash in the handling of DTMF based Caller ID. It is valid for ast_read to return NULL in the case that the channel has been hung up. (crash reported by anonymouz666 on IRC in #asterisk-dev) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79913 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-17Merged revisions 79904 via svnmerge from qwell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #10430) ........ r79904 | qwell | 2007-08-17 14:12:19 -0500 (Fri, 17 Aug 2007) | 11 lines Don't send a semicolon over the wire in sip notify messages. Caused by fix for issue 9938. I basically took the code that existed before 9938 was fixed, and copied it into a new function - ast_unescape_semicolon There should be very few places this will be needed (pbx_config does NOT need this (see issue 9938 for details)) Issue 10430, patch by me, with help/ideas from murf (thanks murf). ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79905 f38db490-d61c-443f-a65b-d21fe96a405b
2007-08-17Merged revisions 79902 via svnmerge from qwell1-0/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #10485) ........ r79902 | qwell | 2007-08-17 12:44:22 -0500 (Fri, 17 Aug 2007) | 4 lines Re-add the setting of callerid name and number. Issue 10485, reported by and fix explained by paradise. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@79903 f38db490-d61c-443f-a65b-d21fe96a405b