asterisk/asterisk.git
11 years agoUm, apparently I didn't actually finish merging before committing.
Mark Michelson [Mon, 8 Sep 2008 22:14:40 +0000 (22:14 +0000)]
Um, apparently I didn't actually finish merging before committing.
Bad bad bad

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141868 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141809 via svnmerge from
Mark Michelson [Mon, 8 Sep 2008 21:18:49 +0000 (21:18 +0000)]
Merged revisions 141809 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141809 | mmichelson | 2008-09-08 16:10:10 -0500 (Mon, 08 Sep 2008) | 14 lines

Fix pedantic mode of chan_sip to only check the
remote tag of an endpoint once a dialog has
been confirmed. Up until that point, it is possible
and legal for the far-end to send provisional
responses with a different To: tag each time. With
this patch applied, these provisional messages
will not cause a matching problem.

(closes issue #11536)
Reported by: ibc
Patches:
      11536v2.patch uploaded by putnopvut (license 60)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141810 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141806 via svnmerge from
Russell Bryant [Mon, 8 Sep 2008 21:05:01 +0000 (21:05 +0000)]
Merged revisions 141806 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141806 | russell | 2008-09-08 16:02:36 -0500 (Mon, 08 Sep 2008) | 7 lines

When doing an async goto, detect if the channel is already in the middle of a
masquerade.  This can happen when chan_local is trying to optimize itself out.
If this happens, fail the async goto instead of bursting into flames.

(closes issue #13435)
Reported by: geoff2010

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141807 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141741 via svnmerge from
Jason Parker [Mon, 8 Sep 2008 20:18:17 +0000 (20:18 +0000)]
Merged revisions 141741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141741 | qwell | 2008-09-08 15:15:42 -0500 (Mon, 08 Sep 2008) | 8 lines

Remove RPM package targets from Makefile (and all associated parts).
This has never worked in 1.4, and we decided that it makes no sense to be done here.
There are many distros out there that already have "proper" spec files that can be (re)used.

Closes issue #13113
Closes issue #10950
Closes issue #10952

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141745 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoQuote the arguments to grep so that sh on various platforms doesn't choke
Sean Bright [Mon, 8 Sep 2008 17:13:04 +0000 (17:13 +0000)]
Quote the arguments to grep so that sh on various platforms doesn't choke
on the special characters (like ^).

(closes issue #13417)
Reported by: dougm
Patches:
      13417.make_buildopts_h.patch uploaded by seanbright (license 71)
Tested by: dougm

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141682 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 141678 via svnmerge
Russell Bryant [Mon, 8 Sep 2008 16:26:48 +0000 (16:26 +0000)]
Blocked revisions 141678 via svnmerge

........
r141678 | russell | 2008-09-08 11:26:00 -0500 (Mon, 08 Sep 2008) | 4 lines

Actually use Zaptel CFLAGS if using Zaptel instead of DAHDI

This fixes building against Zaptel when using a custom path

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141679 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agomake func_curl.c compile under devmode.
Michiel van Baak [Sun, 7 Sep 2008 00:04:05 +0000 (00:04 +0000)]
make func_curl.c compile under devmode.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141626 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141565 via svnmerge from
Steve Murphy [Sat, 6 Sep 2008 20:19:50 +0000 (20:19 +0000)]
Merged revisions 141565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141565 | murf | 2008-09-06 14:13:16 -0600 (Sat, 06 Sep 2008) | 1 line

This fix comes from Joshua Colp The Brilliant, who, given the trace, came up with a solution. This will most likely will close 13235 and 13409. I'll wait till Monday to verify, and then close these bugs.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141566 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoGet rid of the casts that cause warnings on OpenBSD. The compiler is errantly
Tilghman Lesher [Sat, 6 Sep 2008 15:40:15 +0000 (15:40 +0000)]
Get rid of the casts that cause warnings on OpenBSD.  The compiler is errantly
detecting warnings when we redefine a structure each time it is used, even
though the structure is identical.
Reported by: mvanbaak, via #asterisk-dev

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141507 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141503 via svnmerge from
Tilghman Lesher [Sat, 6 Sep 2008 15:26:45 +0000 (15:26 +0000)]
Merged revisions 141503 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141503 | tilghman | 2008-09-06 10:23:42 -0500 (Sat, 06 Sep 2008) | 4 lines

Reverting behavior change (AGI should not exit non-zero on SUCCESS)
(closes issue #13434)
 Reported by: francesco_r

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141504 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoSome fixes to autocompletion in some commands.
Michiel van Baak [Sat, 6 Sep 2008 12:03:11 +0000 (12:03 +0000)]
Some fixes to autocompletion in some commands.

Changes applied by this patch:

- Fix autocompletion in 'sip prune realtime', sip peers where never auto completed. Now we complete this command with:
  'sip prune realtime peer' -> all | like | sip peers
  Also I have modified the syntax in the usage, was wrong...
- Pass ast_cli_args->argv and ast_cli_args->argc while running autocompletion on CLI commands (CLI_GENERATE).
  With this we avoid comparisons on ast_cli_args->line like this:
  strcasestr(a->line, " description")
  strcasestr(a->line, "descriptions ")
  strcasestr(a->line, "realtime peer"), and so on..

  Making the code more confusing (check the spaces in description!).
  The only thing we must be sure is to first check a->pos or a->argc.

- Fix 'iax2 prune realtime' autocompletion, now we autocomplete this command with 'all' & 'iax2 peers', check a look that iax2 peers where all the peers, now only the ones in the cache..

(closes issue #13133)
Reported by: eliel
Patches:
      clichanges.patch uploaded by eliel (license 64)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141464 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix func_curl compilation
Mark Michelson [Fri, 5 Sep 2008 22:03:26 +0000 (22:03 +0000)]
Fix func_curl compilation

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141425 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141366 via svnmerge from
Mark Michelson [Fri, 5 Sep 2008 21:12:09 +0000 (21:12 +0000)]
Merged revisions 141366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141366 | mmichelson | 2008-09-05 16:10:32 -0500 (Fri, 05 Sep 2008) | 7 lines

Agent's should not try to call a channel's indicate callback
if the channel has been hung up. It will likely crash
otherwise

ABE-1159

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141367 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd the CURLOPT dialplan function, which permits setting various options for
Tilghman Lesher [Fri, 5 Sep 2008 19:12:03 +0000 (19:12 +0000)]
Add the CURLOPT dialplan function, which permits setting various options for
use with the CURL dialplan function.
(closes issue #12920)
 Reported by: davevg
 Patches:
       20080904__bug12920.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76, davevg

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141328 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 141267 via svnmerge
Mark Michelson [Fri, 5 Sep 2008 16:36:48 +0000 (16:36 +0000)]
Blocked revisions 141267 via svnmerge

........
r141267 | mmichelson | 2008-09-05 11:35:54 -0500 (Fri, 05 Sep 2008) | 11 lines

Since greetings are not stored in IMAP, we should
not be DISPOSE'ing of them the same way we do with
other messages.

(closes issue #13414)
Reported by: mthomasslo
Patches:
      13414v2.patch uploaded by putnopvut (license 60)
Tested by: mthomasslo

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141271 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 141217 via svnmerge
Mark Michelson [Fri, 5 Sep 2008 16:03:11 +0000 (16:03 +0000)]
Blocked revisions 141217 via svnmerge

........
r141217 | mmichelson | 2008-09-05 11:00:24 -0500 (Fri, 05 Sep 2008) | 14 lines

Commit 140417 had a logic flaw in it which
caused port 5060 to always be used when dialing
a peer if no explicit port was specified. This
broke the behavior of implicitly using the port
from which the peer registered if no port is
specified. This commit fixes the logic flaw.

(closes issue #13424)
Reported by: mdu113
Patches:
      13424.patch uploaded by putnopvut (license 60)
Tested by: mdu113

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141218 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141156 via svnmerge from
Steve Murphy [Fri, 5 Sep 2008 14:18:43 +0000 (14:18 +0000)]
Merged revisions 141156 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141156 | murf | 2008-09-05 08:15:43 -0600 (Fri, 05 Sep 2008) | 1 line

A small change to prevent double-posting of CDR's; thanks to Daniel Ferrer for bringing it to our attention
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141157 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141094 via svnmerge from
Steve Murphy [Thu, 4 Sep 2008 23:31:41 +0000 (23:31 +0000)]
Merged revisions 141094 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141094 | murf | 2008-09-04 17:15:07 -0600 (Thu, 04 Sep 2008) | 70 lines

(closes issue #13357)
Reported by: pj
Tested by: murf

(closes issue #13416)
Reported by: yarns
Tested by: murf

If you find this message overly verbose, relax, it's probably
not meant for you. This message is meant for probably only
two people in the whole world: me, or the poor schnook that
has to maintain this code because I'm either dead or unavailable
at the moment.

This fix solves two reports, both having to do with embedding
a function call in a ${} construct. It was tricky because the
funccall syntax has parenthesis () in it. And up till now,
the 'word' token in the flex stuff didn't allow that, because
it would tend to steal the LP and RP tokens. To be truthful,
the "word" token was the trickiest, most unstable thing in
the whole lexer. I was lucky it made this long without complaints.
I had to choose every character in the pattern with extreme
care, and I knew that someday I'd have to revisit it. Well,
the day has come.

So, my brilliant idea (and I'm being modest), was to use the
surrounding ${} construct to make a state machine and capture
everything in it, no matter what it contains. But, I have to now
treat the word token like I did with comments, in that I turn
the whole thing into a state-machine sort of spec, with new
contexts "curlystate", "wordstate", and "brackstate".

Wait a minute, "brackstate"? Yes, well, it didn't take very many
regression tests to point out if I do this for ${} constructs,
I also have to do it with the $[] constructs, too.

I had to create a separate pcbstack2 and pcbstack3 because
these constructs can occur inside macro argument lists, and
when we have two state machines operating on the same structures
we'd get problems otherwise. I guess I could have stopped at
pcbstack2 and had the brackstate stuff share it, but it doesn't
hurt to be safe. So, the pcbpush and pcbpop routines also now
have versions for "2" and "3".

I had to add the {KEYWORD} construct to the initial pattern for
"word", because previously word would match stuff like "default7",
because it was a longer match than the keyword "default". But,
not any more, because the word pattern only matches only one or
two characters now, and it will always lose. So, I made it the
winner again by making an optional match on any of the keywords
before it's normal pattern.

I added another regression test to make sure we don't
lose this in future edits, and had to fix just one regression,
where it no longer reports a 'cascaded' error, which I guess
is a plus.

I've given some thought as to whether to apply these fixes to
1.4 and the 1.6.x releases, vs trunk; I decided to put it in
1.4 because one of the bug reports was against 1.4; and it
is unexpected that AEL cannot handle this situation. It actually
reduced the amount of useless "cascade" error messages that
appeared in the regressions (by one line, ehhem). There is
a possible side-effect in that it does now do more careful
checking of what's in those ${} constructs, as far as matching
parens, and brackets are concerned. Some users may find a an
insidious problem and correct it this way. This should be
exceedingly rare, I hope.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141115 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 141028 via svnmerge from
Jeff Peeler [Thu, 4 Sep 2008 17:27:56 +0000 (17:27 +0000)]
Merged revisions 141028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines

(closes issue #11979)
Fixes multiple parking problems:
Crash when executing a park on an extension dialed by AGI due to not returning the proper return code.
Crash when using a builtin feature that was a subset of a enabled dynamic feature.
Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141039 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix some locking order issues in app_queue. This was
Mark Michelson [Wed, 3 Sep 2008 20:16:12 +0000 (20:16 +0000)]
Fix some locking order issues in app_queue. This was
brought up by atis on IRC a while ago.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140975 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdded 'skinny show lines verbose'
Michiel van Baak [Wed, 3 Sep 2008 18:06:35 +0000 (18:06 +0000)]
Added 'skinny show lines verbose'
This will print the subs and their status for every line (if any).

wedhorn did most of the work with his patch which introduced
'skinny show debug' but a discussion on IRC stated that it should be
added to 'skinny show lines'

Input on the output format by Qwell on IRC.

(closes issue #13344)
Reported by: wedhorn

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140938 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix compilation
Mark Michelson [Wed, 3 Sep 2008 14:41:54 +0000 (14:41 +0000)]
Fix compilation

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140850 via svnmerge from
Mark Michelson [Wed, 3 Sep 2008 14:31:33 +0000 (14:31 +0000)]
Merged revisions 140850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140850 | mmichelson | 2008-09-03 09:29:15 -0500 (Wed, 03 Sep 2008) | 9 lines

Fix voicemail forwarding when using ODBC storage.

(closes issue #13387)
Reported by: moliveras
Patches:
      13387.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140860 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoIn these changes, I have added some explanation
Steve Murphy [Wed, 3 Sep 2008 14:01:27 +0000 (14:01 +0000)]
In these changes, I have added some explanation
of changes to the Set and MSet apps, so people aren't
so shocked and surprised when they upgrade from
1.4 to 1.6.

Also, for the sake of those upgrading from 1.4 to
1.6 with AEL, I provide automatic support for the
"old" way of using Set(), that still does the
exact same old thing with quotes and backslashes
and so on as 1.4 did, by having AEL compile in the
use of MSet() instead of Set(), everywhere it inserts
this code.

But, if the app_set var is set to 1.6 or higher,
it uses the "new", non-evaluative Set().

This only usually happens if the user manually
inserts this into the asterisk.conf file, or runs
the "make samples" command.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140824 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMove some duplicated code into a separate function.
Sean Bright [Wed, 3 Sep 2008 13:48:12 +0000 (13:48 +0000)]
Move some duplicated code into a separate function.

Also try to do some wacky stuff in the commit message, like:
a newline \n
a bell \a
a tab \t
a format specification %p

That is all.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140821 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFormatting change to test something on the svn server
Russell Bryant [Wed, 3 Sep 2008 13:41:51 +0000 (13:41 +0000)]
Formatting change to test something on the svn server

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140820 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140816 via svnmerge from
Russell Bryant [Wed, 3 Sep 2008 13:26:43 +0000 (13:26 +0000)]
Merged revisions 140816 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140816 | russell | 2008-09-03 08:24:35 -0500 (Wed, 03 Sep 2008) | 4 lines

Don't freak out if the poll emulation receives NULL for the pollfds array
(closes issue #13307)
Reported by: jcovert

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140817 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140751 via svnmerge from
Mark Michelson [Tue, 2 Sep 2008 23:48:25 +0000 (23:48 +0000)]
Merged revisions 140751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140751 | mmichelson | 2008-09-02 18:47:49 -0500 (Tue, 02 Sep 2008) | 6 lines

After adding the context checking to app_voicemail
for IMAP storage, I left out a crucial place to
copy the context to the vm_state structure. This
is the correction.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140752 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140747 via svnmerge from
Steve Murphy [Tue, 2 Sep 2008 23:44:04 +0000 (23:44 +0000)]
Merged revisions 140747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140747 | murf | 2008-09-02 17:36:56 -0600 (Tue, 02 Sep 2008) | 1 line

I am turning the warnings generated in ast_cdr_free and post_cdr into verbose level 2 messages. Really, they matter little to end users. You either get the CDR's you wanted, or you don't, and it is a bug.

For trunk, I am going one step further. These messages were pretty worthless even for debug, so I'm completely removing them.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140749 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140690 via svnmerge from
Steve Murphy [Tue, 2 Sep 2008 22:55:12 +0000 (22:55 +0000)]
Merged revisions 140690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140690 | murf | 2008-09-02 16:40:13 -0600 (Tue, 02 Sep 2008) | 1 line

After reconsidering, with respect to 13409, ast_cdr_detach should be OK, better in fact, than ast_cdr_free, which generates lots of useless warnings that will undoubtably generate complaints.

Hmmm. It doesn't hush the useless warnings, but it does allow control of posting via the detach and post routines, for those possible situations,
where you'd want to post single-channel cdrs.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140692 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140670 via svnmerge from
Steve Murphy [Tue, 2 Sep 2008 22:50:59 +0000 (22:50 +0000)]
Merged revisions 140670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140670 | murf | 2008-09-02 16:15:57 -0600 (Tue, 02 Sep 2008) | 14 lines

(closes issue #13409)
Reported by: tomaso
Patches:
      asterisk-1.6.0-rc2-cdrmemleak.patch uploaded by tomaso (license 564)

I basically spent the day, verifying that this patch
solves the problem, and doesn't hurt in non-problem
cases. Why valgrind did not plainly reveal this leak
absolutely mystifies and stuns me.

Many, many thanks to tomaso for finding and providing the fix.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140691 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140605 via svnmerge from
Sean Bright [Tue, 2 Sep 2008 18:15:54 +0000 (18:15 +0000)]
Merged revisions 140605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140605 | seanbright | 2008-09-02 14:14:57 -0400 (Tue, 02 Sep 2008) | 8 lines

Make sure to use the correct length of the mohinterpret and mohsuggest
buffers when copying configuration values.

(closes issue #13336)
Reported by: decryptus_proformatique
Patches:
      chan_iax2_mohinterpret_mohsuggest_general_settings.patch uploaded by decryptus (license 555)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140606 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoUpdate instructions for getting libresample
Russell Bryant [Tue, 2 Sep 2008 15:11:53 +0000 (15:11 +0000)]
Update instructions for getting libresample

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140566 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoI'm not sure how these files got to trunk (probably my fault), but they
Russell Bryant [Tue, 2 Sep 2008 15:09:20 +0000 (15:09 +0000)]
I'm not sure how these files got to trunk (probably my fault), but they
should not be here

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140563 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoWhen a call is rejected because of call-limit, the channel driver is behaving
Sean Bright [Tue, 2 Sep 2008 14:41:41 +0000 (14:41 +0000)]
When a call is rejected because of call-limit, the channel driver is behaving
as expected, so we shouldn't report it as an error.  Change to LOG_NOTICE
instead.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140559 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdded the option s to the Park application which will silence the announcement of...
Jeff Peeler [Fri, 29 Aug 2008 17:53:32 +0000 (17:53 +0000)]
Added the option s to the Park application which will silence the announcement of the parking space number. Also, fixes the bug of just clearing the flags instead of actually parsing the arguments to Park.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140491 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140488 via svnmerge from
Mark Michelson [Fri, 29 Aug 2008 17:47:17 +0000 (17:47 +0000)]
Merged revisions 140488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines

After working on the ao2_containers branch, I noticed
something a bit strange. In all cases where we provide
a callback function to ao2_container_alloc, the callback
function would only return 0 or CMP_MATCH. After inspecting
the ao2_callback() code carefully, I found that if you're
only looking for one specific item, then you should return
CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue
traversing the current bucket until the end searching for
more matches.

In cases like chan_iax2 where in 1.4, all the peers are
shoved into a single bucket, this makes for potentially
terrible performance since the entire bucket will be
traversed even if the peer is one of the first ones come
across in the bucket.

All the changes I have made were for cases where the
callback function defined was passed to ao2_container_alloc
so that calls to ao2_find could find a unique instance
of whatever object was being stored in the container.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140489 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAllow for video files to be opened as well as
Mark Michelson [Fri, 29 Aug 2008 16:24:37 +0000 (16:24 +0000)]
Allow for video files to be opened as well as
audio files.

(closes issue #13372)
Reported by: epicac
Patches:
      13372.patch uploaded by putnopvut (license 60)
Tested by: epicac

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140433 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140421 via svnmerge from
Mark Michelson [Fri, 29 Aug 2008 16:06:09 +0000 (16:06 +0000)]
Merged revisions 140421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140421 | mmichelson | 2008-08-29 11:01:07 -0500 (Fri, 29 Aug 2008) | 12 lines

Add context checking when retrieving a vm_state.
This was causing a problem for people who had identically
named mailboxes in separate voicemail contexts.
This commit affects IMAP storage only.

(closes issue #13194)
Reported by: moliveras
Patches:
      13194.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140422 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140417 via svnmerge from
Mark Michelson [Fri, 29 Aug 2008 15:32:02 +0000 (15:32 +0000)]
Merged revisions 140417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140417 | mmichelson | 2008-08-29 10:26:52 -0500 (Fri, 29 Aug 2008) | 10 lines

Fix SIP's parsing so that if a port is specified
in a string to Dial(), it is not ignored.

(closes issue #13355)
Reported by: acunningham
Patches:
      13355v2.patch uploaded by putnopvut (license 60)
Tested by: acunningham

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140418 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOops
Tilghman Lesher [Wed, 27 Aug 2008 23:23:56 +0000 (23:23 +0000)]
Oops

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140355 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140299 via svnmerge from
Mark Michelson [Wed, 27 Aug 2008 20:11:22 +0000 (20:11 +0000)]
Merged revisions 140299 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140299 | mmichelson | 2008-08-27 14:49:20 -0500 (Wed, 27 Aug 2008) | 11 lines

Fix tag checking in get_sip_pvt_byid_locked when
in pedantic mode. The problem was that the wrong
tags would be compared depending on the direction
of the call.

(closes issue #13353)
Reported by: flefoll
Patches:
      chan_sip.c.br14.139015.patch-refer-pedantic uploaded by flefoll (license 244)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140301 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMove the mwi send thread functionality back into the do_monitor thread so that it...
Doug Bailey [Tue, 26 Aug 2008 21:59:31 +0000 (21:59 +0000)]
Move the mwi send thread functionality back into the do_monitor thread so that it is easier to manage CID spill resources when do_monitor needs to be killed.
(closes issue #13213)
Reported by: bbryant

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140246 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140056 via svnmerge from
Jeff Peeler [Tue, 26 Aug 2008 18:48:55 +0000 (18:48 +0000)]
Merged revisions 140056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140056 | jpeeler | 2008-08-26 10:57:02 -0500 (Tue, 26 Aug 2008) | 9 lines

(closes issue #12071)
Reported by: tzafrir
Patches:
      dahdi_close.diff uploaded by tzafrir (license 46)
Tested by: tzafrir, jpeeler

This patch fixes closing open file descriptors in the case of an error.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140205 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)
Tilghman Lesher [Tue, 26 Aug 2008 18:46:07 +0000 (18:46 +0000)]
OpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140201 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix building menuselect-tree with PRINT_DIR set. We _must_ use the --quiet
Russell Bryant [Tue, 26 Aug 2008 18:11:49 +0000 (18:11 +0000)]
Fix building menuselect-tree with PRINT_DIR set.  We _must_ use the --quiet
flag here, or else some arbitrary text will end up in the resulting
menuselect-tree file and things will explode.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140169 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoStandardize the option names for consistency (but continue to work with the
Tilghman Lesher [Tue, 26 Aug 2008 18:05:58 +0000 (18:05 +0000)]
Standardize the option names for consistency (but continue to work with the
existing names for backwards compatibility).
(closes issue #13370)
 Reported by: jsturtevant

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140167 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 140115 via svnmerge
Jeff Peeler [Tue, 26 Aug 2008 16:51:48 +0000 (16:51 +0000)]
Blocked revisions 140115 via svnmerge

........
r140115 | jpeeler | 2008-08-26 11:49:57 -0500 (Tue, 26 Aug 2008) | 1 line

add HAVE_PRI if define around dahdi_close_pri_fd
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140116 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140060 via svnmerge from
Russell Bryant [Tue, 26 Aug 2008 16:10:06 +0000 (16:10 +0000)]
Merged revisions 140060 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140060 | russell | 2008-08-26 11:07:58 -0500 (Tue, 26 Aug 2008) | 6 lines

Fix some bogus scheduler usage in chan_sip.  This code used the return value
of a completely unrelated function to determine whether the scheduler should
be run or not.  This would have caused the scheduler to not run in cases where
it should have.  Also, leave a note about another scheduler issue that needs
to be addressed at some point.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140061 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years ago(closes issue #13366)
Steve Murphy [Tue, 26 Aug 2008 15:57:49 +0000 (15:57 +0000)]
(closes issue #13366)
Reported by: erousseau

This was a reasonable enhancement request, which was
easy to implement. Since it's an enhancement, it
could only be applied to trunk.

Basically, for accounting where "initiated" seconds
are billed for, if the microseconds field on the end
time is greater than the microseconds field for the
answer time, add one second to the billsec field.

The implementation was requested by erousseau, and
I've implemented it as requested. I've updated the
CHANGES, the cdr.conf.sample, and the .h files
accordingly, to accept and set a flag for the
corresponding new option. cdr.c adds in the extra
second based on the usec fields if the option is
set. Tested, seems to be working fine.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140057 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140051 via svnmerge from
Russell Bryant [Tue, 26 Aug 2008 15:29:25 +0000 (15:29 +0000)]
Merged revisions 140051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140051 | russell | 2008-08-26 10:27:23 -0500 (Tue, 26 Aug 2008) | 15 lines

Fix a race condition with the IAX scheduler thread.  A lock and condition are
used here to allow newly scheduled tasks to wake up the scheduler just in case
the new task needs to run sooner than the current wakeup time when the thread
is sleeping.  However, there was a race condition such that a newly scheduled
task would not properly wake up the scheduler or affect the wake up period.
The order of execution would have been:

  1) Scheduler thread determines wake up time of N ms.
  2) Another thread schedules a task and signals the condition, with an
     execution time of < N ms.
  3) Scheduler thread locks and goes to sleep for N ms.

By moving the sleep time determination to inside the critical section, this
possibility is avoided.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140053 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 140050 via svnmerge
Terry Wilson [Tue, 26 Aug 2008 15:27:46 +0000 (15:27 +0000)]
Blocked revisions 140050 via svnmerge

........
r140050 | twilson | 2008-08-26 10:22:58 -0500 (Tue, 26 Aug 2008) | 4 lines

sounds/Makefile installs sounds using the "new" language directory structure, but languageprefix needs to be set = yes for sounds in subdirectories (digits/1, etc.) to play as the correct language.

Fix the generation of asterisk.conf to include languageprefix=yes

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOptional light colored background, for those who use black on white terminals.
Tilghman Lesher [Mon, 25 Aug 2008 23:13:32 +0000 (23:13 +0000)]
Optional light colored background, for those who use black on white terminals.
(closes issue #13306)
 Reported by: Corydon76
 Patches:
       20080814__bug13306__3.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76, pkempgen

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139981 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139927 via svnmerge from
Jeff Peeler [Mon, 25 Aug 2008 21:48:51 +0000 (21:48 +0000)]
Merged revisions 139927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139927 | jpeeler | 2008-08-25 16:47:33 -0500 (Mon, 25 Aug 2008) | 3 lines

Fix a typo I made. Lesson learned, apply the patch if one exists.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139928 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139909 via svnmerge from
Sean Bright [Mon, 25 Aug 2008 21:32:10 +0000 (21:32 +0000)]
Merged revisions 139909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139909 | seanbright | 2008-08-25 17:31:03 -0400 (Mon, 25 Aug 2008) | 9 lines

Some versions of awk (nawk, for example) don't like empty regular expressions
so be slightly more verbose.

(closes issue #13374)
Reported by: dougm
Patches:
      13374.diff uploaded by seanbright (license 71)
Tested by: dougm

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139915 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139869 via svnmerge from
Terry Wilson [Mon, 25 Aug 2008 20:59:58 +0000 (20:59 +0000)]
Merged revisions 139869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139869 | twilson | 2008-08-25 15:46:10 -0500 (Mon, 25 Aug 2008) | 2 lines

Make SIPADDHEADER() propagate indefinitely

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139870 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd output of variables to AgentRingNoAnswer manager
Mark Michelson [Mon, 25 Aug 2008 17:24:02 +0000 (17:24 +0000)]
Add output of variables to AgentRingNoAnswer manager
event if eventwhencalled is set to "vars" in
queues.conf. Yay for consistency.

(closes issue #13369)
Reported by: srt
Patches:
      13369_agentringnoanswer_variables.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139832 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRealtime capabilities for the Find-Me-Follow-Me application.
Tilghman Lesher [Mon, 25 Aug 2008 16:02:56 +0000 (16:02 +0000)]
Realtime capabilities for the Find-Me-Follow-Me application.
(closes issue #13295)
 Reported by: Corydon76
 Patches:
       20080813__followme_realtime_enabled.diff.txt uploaded by Corydon76 (license 14)
 Tested by: dferrer

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 139769 via svnmerge
Mark Michelson [Mon, 25 Aug 2008 15:55:10 +0000 (15:55 +0000)]
Blocked revisions 139769 via svnmerge

........
r139769 | mmichelson | 2008-08-25 10:52:59 -0500 (Mon, 25 Aug 2008) | 12 lines

Fix the logic in config_text_file_save so that if an
UpdateConfig manager action is issued and the
file specified in DstFileName does not yet exist,
an error is not returned.

(closes issue #13341)
Reported by: vadim
Patches:
      13341.patch uploaded by putnopvut (license 60)
  (with small modification from seanbright)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139771 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139764 via svnmerge from
Steve Murphy [Mon, 25 Aug 2008 15:54:18 +0000 (15:54 +0000)]
Merged revisions 139764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139764 | murf | 2008-08-25 09:33:14 -0600 (Mon, 25 Aug 2008) | 9 lines

This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference.

I will un-close 13251.

Back to the drawing board/ concept/ beginning/ whatever!

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139770 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMemory leak
Tilghman Lesher [Sun, 24 Aug 2008 16:26:48 +0000 (16:26 +0000)]
Memory leak

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139707 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoEliminate open coding of ast_str
Tilghman Lesher [Sun, 24 Aug 2008 16:23:15 +0000 (16:23 +0000)]
Eliminate open coding of ast_str

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139704 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139635 via svnmerge from
Steve Murphy [Fri, 22 Aug 2008 22:32:35 +0000 (22:32 +0000)]
Merged revisions 139635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines

I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139662 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139347 via svnmerge from
Steve Murphy [Fri, 22 Aug 2008 22:03:13 +0000 (22:03 +0000)]
Merged revisions 139347 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139347 | murf | 2008-08-21 17:03:50 -0600 (Thu, 21 Aug 2008) | 47 lines

(closes issue #13251)
Reported by: sergee
Tested by: murf

THis is a bold move for a static release fix, but I wouldn't have
made it if I didn't feel confident (at least a *bit* confident)
that it wouldn't mess everyone up.

The reasoning goes something like this:

1. We simply cannot do anything with CDR's at the current point
(in pbx.c, after the __ast_pbx_run loop). It's way too late to
have any affect on the CDRs. The CDR is already posted and gone,
and the remnants have been cleared.

2. I was very much afraid that moving the running of the 'h'
extension down into the bridge code (where it would be now
practical to do it), would result in a lot more calls to the
'h' exten, so I implemented it as another exten under another
name, but found, to my pleasant surprise, that there was a
1:1 correspondence to the running of the 'h' exten in the
pbx_run loop, and the new spot at the end of the bridge.
So, I ifdef'd out the current 'h' loop, and moved it into
the bridge code. The only difference I can see is the stuff
about the AST_PBX_KEEPALIVE, and hopefully, if this
is still an important decision point, I can replicate it
if there are complaints. To be perfectly honest,
the KEEPALIVE situation is not totally clear to me,
and how it relates to a post-bridge situation is less
clear. I suspect the users will point out everything
in total clarity if this steps on anyone's toes!

3. I temporarily swap the bridge_cdr into the channel
before running the 'h' exten, which makes it possible
for users to edit the cdr before it goes out the door.
And, of course, with the endbeforehexten config var set,
the users can also get at the billsec/duration vals.
After the h exten finishes, the cdr is swapped back
and processing continues as normal.

Please, all who deal with CDR's, please test this version
of Asterisk, and file bug reports as appropriate!

........

I also made a little fix to the app_dial's 'e' option,
that is related to my updates.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139621 via svnmerge from
Jeff Peeler [Fri, 22 Aug 2008 21:57:32 +0000 (21:57 +0000)]
Merged revisions 139621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139621 | jpeeler | 2008-08-22 16:36:13 -0500 (Fri, 22 Aug 2008) | 5 lines

(closes issue #13359)
Reported by: Laureano
Patches:
      originate_channel_check.patch uploaded by Laureano (license 265)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139624 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoremove extra comma typo
Jeff Peeler [Fri, 22 Aug 2008 21:52:20 +0000 (21:52 +0000)]
remove extra comma typo

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139622 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoThe -1 return value from incomplete or improper
Mark Michelson [Fri, 22 Aug 2008 20:20:58 +0000 (20:20 +0000)]
The -1 return value from incomplete or improper
headers for the SipNotify manager command was
causing the current manager session to become
disconnected. Change the return value to 0 for
these cases.

Also change a test for a NULL pointer to be
ast_strlen_zero instead.

(closes issue #13351)
Reported by: Laureano
Patches:
      sipnotify_action_fix.patch uploaded by Laureano (license 265)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139563 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
Mark Michelson [Fri, 22 Aug 2008 20:02:35 +0000 (20:02 +0000)]
Add missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
manager events

(closes issue #13358)
Reported by: srt
Patches:
      13358_parking_events.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139558 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139553 via svnmerge from
Mark Michelson [Fri, 22 Aug 2008 19:45:41 +0000 (19:45 +0000)]
Merged revisions 139553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139553 | mmichelson | 2008-08-22 14:45:19 -0500 (Fri, 22 Aug 2008) | 8 lines

Fix compilation when DEBUG_THREAD_LOCALS is selected

(closes issue #13298)
Reported by: snuffy
Patches:
      bug13298_20080822.diff uploaded by snuffy (license 35)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139554 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 139521 via svnmerge
Mark Michelson [Fri, 22 Aug 2008 19:24:26 +0000 (19:24 +0000)]
Blocked revisions 139521 via svnmerge

........
r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines

Remove show_frame_stats_deprecated since it is not
used anywhere and causes build errors if building under
dev-mode with TRACE_FRAMES selected in menuselect.

(closes issue #13362)
Reported by: snuffy

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139525 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139466 via svnmerge from
Mark Michelson [Fri, 22 Aug 2008 17:25:12 +0000 (17:25 +0000)]
Merged revisions 139466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines

Fix the build. Thanks, mvanbaak!

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139469 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139456 via svnmerge from
Mark Michelson [Fri, 22 Aug 2008 16:58:21 +0000 (16:58 +0000)]
Merged revisions 139456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139456 | mmichelson | 2008-08-22 11:57:38 -0500 (Fri, 22 Aug 2008) | 7 lines

Prevent a deadlock in chan_iax2 resulting from
incorrect locking order between iax2_pvt and
ast_channel structures.

AST-13

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139457 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139387 via svnmerge from
Jeff Peeler [Thu, 21 Aug 2008 23:41:50 +0000 (23:41 +0000)]
Merged revisions 139387 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139387 | jpeeler | 2008-08-21 18:39:31 -0500 (Thu, 21 Aug 2008) | 3 lines

Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart.
(closes issue #11017)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139391 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agooops
Dwayne M. Hubbard [Thu, 21 Aug 2008 23:00:31 +0000 (23:00 +0000)]
oops

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139346 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoinitiate T38 negotiation in FaxSend; use channel variables; other stuff too
Dwayne M. Hubbard [Thu, 21 Aug 2008 22:54:18 +0000 (22:54 +0000)]
initiate T38 negotiation in FaxSend; use channel variables; other stuff too

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139345 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix two memory leaks in chan_gtalk, thanks Eliel!
Philippe Sultan [Thu, 21 Aug 2008 09:55:31 +0000 (09:55 +0000)]
Fix two memory leaks in chan_gtalk, thanks Eliel!
(closes issue #13310)
Reported by: eliel
Patches:
      chan_gtalk.c.patch uploaded by eliel (license 64)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139281 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139213 via svnmerge from
Russell Bryant [Wed, 20 Aug 2008 22:16:36 +0000 (22:16 +0000)]
Merged revisions 139213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines

Fix a crash in the ChanSpy application.  The issue here is that if you call
ChanSpy and specify a spy group, and sit in the application long enough looping
through the channel list, you will eventually run out of stack space and the
application with exit with a seg fault.  The backtrace was always inside of
a harmless snprintf() call, so it was tricky to track down.  However, it turned
out that the call to snprintf() was just the biggest stack consumer in this
code path, so it would always be the first one to hit the boundary.

(closes issue #13338)
Reported by: ruddy

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139215 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix output of sipshowpeer manager response.
Jason Parker [Wed, 20 Aug 2008 22:06:40 +0000 (22:06 +0000)]
Fix output of sipshowpeer manager response.

(closes issue #13346)
Reported by: srt
Patches:
      13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139210 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRemove extraneous debugging messages.
Shaun Ruffell [Wed, 20 Aug 2008 20:03:28 +0000 (20:03 +0000)]
Remove extraneous debugging messages.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139154 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix bug where the samples were not accurate when in G723 mode, which would
Shaun Ruffell [Wed, 20 Aug 2008 19:57:22 +0000 (19:57 +0000)]
Fix bug where the samples were not accurate when in G723 mode, which would
cause the timestamp field of the RTP header to be invalid.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139153 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 139145 via svnmerge
Kevin P. Fleming [Wed, 20 Aug 2008 19:36:27 +0000 (19:36 +0000)]
Blocked revisions 139145 via svnmerge

........
r139145 | kpfleming | 2008-08-20 14:35:59 -0500 (Wed, 20 Aug 2008) | 8 lines

Backport support for Zaptel/DAHDI channel-level alarms from trunk/1.6, because not doing so just makes it difficult for people with channels that are in alarm when Asterisk starts up to get them going once the alarm is cleared

(closes issue #12160)
Reported by: tzafrir
Patches:
      asterisk-chanalarms_14.patch uploaded by tzafrir (license 46)
Tested by: tzafrir

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139146 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139074 via svnmerge from
Steve Murphy [Wed, 20 Aug 2008 17:25:07 +0000 (17:25 +0000)]
Merged revisions 139074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines

(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139083 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agofix unholding phones after hangup on older cisco phones.
Michiel van Baak [Wed, 20 Aug 2008 16:16:53 +0000 (16:16 +0000)]
fix unholding phones after hangup on older cisco phones.

Patch by wedhorn.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139020 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139015 via svnmerge from
Mark Michelson [Wed, 20 Aug 2008 15:38:47 +0000 (15:38 +0000)]
Merged revisions 139015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines

sip_read should properly handle a NULL return from sip_rtp_read.

(closes issue #13257)
Reported by: travishein

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139016 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138949 via svnmerge
Jeff Peeler [Tue, 19 Aug 2008 23:23:02 +0000 (23:23 +0000)]
Blocked revisions 138949 via svnmerge

........
r138949 | jpeeler | 2008-08-19 18:22:39 -0500 (Tue, 19 Aug 2008) | 1 line

add DAHDI_POLICY_WHEN_FULL compatability define for Zaptel
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138942 via svnmerge from
Mark Michelson [Tue, 19 Aug 2008 23:19:40 +0000 (23:19 +0000)]
Merged revisions 138942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138942 | mmichelson | 2008-08-19 18:17:17 -0500 (Tue, 19 Aug 2008) | 11 lines

Reset agent_pvt variables back to the values in agents.conf
(from what the corresponding channel variables were set to)
when the agent logs out.

(closes issue #13098)
Reported by: davidw
Patches:
      20080731__issue13098_agent_ackcall_not_reset.diff uploaded by bbryant (license 36)
Tested by: davidw

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138943 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138938 via svnmerge
Jeff Peeler [Tue, 19 Aug 2008 22:56:42 +0000 (22:56 +0000)]
Blocked revisions 138938 via svnmerge

........
r138938 | jpeeler | 2008-08-19 17:56:07 -0500 (Tue, 19 Aug 2008) | 7 lines

Add configuration option to chan_dahdi.conf to allow buffering policy and number of buffers to be configured per channel. Syntax:

buffers=<num of buffers>,<policy>

Where the number of buffers is some non-negative integer and the policy is either "full", "half", or "immediate".

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138939 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138886 via svnmerge from
Mark Michelson [Tue, 19 Aug 2008 18:52:04 +0000 (18:52 +0000)]
Merged revisions 138886 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138886 | mmichelson | 2008-08-19 13:50:53 -0500 (Tue, 19 Aug 2008) | 23 lines

Add a lock and unlock prior to the destruction of the chanspy_ds
lock to ensure that no other threads still have it locked. While
this should not happen under normal circumstances, it appears that
if the spyer and spyee hang up at nearly the same time, the following
may occur.

1. ast_channel_free is called on the spyee's channel.
2. The chanspy datastore is removed from the spyee's channel in
   ast_channel_free.
3. In the spyer's thread, the spyer attempts to remove and destroy the datastore
   from the spyee channel, but the datastore has already been removed in step 2,
   so the spyer continues in the code.
4. The spyee's thread continues and calls the datastore's destroy callback,
   chanspy_ds_destroy. This involves locking the chanspy_ds.
5. Now the spyer attempts to destroy the chanspy_ds lock. The problem is that in step 4,
   the spyee has locked this lock, meaning that the spyer is attempting to destroy a lock
   which is currently locked by another thread.

The backtrace provided in issue #12969 supports the idea that this is possible
(and has even occurred). This commit does not close the issue, but should help
in preventing one type of crash associated with the use of app_chanspy.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agochan_skinny now respects callwaiting=no
Michiel van Baak [Tue, 19 Aug 2008 16:56:50 +0000 (16:56 +0000)]
chan_skinny now respects callwaiting=no

(closes issue #12691)
Reported by: sbisker
Patches:
      callwaitingv1.diff uploaded by wedhorn (license 30)
Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138851 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOops. put a decl in a generated file. My bad, but fixed now.
Steve Murphy [Tue, 19 Aug 2008 16:31:24 +0000 (16:31 +0000)]
Oops. put a decl in a generated file. My bad, but fixed now.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138845 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoThese changes are in regards to bug 13249, where users are being surprised by the...
Steve Murphy [Tue, 19 Aug 2008 15:59:12 +0000 (15:59 +0000)]
These changes are in regards to bug 13249, where users are being surprised by the changes made
to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if
they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x
installation where a "make samples" was executed, or where they hand-edited the
asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher).

(this commit does not totally solve 13249, at least not yet)

The change involves issueing a single warning while the AEL file is loading, if:
 1. app_set is present in the config file, and set to 1.6 or higher.
 2. there are double quotes in an assignment statement (eg x = "hi there";)
 3. the warning was not already issued.

The standalone app, aelparse, does not (yet) issue this warning. I'd have to
have it read in the asterisk.conf file, and that's a bit of hassle. I'll add
it if users request it, tho.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138815 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMention JID rather than SreenName in help messages
Philippe Sultan [Tue, 19 Aug 2008 15:58:39 +0000 (15:58 +0000)]
Mention JID rather than SreenName in help messages

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138814 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoLet it compile now, too (woops)
Sean Bright [Tue, 19 Aug 2008 00:10:56 +0000 (00:10 +0000)]
Let it compile now, too (woops)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138780 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAnd remove code we don't need anymore.
Sean Bright [Tue, 19 Aug 2008 00:09:38 +0000 (00:09 +0000)]
And remove code we don't need anymore.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138779 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoWhile we're at it, make this machine parseable too.
Sean Bright [Tue, 19 Aug 2008 00:08:27 +0000 (00:08 +0000)]
While we're at it, make this machine parseable too.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138778 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoChange event header to RegistrationTime to be more consistent (and avoid
Sean Bright [Mon, 18 Aug 2008 23:42:36 +0000 (23:42 +0000)]
Change event header to RegistrationTime to be more consistent (and avoid
breaking existing frameworks).  Pointed out by Laureano on #asterisk-dev.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agochannels/chan_misdn.c
Richard Mudgett [Mon, 18 Aug 2008 21:07:28 +0000 (21:07 +0000)]
channels/chan_misdn.c
*  Made bearer2str() use allowed_bearers_array[]
*  Made use the causes.h defines instead of hardcoded numbers.
*  Made use Asterisk presentation indicator values if either of the
mISDN presentation or screen options are negative.
*  Updated the misdn_set_opt application option descriptions.
*  Renamed the awkward Caller ID presentation misdn_set_opt
application option value not_screened to restricted.
Deprecated the not_screened option value.

channels/misdn/isdn_lib.c
*  Made use the causes.h defines instead of hardcoded numbers.
*  Fixed some spelling errors and typos.
*  Added all defined facility code strings to fac2str().

channels/misdn/isdn_lib.h
*  Added doxygen comments to struct misdn_bchannel.

channels/misdn/isdn_lib_intern.h
*  Added doxygen comments to struct misdn_stack.

channels/misdn_config.c
configs/misdn.conf.sample
*  Updated the mISDN presentation and screen parameter descriptions.

doc/tex/misdn.tex
*  Updated the misdn_set_opt application option descriptions.
*  Fixed some spelling errors and typos.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138738 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoChange the queue timeout priority logic into less ugly
Mark Michelson [Mon, 18 Aug 2008 20:23:11 +0000 (20:23 +0000)]
Change the queue timeout priority logic into less ugly
and confusing code pieces. Clarify the logic within
queues.conf.sample.

(closes issue #12690)
Reported by: atis
Patches:
      queue_timeoutpriority.patch uploaded by atis (license 242)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138694 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138685 via svnmerge from
Mark Michelson [Mon, 18 Aug 2008 20:04:10 +0000 (20:04 +0000)]
Merged revisions 138685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138687 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRemove option that isn't valid here.
Jason Parker [Mon, 18 Aug 2008 15:54:07 +0000 (15:54 +0000)]
Remove option that isn't valid here.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138631 65c4cc65-6c06-0410-ace0-fbb531ad65f3