Commit Graph

12935 Commits

Author SHA1 Message Date
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
Tilghman Lesher 782b662898 Documentation for %q in logger.conf, as suggested by jtodd (closes issue #10475)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 16:39:41 +00:00
Jason Parker 1f9e0ce434 Fix Dial arguments in res_features.
Closes issue #10484, patch by lunn.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 16:04:20 +00:00
Jason Parker fafa7d93e4 Correct the argument separator for a Dial statement in pbx_dundi.
Closes issue #10483, patch by lunn


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 15:27:19 +00:00
Tilghman Lesher 8b63009338 Change this flag... might not otherwise unlock in an OOM situation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79885 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 14:41:33 +00:00
Russell Bryant c67f7fd3da Make use of ast_sched_replace() in some places in chan_iax2
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79862 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 14:14:59 +00:00
Russell Bryant f5bf66bcd7 This commit adds a scheduler API call, ast_sched_replace that can be used
in place of a very common construct.  I also used it in a number of places
in chan_sip.

  if (id > -1)
     ast_sched_del(sched, id);
  id = ast_sched_add(sched, ...);

changes to:

  ast_sched_replace(id, sched, ...);


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 14:07:44 +00:00
Tilghman Lesher c78ddffb04 store and destroy implementations for sqlite (closes issue #10446) and odbc (closes issue #10447)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 13:45:44 +00:00
Tilghman Lesher 646234bd10 store and destroy implementations for realtime pgsql (closes issue #10372)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 13:40:11 +00:00
Russell Bryant 9d54c14278 Merged revisions 79857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79857 | russell | 2007-08-17 08:37:08 -0500 (Fri, 17 Aug 2007) | 5 lines

Fix some crashes in chan_sip.  This patch changes various places that add items
to the scheduler to ensure that they don't overwrite the ID of a previously
scheduled item.  If there is one, it should be removed.
(closes issue #10391, closes issue #10256, probably others, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 13:39:17 +00:00
Christian Richter 7ee8772e2d Merged revisions 79833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79833 | crichter | 2007-08-17 10:22:36 +0200 (Fr, 17 Aug 2007) | 1 line

sometimes we don't need to signal dtmf tones to asterisk, we just want them to go through as inband. Otherwise they might be generated by the other channel partner and then there is a double tone.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 08:29:56 +00:00
Joshua Colp ecff1370fb Fix building of chan_zap under development mode without libpri and libss7 installed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-17 01:19:04 +00:00
Tilghman Lesher d6eb859bc2 Revise dialplan locks to permit multiple locks per channel, but with deadlock avoidance
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 23:31:14 +00:00
Russell Bryant 782c22ccb4 Merged revisions 79792 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79792 | russell | 2007-08-16 17:32:33 -0500 (Thu, 16 Aug 2007) | 4 lines

Fix a little race condition that could cause a crash if two channels had MOH
stopped at the same time that were using a class that had been marked for
deletion when its use count hits zero.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 22:33:02 +00:00
Russell Bryant 74200abe10 Merged revisions 79778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79778 | russell | 2007-08-16 17:24:25 -0500 (Thu, 16 Aug 2007) | 14 lines

This patch fixes a bug where reloading the module with "module reload" did not
delete classes from memory that were no longer in the config.  This patch fixes
that problem as well as another one.  Previously, if you reloaded MOH using the
"moh reload" CLI command, which behaved differently than "module reload ...",
MOH had to be stopped on every channel and started again immediately.  However,
there was no way to tell what class was being used, so they would all fall back
to the default class.

(closes issue #10139)
Reported by: blitzrage
Patches: 
      asterisk-10139-advanced.diff.txt uploaded by jamesgolovich (license 176)
Tested by: jamesgolovich

........


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

........
r79756 | russell | 2007-08-16 16:29:24 -0500 (Thu, 16 Aug 2007) | 11 lines

Fix more deadlocks in chan_iax2 that were introduced by making frame handling
and scheduling multi-threaded.  Unfortunately, we have to do some expensive
deadlock avoidance when queueing frames on to the ast_channel owner of the IAX2
pvt struct.  This was already handled for regular frames, but ast_queue_hangup
and ast_queue_control were still used directly.  Making these changes introduced
even more places where the IAX2 pvt struct can disappear in the context of a
function holding its lock due to calling a function that has to unlock/lock it
to avoid deadlocks.  I went through and fixed all of these places to account for
this possibility.
(issue #10362, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 21:33:38 +00:00
Joshua Colp 95ed8b7931 Fix properties on trunk again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 21:28:50 +00:00
Mark Michelson ff7c41753f Merged revisions 79748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79748 | mmichelson | 2007-08-16 16:16:40 -0500 (Thu, 16 Aug 2007) | 8 lines

Fixes a problem where agents would get stuck busy due to their wrapuptime being longer than the queue's wrapuptime and
ringinuse=no for the queue.

(closes issue #10215, reported by Doug, repaired by me)

Special thanks to fkasumovic for pointing out the source of the problem and to bweschke for helping to come up with a solution!


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 21:21:35 +00:00
Tilghman Lesher 56b9568164 Don't reload a configuration file if nothing has changed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 21:09:46 +00:00
Steve Murphy c0060cd99a Many thanks to mvanbaak for his update to translate hints; I added the -d option for local testing purposes. This is from bug 10472
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 19:40:28 +00:00
Dwayne M. Hubbard 6186647ac3 added counter for iax2 show registry CLI output, closes issue 10461, thanks junky
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 18:23:39 +00:00
Dwayne M. Hubbard 46b75d5f17 added counter for voicemail show users, issue 10462, thanks junky
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 17:44:25 +00:00
Steve Murphy c33e2ec2ae mvanbaak asks: why did you include that twice? Answer: dunno. removed redundant include
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 17:34:50 +00:00
Steve Murphy c11e482cc8 svn did me dirty for some reason. Left 5 files out of the commit; Tilghman copied them in from the branch, but I had made changes to these. Here they are.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 16:50:58 +00:00
Mark Michelson 80f49f0ac8 Merged revisions 79690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79690 | mmichelson | 2007-08-16 10:58:34 -0500 (Thu, 16 Aug 2007) | 5 lines

base_encode is not trying to open a log file, so we should not call it a log file in the warning.

(related to issue #10452, reported by bcnit)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79691 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 15:59:15 +00:00
Joshua Colp 3f998a86a1 (closes issue #10467)
Reported by: lunn
Patches:
      pbx_dundi.diff uploaded by lunn (license 179)
Don't print a warning saying an ethernet interface was found when it indeed was.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 15:29:44 +00:00
Joshua Colp b10671b0b8 Make conf2ael build on 64-bit systems.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 15:27:33 +00:00
Philippe Sultan bade686730 Merged revisions 79665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79665 | phsultan | 2007-08-16 11:37:10 +0200 (Thu, 16 Aug 2007) | 21 lines

A fix for two critical problems detected while working with Daniel
McKeehan in issue #10184. 

Upon priority change, the resource list is not NULL terminated when
moving an item to the end of the list. This makes Asterisk endlessy
loop whenever it needs to read the list. Jids with different resource and
priority values, like in Gmail's and GoogleTalk's jabber clients put
that problem in evidence.

Upon reception of a 'from' attribute with an empty resource string,
Asterisk crashes when trying to access the found->cap pointer if the
resource list for the given buddy is not empty. This situation is
perfectly valid and must be handled. The Gizmoproject's jabber client
put that problem in evidence.

Also added a few comments in the code as well as a handle for the
capabilities from Gmail's jabber client, which are stored in a caps:c tag
rather than the usual c tag.

Closes issue #10184.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 09:45:22 +00:00
Christian Richter a3a32e6675 Merged revisions 79642 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79642 | crichter | 2007-08-16 10:21:21 +0200 (Do, 16 Aug 2007) | 1 line

0x80 + protocol is wrong for USERUSER when we want to send IA5 Chars.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79660 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 09:22:23 +00:00
Olle Johansson 0c321a54d9 Doc change
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 06:52:17 +00:00
Jason Parker f38a688605 Modify the names of functions/variables in res_musiconhold to be useful.
Closes issue #10464, patch by caio1982


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79634 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 22:53:45 +00:00
Tilghman Lesher 918348f03c Missing from murf's last trunk commit, which was why trunk won't compile
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 21:25:13 +00:00
Joshua Colp eaeec33a5c Remove properties that appeared from Steve's last branch merge. Automerge has already run so everyone's branches based off of trunk are probably toast by now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 19:34:42 +00:00
Steve Murphy 9836efb5fb This commit closes bug 7605, and half-closes 7638. The AEL code has been redistributed/repartitioned to allow code re-use both inside and outside of Asterisk. This commit introduces the utils/conf2ael program, and an external config-file reader, for both normal config files, and for extensions.conf (context, exten, prio); It provides an API for programs outside of asterisk to use to play with the dialplan and config files.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 19:21:27 +00:00
Joshua Colp 5fbd7ebd24 Merged revisions 79553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79553 | file | 2007-08-15 11:40:23 -0300 (Wed, 15 Aug 2007) | 6 lines

(closes issue #10440)
Reported by: irroot
(closes issue #10454)
Reported by: flo_turc
Increase maximum timestamp skew to 120. 20 was apparently far too low.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 14:42:49 +00:00
Mark Michelson 425aca97c4 Merged revisions 79527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79527 | mmichelson | 2007-08-15 09:26:40 -0500 (Wed, 15 Aug 2007) | 5 lines

Fixed an error in the Russian language voicemail intro.

(issue #10458, reported and patched by Oleh)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 14:27:35 +00:00
Joshua Colp 3512cefb10 Merged revisions 79523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79523 | file | 2007-08-15 11:18:44 -0300 (Wed, 15 Aug 2007) | 6 lines

(closes issue #10456)
Reported by: irroot
Patches:
      sip_timeout.patch uploaded by irroot (license 52)
Change hardcoded timer value to defined value. I'm doing this in 1.4 as well so if it needs to be changed in the future this place would not have been forgotten.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 14:20:36 +00:00
Christian Richter 8d6b33c64b Merged revisions 78936 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78936 | crichter | 2007-08-10 15:24:03 +0200 (Fr, 10 Aug 2007) | 1 line

fixed a bug with the useruser information element. We send them now also in the disconnect message.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-15 11:27:51 +00:00