Joshua Colp 136f214bca Merged revisions 188947 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
  r188947 | file | 2009-04-17 11:44:56 -0300 (Fri, 17 Apr 2009) | 22 lines
  
  Merged revisions 188946 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r188946 | file | 2009-04-17 11:41:25 -0300 (Fri, 17 Apr 2009) | 15 lines
    
    Fix a bug where a value used to create the channel name was bogus.
    
    This commit fixes the scenario where an incoming call is authenticated
    using a peer entry. Previously the channel name was created using either
    the username setting from the sip.conf entry or the IP address that the
    call came from. Now the channel name will be created using the peer name
    itself. This commit will not change the way the channel name is generated
    for users or friends.
    
    (closes issue #14256)
    Reported by: Nick_Lewis
    Patches:
          chan_sip.c-chname.patch uploaded by Nick (license 657)
    Tested by: Nick_Lewis, file
  ........
................


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

2009-04-17 14:48:50 +00:00

..

h323

Merged revisions 184910 via svnmerge from

2009-03-30 13:57:30 +00:00

misdn

Merged revisions 185122 via svnmerge from

2009-03-30 20:50:00 +00:00

xpmr

Merged revisions 159050 via svnmerge from

2008-11-25 05:05:18 +00:00

chan_agent.c

Merged revisions 171691 via svnmerge from

2009-01-27 22:01:52 +00:00

chan_alsa.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:32:47 +00:00

chan_console.c

Merged revisions 157039 via svnmerge from

2008-11-15 04:09:13 +00:00

chan_dahdi.c

Merged revisions 188938 via svnmerge from

2009-04-17 14:28:45 +00:00

chan_gtalk.c

Merged revisions 185363 via svnmerge from

2009-03-31 17:48:43 +00:00

chan_h323.c

Merged revisions 182722 via svnmerge from

2009-03-17 20:52:54 +00:00

chan_iax2.c

Merged revisions 184762 via svnmerge from

2009-03-27 19:17:22 +00:00

chan_jingle.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_local.c

Merged revisions 182211,182278 via svnmerge from

2009-03-16 17:38:50 +00:00

chan_mgcp.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

chan_misdn.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

chan_nbs.c

one more place I forgot

2008-05-22 17:50:40 +00:00

chan_oss.c

Merged revisions 171188 via svnmerge from

2009-01-26 00:04:28 +00:00

chan_phone.c

Merged revisions 160170-160172 via svnmerge from

2008-12-01 23:53:18 +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 188947 via svnmerge from

2009-04-17 14:48:50 +00:00

chan_skinny.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

chan_unistim.c

Merged revisions 184339 via svnmerge from

2009-03-25 22:02:20 +00:00

chan_usbradio.c

Merged revisions 159050 via svnmerge from

2008-11-25 05:05:18 +00:00

chan_vpb.cc

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +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

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

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

iax2-parser.c

Merged revisions 143031 via svnmerge from

2008-09-13 13:58:15 +00:00

iax2-parser.h

Merged revisions 181371 via svnmerge from

2009-03-11 17:40:10 +00:00

iax2-provision.c

Merged revisions 160663 via svnmerge from

2008-12-03 19:49:36 +00:00

iax2-provision.h

…

iax2.h

Merged revisions 175597 via svnmerge from

2009-02-13 20:48:47 +00:00

Makefile

Merged revisions 187906 via svnmerge from

2009-04-10 20:28:18 +00:00

misdn_config.c

Merged revisions 185123 via svnmerge from

2009-03-30 20:50:55 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

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