Commit graph

13022 commits

Author SHA1 Message Date
Russell Bryant
84643967e1 Merged revisions 80469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80469 | russell | 2007-08-23 10:49:28 -0500 (Thu, 23 Aug 2007) | 2 lines

Revert res_agi fix that didn't quite work until we get it right ...

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-23 15:52:08 +00:00
Joshua Colp
ed9306ba42 If no default language has been specified print out that it will default to english when using sip show peer or sip show user.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-23 15:48:35 +00:00
Joshua Colp
c755851bc8 Return trunk to a working state by including compat.h in minimime.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-23 13:37:20 +00:00
Jason Parker
b875ca68e1 Convert minimime to use the proper uint*_t types, rather than u_int*_t
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 23:26:02 +00:00
Jason Parker
cf9dcaeea1 Cast calls to getpid. This was done in 1.4 already, this one was just new
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 23:17:04 +00:00
Russell Bryant
2ac281e0ed Merged revisions 80426 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80426 | russell | 2007-08-22 17:54:03 -0500 (Wed, 22 Aug 2007) | 6 lines

Add some more documentation on iterating ao2 containers.  The documentation
implies that is possible to miss an object or see an object twice while
iterating.  After looking through the code and talking with mmichelson, I have
documented the exact conditions under which this can happen (which are rare and
harmless in most cases).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 22:54:26 +00:00
Russell Bryant
4328c75281 Merged revisions 80424 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80424 | russell | 2007-08-22 17:40:27 -0500 (Wed, 22 Aug 2007) | 10 lines

When converting this code to use the list macros, I changed it so objects are
added to the head of a bucket instead of the tail.  However, while looking over
code with mmichelson, we noticed that the algorithm used in ao2_iterator_next
requires that items are added to the tail.  This wouldn't have caused any huge
problem, but it wasn't correct.  It meant that if an object was added to a
container while you were iterating it, and it was added to the same bucket that
the current element is in, then the new object would be returned by 
ao2_iterator_next, and any other objects in the bucket would be bypassed in
the traversal.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 22:43:12 +00:00
Russell Bryant
f6f9c14723 allow peers and users to go into a hash table
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 21:35:08 +00:00
Russell Bryant
eb6813cce3 Merged revisions 80390 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@80391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 21:03:27 +00:00
Russell Bryant
f04ed4641b Unsubscribe from MWI events in the peer destructor
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 20:46:16 +00:00
Russell Bryant
50d7fc81aa Merged revisions 80362 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@80387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 20:44:23 +00:00
Russell Bryant
44f70278a8 Merged revisions 80360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80360 | russell | 2007-08-22 14:53:30 -0500 (Wed, 22 Aug 2007) | 5 lines

Juggie in #asterisk-dev was reporting problems where fgets would return
without reading  the whole line when using fastagi.  When this happens,
errno was set to EINTR or EAGAIN.  This patch accounts for the possibility
and lets fgets continue in that case.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 19:54:52 +00:00
Jason Parker
30f27bd09a Merged revisions 80330 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80330 | qwell | 2007-08-22 13:53:18 -0500 (Wed, 22 Aug 2007) | 7 lines

Fix a few build issues in Solaris (and likely others).

Use GREP and ID variables from autoconf.

Reported to me in #asterisk-dev
I forgot who reported this - sorry. :(

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80331 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 18:54:30 +00:00
Jason Parker
553e5254e4 Merged revisions 80304 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80304 | qwell | 2007-08-22 13:25:34 -0500 (Wed, 22 Aug 2007) | 2 lines

Change a syntax that the GNU make in Solaris dislikes.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 18:25:58 +00:00
Jason Parker
54daf3288c Merged revisions 80302 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80302 | qwell | 2007-08-22 13:06:00 -0500 (Wed, 22 Aug 2007) | 3 lines

Fix a bashism (we explicitly request /bin/sh).
Remove some oddly placed quotes I found in passing.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 18:06:28 +00:00
Russell Bryant
483c2bad07 Ensure that the object code for ast_atomic_fetchadd_int() gets included in the
check_expr binary when building with LOW_MEMORY defined.
(reported by Brian Capouch on the asterisk-dev list, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 16:27:39 +00:00
Russell Bryant
e97027d4b0 Merged revisions 80257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80257 | russell | 2007-08-22 11:21:58 -0500 (Wed, 22 Aug 2007) | 4 lines

Honor the contents of the COPTS variable as custom target CFLAGS.  Apparently
this is what openwrt does.  
(reported by Brian Capouch on the asterisk-dev list, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 16:22:27 +00:00
Joshua Colp
91d9c110af Merged revisions 80255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80255 | file | 2007-08-22 13:14:38 -0300 (Wed, 22 Aug 2007) | 4 lines

(closes issue #10526)
Reported by: sinistermidget
Revert commit from issue #10355 and return timestamp skew to 640. 

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 16:16:01 +00:00
Steve Murphy
8119afa249 blocking 80167
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 14:17:42 +00:00
Steve Murphy
6f9f77e0ca Merged revisions 80166 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80166 | murf | 2007-08-21 10:36:34 -0600 (Tue, 21 Aug 2007) | 1 line

This patch solves problem 1 in 8126; it should not slow down the alaw codec, but should prevent signal degradation via multiple trips thru the codec. Fossil estimates the twice thru this codec will prevent fax from working. 4-6 times thru would result hearable, noticeable, voice degradation.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-22 14:12:24 +00:00
Russell Bryant
5eb7cbef42 use ast_atomic_fetchadd_int for incrementing resultcount
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 21:58:29 +00:00
Steve Murphy
35ade91df6 As per 10472, mvanbaak thought the generated code would look better this way.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 20:55:44 +00:00
Russell Bryant
8a2dd1d145 Merged revisions 80183 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@80184 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 18:49:23 +00:00
Joshua Colp
937d83f7e4 Minor tweak. Don't manipulate volume of the audio in the buffer if no audio is actually there.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 15:51:49 +00:00
Russell Bryant
eaac379751 Merged revisions 80132 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@80133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 15:23:12 +00:00
Jason Parker
31c82ec1e0 Merged revisions 80130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80130 | qwell | 2007-08-21 10:03:45 -0500 (Tue, 21 Aug 2007) | 7 lines

(closes issue #10510)
Reported by: casper
Patches:
      cdr.conf.diff uploaded by casper (license 55)

Fix a few errors in sample cdr config file.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-21 15:04:37 +00:00
Steve Murphy
337c44236d This change set fixes bug 8126 in trunk. It is implemented via compile time options, activated via the menuselect stuff, which defaults to the old way. non-zero sample data added. Translate tables expressed in microseconds instead of milliseconds, with 5-digit data now instead of 3, giving 2 more digits of precision.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80113 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 22:53:48 +00:00
Russell Bryant
c9ab65a3bf Blocked revisions 80088 via svnmerge
........
r80088 | russell | 2007-08-20 16:57:08 -0500 (Mon, 20 Aug 2007) | 2 lines

Fix the build of app_queue

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 22:00:01 +00:00
Mark Michelson
cf5e17b025 Blocked revisions 80086 via svnmerge
........
r80086 | mmichelson | 2007-08-20 16:39:17 -0500 (Mon, 20 Aug 2007) | 5 lines

After a discussion on #asterisk-dev, it was decided that this should be in 1.4 as well.

(issue #10424, reported and patched by irroot)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 21:42:11 +00:00
Steve Murphy
b69734ae09 Stephn Davies reports that this will help make things work on 64-bit machines
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 17:37:36 +00:00
Mark Michelson
e9a50d1f15 Merged revisions 80049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80049 | mmichelson | 2007-08-20 11:17:43 -0500 (Mon, 20 Aug 2007) | 4 lines

Found a pointless ternary if. member->dynamic was set to 1 and has no opportunity to change
between then and this line, so "dynamic" will ALWAYS be output.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 16:18:55 +00:00
Jason Parker
3105a37a3d Merged revisions 80047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80047 | qwell | 2007-08-20 11:08:49 -0500 (Mon, 20 Aug 2007) | 7 lines

(closes issue #10499)
Reported by: casper
Patches:
      extensions.conf.sample.diff uploaded by casper (license 55)

Update CLI examples in extensions.conf.sample to reflect command changes.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 16:12:29 +00:00
Joshua Colp
d810320a22 Remove remnants of last commit so trunk builds again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 15:53:20 +00:00
Mark Michelson
0ef2670e8f Merged revisions 80044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r80044 | mmichelson | 2007-08-20 10:34:43 -0500 (Mon, 20 Aug 2007) | 5 lines

Ukrainian language voicemail support.

(closes issue #10458, reported and patched by Oleh)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80045 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 15:37:13 +00:00
Steve Murphy
a9f86a939e pval.c should not be in svn, in the utils dir
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80037 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 15:27:35 +00:00
Joshua Colp
4edcf623f0 Bring pval.c in utils up to date with pval.c in res/ael.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 15:10:55 +00:00
Joshua Colp
65e4c80d48 Fix random segfault issue when loading chan_zap. Trying to access a configuration structure that has already been destroyed is bad, mmmk?
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 14:15:30 +00:00
Tilghman Lesher
e18bdff54a Merged revisions 79998 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79998 | tilghman | 2007-08-19 21:42:49 -0500 (Sun, 19 Aug 2007) | 2 lines

Missing curly braces.  Oops.  (Reported by snuffy via IRC)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79999 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 02:46:02 +00:00
Joshua Colp
477e7dcbc7 (closes issue #10495)
Reported by: stevedavies
Make sure context pointer is valid or else chan_iax2 will go kaboom.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 00:54:19 +00:00
Joshua Colp
ab2c114cd7 (closes issue #10496)
Reported by: caio1982
Fix building on OSX.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 00:38:20 +00:00
Joshua Colp
9471a4ec08 Fix building of trunk. I'm doing work on a Sunday night just to avoid watching Snakes on a Plane which my roommate is watching.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 00:37:12 +00:00
Tilghman Lesher
488f6973cd Add strcompat dependency for check_expr (needed for platforms that don't have strndup)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-19 14:17:30 +00:00
Joshua Colp
5923c7fe8c Actually check the return value of epoll_create to make sure it works.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-18 23:58:51 +00:00
Tilghman Lesher
447fada0c1 Merged revisions 79947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79947 | tilghman | 2007-08-18 09:30:44 -0500 (Sat, 18 Aug 2007) | 3 lines

Don't allocate vmu for messagecount when we could just use the stack instead (closes issue #10490)
Also, remove a useless (and leaky) SQLAllocHandle (closes issue #10480)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-18 14:34:47 +00:00
Tilghman Lesher
749b67bd1d We weren't properly encapsulating the mtime ignores of config files (closes issue #10488)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-18 13:52:44 +00:00
Mark Michelson
dc7d25ea63 I broke the build. Now I'm fixing it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79915 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 21:19:18 +00:00
Russell Bryant
57d5934e5d Merged revisions 79912 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@79913 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 21:04:33 +00:00
Mark Michelson
d49ae61c36 Merged revisions 79906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79906 | mmichelson | 2007-08-17 14:14:05 -0500 (Fri, 17 Aug 2007) | 6 lines

Patch allows for more seamless transition from file storage voicemail to ODBC storage voicemail.
If a retrieval of a greeting from the database fails, but the file is found on the file system, then
we go ahead an insert the greeting into the database. The result of this is that people who
switch from file storage to ODBC storage do not need to rerecord their voicemail greetings.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 19:16:51 +00:00
Jason Parker
100e2387db Merged revisions 79904 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@79905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 19:13:25 +00:00
Jason Parker
0e83c80480 Merged revisions 79902 via svnmerge from
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: https://origsvn.digium.com/svn/asterisk/trunk@79903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 17:45:01 +00:00