Commit Graph

3178 Commits

Author SHA1 Message Date
Tilghman Lesher
1c523df75c Recorded merge of revisions 154072 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r154072 | tilghman | 2008-11-03 16:28:12 -0600 (Mon, 03 Nov 2008) | 12 lines
  
  Merged revisions 154066 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r154066 | tilghman | 2008-11-03 16:27:10 -0600 (Mon, 03 Nov 2008) | 5 lines
    
    Attempting to expunge a mailbox when the mailstream is NULL will crash Asterisk.
    (Closes issue #13829)
    Reported by: jaroth
    Patch by: me (modified jaroth's patch)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@154092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 22:32:27 +00:00
Kevin P. Fleming
d660c03fdc Merged revision 153709 from trunk
------------------------------------------------------------------------
r153709 | kpfleming | 2008-11-02 17:34:39 -0600 (Sun, 02 Nov 2008) | 3 lines

instead of trying to forcibly load res_agi when app_stack is loaded (even if the administrator didn't want it loaded), use GCC weak symbols to determine whether it was loaded already or not; if it was loaded, then use it.


------------------------------------------------------------------------



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-03 00:21:04 +00:00
Kevin P. Fleming
1036849a42 import gcc 4.3.2 warning fixes from trunk, with a few changes specific to this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 23:56:13 +00:00
Terry Wilson
239f1d53bc Merged revisions 153181 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r153181 | twilson | 2008-10-31 13:55:33 -0500 (Fri, 31 Oct 2008) | 5 lines
  
  Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten.  Added a callback function to handle setting variables, etc. from w/in the bridging code.  Calls back into a nested function within the function calling ast_bridge_call
  
  (closes issue #13793)
  Reported by: greenfieldtech
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-31 22:11:11 +00:00
Mark Michelson
bc4cf44e6b Merged revisions 152646 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r152646 | mmichelson | 2008-10-29 15:53:53 -0500 (Wed, 29 Oct 2008) | 9 lines

If there was no named defined in a voicemail.conf mailbox
entry, then app_directory would crash when attempting to
read that entry from the file. We now check for the NULL
or empty string properly so that there will be no crash.

(closes issue #13804)
Reported by: bluecrow76


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:55:22 +00:00
Terry Wilson
c30b0d8d10 Small modification to putnopvut's patch to fix this issue. Thanks for all the help, putnopvut!
(closes issue #12884)
	    Reported by: bcnit
		    Patches:
			          12884v4-1.6.0-branch.patch uploaded by otherwiseguy (license 396)
	    Tested by: otherwiseguy



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 20:16:09 +00:00
Steve Murphy
039de710a7 Merged revisions 152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152605 | murf | 2008-10-28 23:47:13 -0600 (Tue, 28 Oct 2008) | 22 lines

Merged revisions 152538 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines

A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.

I hope this doesn't spoil some vast, eternal plan...


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:52:41 +00:00
Steve Murphy
f1da1c3957 Merged revisions 152536 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r152536 | murf | 2008-10-28 23:01:00 -0600 (Tue, 28 Oct 2008) | 57 lines

Merged revisions 152535 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r152535 | murf | 2008-10-28 22:36:32 -0600 (Tue, 28 Oct 2008) | 46 lines

The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the 
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
Why? because CDR's aren't generated via parking,
so nothing is needed, but if a transfer occurred,
there are critical things I need.

If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.

If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.

Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden 
(in trunk).

All the places that previously tested for 
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.

I tested this against the 4 common parking
scenarios:


1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.

2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.

3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.

4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.


No crash.

I also ran the scenarios above against valgrind, and accesses looked good.



........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 05:09:20 +00:00
Tilghman Lesher
2098685d9e Merged revisions 152467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines
  
  Merged revisions 152463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines
    
    Quoting in the wrong direction
    (Fixes AST-107)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 22:35:01 +00:00
Tilghman Lesher
a7a57a4f61 Merged revisions 152369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
  
  Merged revisions 152368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
    
    Reset all DIAL variables back to blank, in case Dial is called multiple times
    per call (which could otherwise lead to inconsistent status reports).
    (closes issue #13216)
     Reported by: ruddy
     Patches: 
           20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ruddy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-28 17:08:47 +00:00
Tilghman Lesher
95c0f16b9a Merged revisions 152134 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152134 | tilghman | 2008-10-27 11:24:11 -0500 (Mon, 27 Oct 2008) | 4 lines
  
  Oops, only delete the ARG variables once upon release.  The following section
  would have removed them again (removing variables from 2 stack frames, instead
  of just one).
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:42:07 +00:00
Jason Parker
d8814693ba Merged revisions 152132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r152132 | qwell | 2008-10-27 11:03:12 -0500 (Mon, 27 Oct 2008) | 7 lines
  
  Remove options argument parsing/syntax (it isn't used any longer)
  
  (closes issue #13789)
  Reported by: IgorG
  Patches:
        app_transfer.c.diff uploaded by IgorG (license 20)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@152133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-27 16:06:01 +00:00
Tilghman Lesher
2e70e247bc Merged revisions 151371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r151371 | tilghman | 2008-10-21 10:20:50 -0500 (Tue, 21 Oct 2008) | 5 lines
  
  Default file modes should always be full read and write, to allow the system
  administrator to make the decision of what permissions will actually be given,
  through the use of the process umask.
  (Closes issue# 13751)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@151372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-21 15:21:42 +00:00
Kevin P. Fleming
f0c712cf4b Merged revisions 151101 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r151101 | kpfleming | 2008-10-19 22:11:28 +0300 (Sun, 19 Oct 2008) | 13 lines
  
  cleaup of the TCP/TLS socket API:
  
  1) rename 'struct server_args' to 'struct ast_tcptls_session_args', to follow coding guidelines
  
  2) make ast_make_file_from_fd() static and rename it to something that indicates what it really is for (again coding guidelines)
  
  3) rename address variables inside 'struct ast_tcptls_session_args' to be more descriptive (dare i say it... coding guidelines)
  
  4) change ast_tcptls_client_start() to use the new 'remote_address' field of the session args for the destination of the connection, and use the 'local_address' field to bind() the socket to the proper source address, if one is supplied
  
  5) in chan_sip, ensure that we pass in the PP address we are bound to when creating outbound (client) connections, so that our connections will appear from the correct address
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@151135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-19 19:33:42 +00:00
Mark Michelson
362daccd6f Merged revisions 150257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r150257 | mmichelson | 2008-10-16 17:44:05 -0500 (Thu, 16 Oct 2008) | 9 lines

Answer the channel prior to checking for the 'a'
option in app_sms.

(closes issue #13675)
Reported by: alecdavis
Patches:
      app_sms.bug13675.148985.diff.txt uploaded by alecdavis (license 585)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@150258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-16 22:44:31 +00:00
Kevin P. Fleming
a890790280 Merged revisions 149384 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r149384 | kpfleming | 2008-10-15 10:55:47 +0200 (Wed, 15 Oct 2008) | 3 lines
  
  building this module depends on res_agi being built as well
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-16 09:19:35 +00:00
Tilghman Lesher
28e24b3dce Merged revisions 149588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r149588 | tilghman | 2008-10-15 10:30:21 -0500 (Wed, 15 Oct 2008) | 6 lines
  
  Minor spacing change
  (closes issue #13697)
   Reported by: alecdavis
   Patches: 
         app_echo.bug13697.103249.diff.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-15 15:31:03 +00:00
Mark Michelson
28aafe781b Merged revisions 149279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r149279 | mmichelson | 2008-10-14 18:57:46 -0500 (Tue, 14 Oct 2008) | 7 lines

When specifying an invalid timeout to Dial, take it
to mean that no timeout is desired.

(closes issue #13625)
Reported by: atis


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 23:58:10 +00:00
Mark Michelson
4e44db9dee Merged revisions 149201 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r149201 | mmichelson | 2008-10-14 17:41:13 -0500 (Tue, 14 Oct 2008) | 20 lines

Merged revisions 149200 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r149200 | mmichelson | 2008-10-14 17:40:42 -0500 (Tue, 14 Oct 2008) | 12 lines

Update the queue with the correct number of calls and
whether the call was completed within the service level
when a transfer takes place. This way, we do not "break"
the leastrecent and fewestcalls strategies by not logging
a call until after the transferred call has ended.

(closes issue #13395)
Reported by: Marquis
Patches:
      app_queue.c.transfer.patch uploaded by Marquis (license 32)


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149203 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 22:43:08 +00:00
Tilghman Lesher
80b2a0379f Merged revisions 149062 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r149062 | tilghman | 2008-10-14 15:16:48 -0500 (Tue, 14 Oct 2008) | 13 lines
  
  Merged revisions 149061 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r149061 | tilghman | 2008-10-14 15:09:06 -0500 (Tue, 14 Oct 2008) | 6 lines
    
    Check correct values in the return of ast_waitfor(); also, get rid of a
    possible memory leak.
    (closes issue #13658)
     Reported by: explidous
     Patch by: me
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@149063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 20:17:34 +00:00
Tilghman Lesher
81253add70 Merged revisions 148985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r148985 | tilghman | 2008-10-14 13:58:19 -0500 (Tue, 14 Oct 2008) | 6 lines
  
  App is ignoring 'p' parameter -- initial pause.
  (closes issue #13617)
   Reported by: alecdavis
   Patches: 
         app_sms.13oct.diff.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 18:59:43 +00:00
Tilghman Lesher
99b53314ad Merged revisions 148917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r148917 | tilghman | 2008-10-14 12:46:48 -0500 (Tue, 14 Oct 2008) | 11 lines
  
  Merged revisions 148916 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148916 | tilghman | 2008-10-14 12:41:08 -0500 (Tue, 14 Oct 2008) | 4 lines
    
    Ensure that mail headers are 7-bit clean, even when UTF-8 characters are used
    in headers like 'Subject' and 'To'.
    Closes AST-107.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 17:49:00 +00:00
Tilghman Lesher
40b39ff8aa Merged revisions 148868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r148868 | tilghman | 2008-10-14 10:15:45 -0500 (Tue, 14 Oct 2008) | 6 lines
  
  API differences in spandsp 0.0.6pre1 and higher
  (closes issue #13688)
   Reported by: irroot
   Patches: 
         app_fax-span6.patch uploaded by irroot (license 52) with minor modifications by me
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-14 15:18:10 +00:00
Tilghman Lesher
6757fc24bc Merged revisions 148268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r148268 | tilghman | 2008-10-10 11:31:31 -0500 (Fri, 10 Oct 2008) | 14 lines
  
  Merged revisions 148257 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148257 | tilghman | 2008-10-10 11:25:31 -0500 (Fri, 10 Oct 2008) | 7 lines
    
    User not notified of temporary greeting, if ODBC storage is in use.
    (closes issue #13659)
     Reported by: moliveras
     Patches: 
           20081009__bug13659.diff.txt uploaded by Corydon76 (license 14)
     Tested by: moliveras
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148269 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-10 16:37:12 +00:00
Sean Bright
5f980bc229 Merged revisions 148200 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r148200 | seanbright | 2008-10-09 20:42:13 -0400 (Thu, 09 Oct 2008) | 12 lines

Don't include logger.h in asterisk.h by default as it is causing problems building
app_voicemail.  Instead, include it where it is needed.  This turned out to be a
relatively minor issue because other headers include logger.h as well.

Need to test -addons before merging this back to 1.6.0.

(closes issue #13605)
Reported by: tomo1657
Patches: 
      13605_seanbright.diff uploaded by seanbright (license 71)
Tested by: mmichelson

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148240 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-10 01:33:34 +00:00
Mark Michelson
87564d3669 Merged revisions 148144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r148144 | mmichelson | 2008-10-09 18:30:47 -0500 (Thu, 09 Oct 2008) | 10 lines

Read the callerid in the correct order and make sure to
read the Urgent flag value from the IMAP headers.

(closes issue #13652)
Reported by: jaroth
Patches:
      imapheaders.patch uploaded by jaroth (license 50)



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-09 23:31:57 +00:00
Tilghman Lesher
4fba97612a Merged revisions 148000 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r148000 | tilghman | 2008-10-09 14:39:34 -0500 (Thu, 09 Oct 2008) | 11 lines
  
  Merged revisions 147997 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r147997 | tilghman | 2008-10-09 14:38:33 -0500 (Thu, 09 Oct 2008) | 4 lines
    
    When blank, callerid name and number should display "unknown caller" in voicemail
    emails.
    (Closes issue #13643)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@148006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-09 19:40:43 +00:00
Mark Michelson
97766e8a6d Merged revisions 147714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r147714 | mmichelson | 2008-10-08 17:32:37 -0500 (Wed, 08 Oct 2008) | 8 lines

Some small tweaks regarding realtime conference announcements.

(closes issue #13522)
Reported by: DEA
Patches:
      meetme-rt-fixes.txt uploaded by DEA (license 3)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@147719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-08 22:33:43 +00:00
Tilghman Lesher
63f2ef93b7 Merged revisions 147592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r147592 | tilghman | 2008-10-08 14:08:32 -0500 (Wed, 08 Oct 2008) | 8 lines
  
  Correct a typo in the help; also, ensure that the date and time are correctly
  set, if not specified in the message.
  (Closes issue #13594, closes issue #13595)
  Reported by: alecdavis
   Patches: 
         20081001__bug13595.diff.txt uploaded by Corydon76 (license 14)
   Tested by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@147593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-08 19:09:25 +00:00
Mark Michelson
cade4d842b Merged revisions 147518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r147518 | file | 2008-10-08 09:53:51 -0500 (Wed, 08 Oct 2008) | 9 lines

Merged revisions 147517 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r147517 | file | 2008-10-08 11:51:42 -0300 (Wed, 08 Oct 2008) | 2 lines
  
  If we receive DTMF make sure that the state of the speech structure goes back to being not ready. (issue #LUMENVOX-8)
........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@147519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-08 15:10:08 +00:00
Sean Bright
ec036b2990 Merged revisions 147194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r147194 | seanbright | 2008-10-07 12:52:02 -0400 (Tue, 07 Oct 2008) | 10 lines

Merged revisions 147193 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r147193 | seanbright | 2008-10-07 12:48:30 -0400 (Tue, 07 Oct 2008) | 2 lines

Make 'imapsecret' an alias to 'imappassword' in voicemail.conf.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@147196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-07 16:54:35 +00:00
Sean Bright
b0d673495e Merged revisions 147050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r147050 | seanbright | 2008-10-07 08:01:36 -0400 (Tue, 07 Oct 2008) | 8 lines

Make sure to compare the correct number of characters when special-casing
our DAHDI operator mode stuff.  Technically, it would work fine, as 'DAH'
is currently unique amongst our channel technologies, but as Jared points
out:

  <@jsmith> Sure... as long as the technology starts whith DAH.... but
            it could be DAHDOO!

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@147052 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-07 12:03:57 +00:00
Tilghman Lesher
deb3c05634 Merged revisions 146802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r146802 | tilghman | 2008-10-06 16:09:05 -0500 (Mon, 06 Oct 2008) | 15 lines
  
  Merged revisions 146799 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r146799 | tilghman | 2008-10-06 15:52:04 -0500 (Mon, 06 Oct 2008) | 8 lines
    
    Dialplan functions should not actually return 0, unless they have modified the
    workspace.  To signal an error (and no change to the workspace), -1 should be
    returned instead.
    (closes issue #13340)
     Reported by: kryptolus
     Patches: 
           20080827__bug13340__2.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@146838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-06 21:32:42 +00:00
Tilghman Lesher
e2fe89b9f1 Merged revisions 145428 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r145428 | tilghman | 2008-10-01 10:44:06 -0500 (Wed, 01 Oct 2008) | 7 lines
  
  Initializing buffer prevents a segfault when arguments are incomplete.
  (closes issue #13471)
   Reported by: alecdavis
   Patches: 
         20080916__bug13471.diff.txt uploaded by Corydon76 (license 14)
   Tested by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@145430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-01 15:45:58 +00:00
Michiel van Baak
32330c68b7 Merged revisions 144879 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144879 | mvanbaak | 2008-09-27 02:49:24 +0200 (Sat, 27 Sep 2008) | 2 lines

fix a couple of CLI commands that did not have a help description.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@144881 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-27 01:08:11 +00:00
Steve Murphy
6f1745168e Merged revisions 144569 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r144569 | murf | 2008-09-25 16:21:28 -0600 (Thu, 25 Sep 2008) | 14 lines

(closes issue #13557)
Reported by: nickpeirson

The user attached a patch, but the license is not yet
recorded. I took the liberty of finding and replacing
ALL index() calls with strchr() calls, and that
involves more than just main/pbx.c;

chan_oss, app_playback, func_cut also had calls
to index(), and I changed them out. 1.4 had no
references to index() at all.



........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@144578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-25 22:25:34 +00:00
Tilghman Lesher
da2cbacd29 Merged revisions 143405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r143405 | tilghman | 2008-09-17 15:57:58 -0500 (Wed, 17 Sep 2008) | 13 lines
  
  Merged revisions 143404 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r143404 | tilghman | 2008-09-17 15:55:47 -0500 (Wed, 17 Sep 2008) | 6 lines
    
    When callerid is blank, we want to use "unknown caller" in those cases, too.
    (closes issue #13486)
     Reported by: tomo1657
     Patches: 
           20080917__bug13486.diff.txt uploaded by Corydon76 (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@143407 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-17 20:59:45 +00:00
Tilghman Lesher
25dd2fa2f3 Merged revisions 143031 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r143031 | tilghman | 2008-09-13 08:54:15 -0500 (Sat, 13 Sep 2008) | 8 lines
  
  Repair IAXVAR implementation so that it works again (regression?)
  (closes issue #13354)
   Reported by: adomjan
   Patches: 
         20080828__bug13354.diff.txt uploaded by Corydon76 (license 14)
         20080829__bug13354__1.6.0.diff.txt uploaded by Corydon76 (license 14)
   Tested by: Corydon76, adomjan
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@143033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-13 13:58:15 +00:00
Tilghman Lesher
9ac2b6709d Merged revisions 142745 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142745 | tilghman | 2008-09-12 11:38:55 -0500 (Fri, 12 Sep 2008) | 12 lines

Merged revisions 142744 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r142744 | tilghman | 2008-09-12 11:38:02 -0500 (Fri, 12 Sep 2008) | 4 lines

Missing merge from 1.2 fixes errant exit on DTMF, only when language is Italian
(cf commit 34242)
(Closes issue #7353)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@142747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 16:40:12 +00:00
Steve Murphy
bc73329607 Merged revisions 142676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r142676 | murf | 2008-09-11 22:50:48 -0600 (Thu, 11 Sep 2008) | 40 lines

Merged revisions 142675 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r142675 | murf | 2008-09-11 22:29:34 -0600 (Thu, 11 Sep 2008) | 29 lines

Tested by: sergee, murf, chris-mac, andrew, KNK

This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from 
the ground up!

This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.

Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.

While I dearly hope that this patch overcomes all problems, and 
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.

** trunk note: some code to suppress the h exten being run 
from app_queue was added; for the 'continue' option available
only in trunk/1.6.x.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@142678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 05:03:09 +00:00
Mark Michelson
92d81812a4 Merging Revision 142090 from 1.6.0.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@142143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 16:47:35 +00:00
Mark Michelson
8ead2e373f Merged revisions 141998 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r141998 | mmichelson | 2008-09-09 07:32:38 -0500 (Tue, 09 Sep 2008) | 7 lines

Use ast_debug for debug messages. I was wondering why debug
messages weren't showing up when I had set the debug level
high for just app_queue.c. It's because we were only checking
the global option_debug variable instead of using the awesome
macro which checks both the global and file-specific value


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@142001 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 12:34:45 +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
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
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
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
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
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
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
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