Jeff Peeler 3da327e87d Merged revisions 281391 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r281391 | jpeeler | 2010-08-09 15:07:29 -0500 (Mon, 09 Aug 2010) | 20 lines
  
  Merged revisions 281390 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r281390 | jpeeler | 2010-08-09 15:04:30 -0500 (Mon, 09 Aug 2010) | 13 lines
    
    Prevent loss of Caller ID information set on local channel after masquerade.
    
    Caller ID set on the channel before a masquerade occurs when using a local
    channel would cause the information to be lost. The problem was that the
    information was set on a channel destined to be hung up. The somewhat confusing
    fix is to detect if any Caller ID has been set on the channel and if so 
    preswap the Caller ID data so that basically the masquerade puts the data back.
    
    (closes issue #17138)
    Reported by: kobaz
    
    Review: https://reviewboard.asterisk.org/r/847/
  ........
................


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

2010-08-09 20:43:54 +00:00

..

h323

Comment out a rule that likes to run implicitly unnecessarily, breaking builds

2010-06-03 14:48:09 +00:00

misdn

Enhancements to connected line and redirecting work.

2010-05-17 15:36:31 +00:00

sip

Give test category missing leading slash

2010-07-28 20:49:26 +00:00

xpmr

AST-2009-005

2009-08-10 19:20:57 +00:00

chan_agent.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_alsa.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_bridge.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_console.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_dahdi.c

Merged revisions 280229 via svnmerge from

2010-07-28 20:12:16 +00:00

chan_gtalk.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_h323.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_iax2.c

Remove built-in AES code and use optional_api instead

2010-07-21 19:11:32 +00:00

chan_jingle.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_local.c

Merged revisions 281391 via svnmerge from

2010-08-09 20:43:54 +00:00

chan_mgcp.c

Check cur value before attempting a deref.

2010-08-04 14:04:07 +00:00

chan_misdn.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_multicast_rtp.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_nbs.c

Missed these two channel drivers on the codec_bits merge

2009-11-06 19:38:33 +00:00

chan_oss.c

Expand the caller ANI field to an ast_party_id

2010-07-14 16:58:03 +00:00

chan_phone.c

Expand the caller ANI field to an ast_party_id

2010-07-14 16:58:03 +00:00

chan_phone.h

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_sip.c

Fixed IPv6-related SIP parsing bugs.

2010-08-03 19:54:03 +00:00

chan_skinny.c

Add load priority order, such that preload becomes unnecessary in most cases

2010-07-20 19:35:02 +00:00

chan_unistim.c

ast_callerid restructuring

2010-07-14 15:48:36 +00:00

chan_usbradio.c

Use PRIx64 instead of PRId64 in format string.

2010-07-29 15:57:57 +00:00

chan_vpb.cc

Expand the caller ANI field to an ast_party_id

2010-07-14 16:58:03 +00:00

console_board.c

import the recent additions for video console into trunk,

2008-06-29 21:17:14 +00:00

console_gui.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

console_video.c

(closes issue #13557)

2008-10-09 14:17:33 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

iax2-parser.c

Informational message, not an error.

2010-01-28 20:00:09 +00:00

iax2-parser.h

Remove built-in AES code and use optional_api instead

2010-07-21 19:11:32 +00:00

iax2-provision.c

AST-2009-005

2009-08-10 19:20:57 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Expand codec bitfield from 32 bits to 64 bits.

2009-11-04 14:05:12 +00:00

Makefile

Extract sig_ss7 out of chan_dahdi.

2010-06-07 20:04:42 +00:00

misdn_config.c

Enhancements to connected line and redirecting work.

2010-05-17 15:36:31 +00:00

sig_analog.c

missed FXS kewl start polarityswitch when finally on hook.

2010-07-23 11:01:14 +00:00

sig_analog.h

Support FXS module Polarity Reversal on remote party Answer and Hangup

2010-07-22 23:14:50 +00:00

sig_pri.c

Fix compilation error in chan_dahdi (strdupa -> ast_strdupa).

2010-07-29 19:47:16 +00:00

sig_pri.h

Rename sig_pri_pri to sig_pri_span. More descriptive of concept.

2010-07-23 15:41:44 +00:00

sig_ss7.c

Expand the caller ANI field to an ast_party_id

2010-07-14 16:58:03 +00:00

sig_ss7.h

Extract sig_ss7_init_linkset() to sig_ss7.

2010-06-14 20:51:09 +00:00

vcodecs.c

Const-ify the world (or at least a good part of it)

2009-05-21 21:13:09 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

2008-07-14 16:50:54 +00:00