Commit Graph

16443 Commits

Author SHA1 Message Date
Tilghman Lesher
4fdd3c1fa8 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.1@141330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 19:14:06 +00:00
Mark Michelson
9336eafb9b 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.1@141277 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 16:37:35 +00:00
Mark Michelson
57a6c1e97f 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.1@141220 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 16:05:17 +00:00
Steve Murphy
aaff8a2a20 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.1@141159 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-05 14:25:49 +00:00
Steve Murphy
ea665ed7d9 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.1@141117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-04 23:52:01 +00:00
Jeff Peeler
2a02fcceff 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.1@141042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-04 17:28:41 +00:00
Mark Michelson
c760268cb8 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.1@140977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 20:18:58 +00:00
Michiel van Baak
0de49b57b9 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.1@140940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 18:10:30 +00:00
Mark Michelson
04a5eb09f9 Merged revisions 140887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
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.1@140888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:42:54 +00:00
Steve Murphy
09fe3752a5 Merged revisions 140824 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140824 | murf | 2008-09-03 08:01:27 -0600 (Wed, 03 Sep 2008) | 21 lines

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.

(closes issue #13249)
Reported by: dimas
Patches:
      ael-MSet.diff uploaded by murf (license 17)
Tested by: dimas, murf
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@140886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:39:04 +00:00
Mark Michelson
df5a83a941 Merged revisions 140860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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.1@140867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 14:32:57 +00:00
Sean Bright
71d4b5acde 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.1@140823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 13:50:55 +00:00
Russell Bryant
d01749ba43 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.1@140819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-03 13:27:33 +00:00
Mark Michelson
315bd4e87d Merged revisions 140752 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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.1@140755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 23:51:03 +00:00
Steve Murphy
9f94f365a7 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.1@140750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 23:46:34 +00:00
Steve Murphy
08146f95bc 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.1@140695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 23:01:35 +00:00
Steve Murphy
0c8172a97c 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.1@140693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 22:58:50 +00:00
Sean Bright
b354d1ce51 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.1@140608 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 18:18:30 +00:00
Russell Bryant
9c22591766 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.1@140568 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:13:10 +00:00
Russell Bryant
a4eea7702d Merged revisions 140563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
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.1@140565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 15:10:04 +00:00
Sean Bright
ff8668fdbc 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.1@140561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-02 14:43:01 +00:00
Jeff Peeler
f86752e905 Merged revisions 140491 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r140491 | jpeeler | 2008-08-29 12:53:32 -0500 (Fri, 29 Aug 2008) | 2 lines

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/branches/1.6.1@140492 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 17:55:14 +00:00
Mark Michelson
6ed6a5ae29 Merged revisions 140489 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140489 | mmichelson | 2008-08-29 12:47:17 -0500 (Fri, 29 Aug 2008) | 30 lines

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/branches/1.6.1@140490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 17:48:07 +00:00
Mark Michelson
5b5666c301 Merged revisions 140433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
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.1@140435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 16:25:46 +00:00
Mark Michelson
b8520de916 Merged revisions 140422 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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.1@140425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 16:11:50 +00:00
Mark Michelson
41b37a348f Merged revisions 140418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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.1@140420 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-29 15:33:49 +00:00
Tilghman Lesher
9a53ace006 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.1@140357 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 23:25:23 +00:00
Mark Michelson
22ca4c9392 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.1@140303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-27 20:14:24 +00:00
Jeff Peeler
d0f43c3266 Merged revisions 140205 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r140205 | jpeeler | 2008-08-26 13:48:55 -0500 (Tue, 26 Aug 2008) | 17 lines

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/branches/1.6.1@140206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:50:47 +00:00
Tilghman Lesher
e866ee840f 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.1@140204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:47:51 +00:00
Tilghman Lesher
7ea8a1943e 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.1@140203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:47:27 +00:00
Russell Bryant
0721736fb8 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.1@140171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 18:12:24 +00:00
Russell Bryant
b2039fd988 Merged revisions 140061 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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.1@140063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 16:11:23 +00:00
Steve Murphy
d3110eacca 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.1@140059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 16:01:37 +00:00
Russell Bryant
192e6166df Merged revisions 140053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
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.1@140055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-26 15:31:13 +00:00
Tilghman Lesher
909fbe8947 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.1@139983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 23:14:44 +00:00
Jeff Peeler
f7d3198c30 Merged revisions 139928 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139928 | jpeeler | 2008-08-25 16:48:51 -0500 (Mon, 25 Aug 2008) | 11 lines

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/branches/1.6.1@139929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:49:34 +00:00
Sean Bright
9285cf8c21 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.1@139919 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:34:23 +00:00
Terry Wilson
02c6a57fdc 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.1@139874 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 21:13:22 +00:00
Mark Michelson
7ac4804866 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.1@139834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 17:25:09 +00:00
Steve Murphy
dfe7bf451a 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.1@139778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 16:05:30 +00:00
Tilghman Lesher
ae7db3f23d 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.1@139777 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 16:04:06 +00:00
Mark Michelson
1dd5db618b 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.1@139773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-25 15:55:56 +00:00
Tilghman Lesher
829eca6a49 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.1@139709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-24 16:36:09 +00:00
Tilghman Lesher
964eb15bbe 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.1@139706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-24 16:24:35 +00:00
Steve Murphy
37d5dcdfa9 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.1@139674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:37:08 +00:00
Steve Murphy
41138ad333 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.1@139629 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 22:15:36 +00:00
Jeff Peeler
2090a58d2e Merged revisions 139624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r139624 | jpeeler | 2008-08-22 16:57:32 -0500 (Fri, 22 Aug 2008) | 13 lines

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/branches/1.6.1@139625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 21:58:38 +00:00
Jeff Peeler
13a4d48c7c Merged revisions 139622 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r139622 | jpeeler | 2008-08-22 16:52:20 -0500 (Fri, 22 Aug 2008) | 1 line

remove extra comma typo
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@139623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 21:53:57 +00:00
Mark Michelson
769e874125 Merged revisions 139563 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
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.1@139565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-22 20:21:49 +00:00