Tilghman Lesher af9f8bf291 Merged revisions 137848 via svnmerge from ...

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

................
r137848 | tilghman | 2008-08-14 11:52:43 -0500 (Thu, 14 Aug 2008) | 17 lines

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

........
r137847 | tilghman | 2008-08-14 11:47:30 -0500 (Thu, 14 Aug 2008) | 9 lines

When creating the secondary subchannel name, it is necessary to compare to
the existing channel name without the "Zap/" or "DAHDI/" prefix, since our
test string is also without that prefix.
(closes issue #13027)
 Reported by: dferrer
 Patches: 
       chan_zap-1.4.21.1_fix2.patch uploaded by dferrer (license 525)
       (Slightly modified by me, to compensate for both names)

........

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


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

2008-08-14 16:54:22 +00:00

..

h323

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

misdn

Merged revisions 132883,132966 via svnmerge from

2008-07-23 16:42:28 +00:00

xpmr

Allow chan_usbradio to compile again.

2007-10-17 16:09:01 +00:00

chan_agent.c

Merged revisions 133665 via svnmerge from

2008-07-25 17:26:38 +00:00

chan_alsa.c

Merged revisions 118955,118957 via svnmerge from

2008-05-29 17:42:28 +00:00

chan_console.c

Merged revisions 135439 via svnmerge from

2008-08-04 15:02:44 +00:00

chan_dahdi.c

Merged revisions 137848 via svnmerge from

2008-08-14 16:54:22 +00:00

chan_features.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_gtalk.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

chan_h323.c

Merged revisions 123114 via svnmerge from

2008-06-16 20:03:18 +00:00

chan_iax2.c

Merged revisions 135748 via svnmerge from

2008-08-05 21:38:29 +00:00

chan_jingle.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

chan_local.c

Merged revisions 125853 via svnmerge from

2008-06-27 16:01:47 +00:00

chan_mgcp.c

Merged revisions 135197 via svnmerge from

2008-08-01 19:30:31 +00:00

chan_misdn.c

Merged revisions 136594 via svnmerge from

2008-08-07 19:19:49 +00:00

chan_nbs.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_oss.c

Merged revisions 108797 via svnmerge from

2008-03-14 20:09:53 +00:00

chan_phone.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +00:00

chan_sip.c

Merged revisions 137812 via svnmerge from

2008-08-14 15:37:35 +00:00

chan_skinny.c

Merged revisions 136063 via svnmerge from

2008-08-06 16:00:07 +00:00

chan_unistim.c

Merged revisions 114271 via svnmerge from

2008-04-18 19:36:26 +00:00

chan_usbradio.c

Merge changes from team/mvanbaak/cli-command-audit

2008-02-08 21:26:32 +00:00

chan_vpb.cc

Merged revisions 107525 via svnmerge from

2008-03-11 15:39:53 +00:00

console_board.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_gui.c

Merged revisions 105841 via svnmerge from

2008-03-06 00:15:02 +00:00

console_video.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_video.h

Two changes:

2008-01-09 18:03:40 +00:00

DialTone.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

iax2-parser.c

Merged revisions 134815 via svnmerge from

2008-07-31 16:53:18 +00:00

iax2-parser.h

Merged revisions 75445 via svnmerge from

2007-07-17 20:49:09 +00:00

iax2-provision.c

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +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

Merged revisions 114884 via svnmerge from

2008-04-30 14:55:16 +00:00

Makefile

Merged revisions 107715 via svnmerge from

2008-03-11 20:51:18 +00:00

misdn_config.c

Merged revisions 136594 via svnmerge from

2008-08-07 19:19:49 +00:00

vcodecs.c

prevent a panic when destroying a channel with no incoming video.

2008-01-01 23:54:40 +00:00

vgrabbers.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00