Commit Graph

16143 Commits

Author SHA1 Message Date
Tilghman Lesher
6f43982fee Merged revisions 141504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r141504 | tilghman | 2008-09-06 10:26:45 -0500 (Sat, 06 Sep 2008) | 12 lines

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/branches/1.6.0@141505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-06 15:28:04 +00:00
Michiel van Baak
daad13b139 Blocked revisions 141464 via svnmerge
........
r141464 | mvanbaak | 2008-09-06 14:03:11 +0200 (Sat, 06 Sep 2008) | 23 lines

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/branches/1.6.0@141465 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-06 12:03:59 +00:00
Mark Michelson
627035849f Blocked revisions 141425 via svnmerge
........
r141425 | mmichelson | 2008-09-05 17:03:26 -0500 (Fri, 05 Sep 2008) | 3 lines

Fix func_curl compilation


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@141426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 22:06:05 +00:00
Mark Michelson
8628ad06ae Merged revisions 141367 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r141367 | mmichelson | 2008-09-05 16:12:09 -0500 (Fri, 05 Sep 2008) | 15 lines

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/branches/1.6.0@141368 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 21:13:06 +00:00
Tilghman Lesher
d216251bf4 Blocked revisions 141328 via svnmerge
........
r141328 | tilghman | 2008-09-05 14:12:03 -0500 (Fri, 05 Sep 2008) | 8 lines

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/branches/1.6.0@141329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 19:13:10 +00:00
Mark Michelson
c2ff4c297d Blocked revisions 141271 via svnmerge
................
r141271 | mmichelson | 2008-09-05 11:36:48 -0500 (Fri, 05 Sep 2008) | 18 lines

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/branches/1.6.0@141274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 16:37:13 +00:00
Mark Michelson
f498adab1b Blocked revisions 141218 via svnmerge
................
r141218 | mmichelson | 2008-09-05 11:03:11 -0500 (Fri, 05 Sep 2008) | 21 lines

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/branches/1.6.0@141219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 16:05:03 +00:00
Steve Murphy
90d877b2da Merged revisions 141157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r141157 | murf | 2008-09-05 08:18:43 -0600 (Fri, 05 Sep 2008) | 9 lines

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/branches/1.6.0@141158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 14:24:10 +00:00
Steve Murphy
82f8e1f824 Merged revisions 141115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r141115 | murf | 2008-09-04 17:31:41 -0600 (Thu, 04 Sep 2008) | 78 lines

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/branches/1.6.0@141116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-04 23:47:51 +00:00
Jeff Peeler
4ee5b75c5c Merged revisions 141039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r141039 | jpeeler | 2008-09-04 12:27:56 -0500 (Thu, 04 Sep 2008) | 15 lines

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/branches/1.6.0@141086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-04 18:35:26 +00:00
Mark Michelson
dc4224c694 Merged revisions 140975 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140975 | mmichelson | 2008-09-03 15:16:12 -0500 (Wed, 03 Sep 2008) | 4 lines

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/branches/1.6.0@140976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 20:18:14 +00:00
Michiel van Baak
c58e07d629 Blocked revisions 140938 via svnmerge
........
r140938 | mvanbaak | 2008-09-03 20:06:35 +0200 (Wed, 03 Sep 2008) | 12 lines

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/branches/1.6.0@140939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 18:07:54 +00:00
Mark Michelson
806e6136ae Blocked revisions 140887 via svnmerge
........
r140887 | mmichelson | 2008-09-03 09:41:54 -0500 (Wed, 03 Sep 2008) | 3 lines

Fix compilation


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:43:24 +00:00
Mark Michelson
b84c5a7ef5 Blocked revisions 140860 via svnmerge
................
r140860 | mmichelson | 2008-09-03 09:31:33 -0500 (Wed, 03 Sep 2008) | 17 lines

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/branches/1.6.0@140864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:32:24 +00:00
Steve Murphy
fa34fdcb43 Merged revisions 140749 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140749 | murf | 2008-09-02 17:44:04 -0600 (Tue, 02 Sep 2008) | 11 lines

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/branches/1.6.0@140827 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:17:58 +00:00
Steve Murphy
a3b41b28b6 Merged revisions 140692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140692 | murf | 2008-09-02 16:55:12 -0600 (Tue, 02 Sep 2008) | 13 lines

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/branches/1.6.0@140826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:16:02 +00:00
Steve Murphy
a561485ccf Merged revisions 140691 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140691 | murf | 2008-09-02 16:50:59 -0600 (Tue, 02 Sep 2008) | 22 lines

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/branches/1.6.0@140825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:13:50 +00:00
Sean Bright
ac45770aea Blocked revisions 140821 via svnmerge
........
r140821 | seanbright | 2008-09-03 09:48:12 -0400 (Wed, 03 Sep 2008) | 10 lines

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/branches/1.6.0@140822 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 13:50:06 +00:00
Russell Bryant
f6f5ba6adc Merged revisions 140817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140817 | russell | 2008-09-03 08:26:43 -0500 (Wed, 03 Sep 2008) | 12 lines

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/branches/1.6.0@140818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 13:27:14 +00:00
Mark Michelson
4eaa38b42b Blocked revisions 140752 via svnmerge
................
r140752 | mmichelson | 2008-09-02 18:48:25 -0500 (Tue, 02 Sep 2008) | 14 lines

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/branches/1.6.0@140754 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 23:50:11 +00:00
Mark Michelson
6edd73586e Blocking some revision. I guess I forgot to
commit this earlier. Oh well.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 23:49:52 +00:00
Sean Bright
b1d895dba9 Merged revisions 140606 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140606 | seanbright | 2008-09-02 14:15:54 -0400 (Tue, 02 Sep 2008) | 16 lines

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/branches/1.6.0@140607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 18:17:42 +00:00
Russell Bryant
08966a95de Merged revisions 140566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140566 | russell | 2008-09-02 10:11:53 -0500 (Tue, 02 Sep 2008) | 2 lines

Update instructions for getting libresample

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140567 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:12:24 +00:00
Russell Bryant
a81f609617 Blocked revisions 140563 via svnmerge
........
r140563 | russell | 2008-09-02 10:09:20 -0500 (Tue, 02 Sep 2008) | 3 lines

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/branches/1.6.0@140564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:09:44 +00:00
Sean Bright
8076234eb5 Blocked revisions 140559 via svnmerge
........
r140559 | seanbright | 2008-09-02 10:41:41 -0400 (Tue, 02 Sep 2008) | 4 lines

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/branches/1.6.0@140560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 14:42:26 +00:00
Mark Michelson
8767b7911b Blocked revisions 140433 via svnmerge
........
r140433 | mmichelson | 2008-08-29 11:24:37 -0500 (Fri, 29 Aug 2008) | 10 lines

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/branches/1.6.0@140434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 16:25:17 +00:00
Mark Michelson
f5004d1681 Blocked revisions 140422 via svnmerge
................
r140422 | mmichelson | 2008-08-29 11:06:09 -0500 (Fri, 29 Aug 2008) | 20 lines

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/branches/1.6.0@140423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 16:06:42 +00:00
Mark Michelson
eb27b67366 Blocked revisions 140418 via svnmerge
................
r140418 | mmichelson | 2008-08-29 10:32:02 -0500 (Fri, 29 Aug 2008) | 18 lines

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/branches/1.6.0@140419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 15:32:31 +00:00
Tilghman Lesher
eb2623b1d9 Blocked revisions 140355 via svnmerge
........
r140355 | tilghman | 2008-08-27 18:23:56 -0500 (Wed, 27 Aug 2008) | 2 lines

Oops

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 23:24:38 +00:00
Mark Michelson
b2f6976dbc Revert commit 140302. Should not be merging
changes like that into a release-candidate branch



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 20:15:29 +00:00
Mark Michelson
f94f437af6 Merged revisions 140301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140301 | mmichelson | 2008-08-27 15:11:22 -0500 (Wed, 27 Aug 2008) | 19 lines

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/branches/1.6.0@140302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 20:13:40 +00:00
Tilghman Lesher
5a8fb7cc81 Blocked revisions 140201 via svnmerge
........
r140201 | tilghman | 2008-08-26 13:46:07 -0500 (Tue, 26 Aug 2008) | 2 lines

OpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@140202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:46:54 +00:00
Russell Bryant
0a4475f66a Merged revisions 140169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140169 | russell | 2008-08-26 13:11:49 -0500 (Tue, 26 Aug 2008) | 4 lines

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/branches/1.6.0@140170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:12:08 +00:00
Tilghman Lesher
878517aa7c Blocked revisions 140167 via svnmerge
........
r140167 | tilghman | 2008-08-26 13:05:58 -0500 (Tue, 26 Aug 2008) | 5 lines

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/branches/1.6.0@140168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:06:34 +00:00
Russell Bryant
8a03188053 Blocked revisions 140061 via svnmerge
................
r140061 | russell | 2008-08-26 11:10:06 -0500 (Tue, 26 Aug 2008) | 14 lines

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/branches/1.6.0@140062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 16:10:28 +00:00
Steve Murphy
56ed3a4ce0 Blocked revisions 140057 via svnmerge
........
r140057 | murf | 2008-08-26 09:57:49 -0600 (Tue, 26 Aug 2008) | 21 lines

(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/branches/1.6.0@140058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 15:59:45 +00:00
Russell Bryant
5b2bb04b40 Blocked revisions 140053 via svnmerge
................
r140053 | russell | 2008-08-26 10:29:25 -0500 (Tue, 26 Aug 2008) | 23 lines

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/branches/1.6.0@140054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 15:29:46 +00:00
Tilghman Lesher
c3845ff6b6 Blocked revisions 139981 via svnmerge
........
r139981 | tilghman | 2008-08-25 18:13:32 -0500 (Mon, 25 Aug 2008) | 7 lines

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/branches/1.6.0@139982 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 23:14:08 +00:00
Sean Bright
1b28d6f0c3 Merged revisions 139915 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139915 | seanbright | 2008-08-25 17:32:10 -0400 (Mon, 25 Aug 2008) | 17 lines

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/branches/1.6.0@139918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:33:21 +00:00
Terry Wilson
0de177bc47 Merged revisions 139870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139870 | twilson | 2008-08-25 15:59:58 -0500 (Mon, 25 Aug 2008) | 10 lines

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/branches/1.6.0@139872 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:05:57 +00:00
Mark Michelson
7fd12fbedd Blocked revisions 139832 via svnmerge
........
r139832 | mmichelson | 2008-08-25 12:24:02 -0500 (Mon, 25 Aug 2008) | 10 lines

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/branches/1.6.0@139833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 17:24:36 +00:00
Tilghman Lesher
0e3107d1ff Blocked revisions 139775 via svnmerge
........
r139775 | tilghman | 2008-08-25 11:02:56 -0500 (Mon, 25 Aug 2008) | 7 lines

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/branches/1.6.0@139776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 16:03:32 +00:00
Steve Murphy
ee9f8015b6 Merged revisions 139770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139770 | murf | 2008-08-25 09:54:18 -0600 (Mon, 25 Aug 2008) | 17 lines

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/branches/1.6.0@139774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 16:00:03 +00:00
Mark Michelson
4629d13de9 Blocked revisions 139771 via svnmerge
................
r139771 | mmichelson | 2008-08-25 10:55:10 -0500 (Mon, 25 Aug 2008) | 19 lines

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/branches/1.6.0@139772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 15:55:35 +00:00
Tilghman Lesher
ba6a7f8c98 Merged revisions 139707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139707 | tilghman | 2008-08-24 11:26:48 -0500 (Sun, 24 Aug 2008) | 2 lines

Memory leak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@139708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-24 16:30:54 +00:00
Tilghman Lesher
5559f3c2fa Blocked revisions 139704 via svnmerge
........
r139704 | tilghman | 2008-08-24 11:23:15 -0500 (Sun, 24 Aug 2008) | 2 lines

Eliminate open coding of ast_str

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@139705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-24 16:23:59 +00:00
Steve Murphy
41ed986072 Merged revisions 139662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139662 | murf | 2008-08-22 16:32:35 -0600 (Fri, 22 Aug 2008) | 14 lines

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/branches/1.6.0@139671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:35:14 +00:00
Steve Murphy
ee980c4a33 Merged revisions 139627 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139627 | murf | 2008-08-22 16:03:13 -0600 (Fri, 22 Aug 2008) | 59 lines

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/branches/1.6.0@139628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:09:31 +00:00
Mark Michelson
503289d053 Blocked revisions 139563 via svnmerge
........
r139563 | mmichelson | 2008-08-22 15:20:58 -0500 (Fri, 22 Aug 2008) | 15 lines

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/branches/1.6.0@139564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:21:22 +00:00
Mark Michelson
df90016cf2 Blocked revisions 139558 via svnmerge
........
r139558 | mmichelson | 2008-08-22 15:02:35 -0500 (Fri, 22 Aug 2008) | 9 lines

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/branches/1.6.0@139559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:03:31 +00:00