David Vossel fbfafb59ba Merged revisions 282235 via svnmerge from ...

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

........
  r282235 | dvossel | 2010-08-13 13:54:53 -0500 (Fri, 13 Aug 2010) | 16 lines
  
  only do magic pickup when notifycid is enabled
  
  A new way of doing BLF pickup was introduced into 1.6.2.  This feature
  adds a call-id value into the XML of a SIP_NOTIFY message sent to alert
  a subscriber that a device is ringing.  This option should only be enabled
  when the new 'notifycid' option is set... but this was not the case.  Instead
  the call-id value was included for every RINGING Notify message, which
  caused a regression for people who used other methods for call pickup.
  
  (closes issue #17633)
  Reported by: urosh
  Patches:
        chan_sip.txt uploaded by urosh (license )
        blf_cid_issue.diff uploaded by dvossel (license 671)
  Tested by: dvossel, urosh, okrief, alecdavis
........


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

2010-08-13 18:58:10 +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

Fix parsing of IPv6 address literals in outboundproxy

2010-08-11 13:30:59 +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

Add some more stuff to copy from 281429.

2010-08-09 23:04:02 +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

Merged revisions 282235 via svnmerge from

2010-08-13 18:58:10 +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

Fix a call to analog_set_pulsedial() not setting 0 or 1 only.

2010-08-11 20:30:29 +00:00

sig_analog.h

Fix a call to analog_set_pulsedial() not setting 0 or 1 only.

2010-08-11 20:30:29 +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