Jeff Peeler b9935ade93 Merged revisions 113241 via svnmerge from ...

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

................
r113241 | jpeeler | 2008-04-07 16:35:48 -0500 (Mon, 07 Apr 2008) | 23 lines

Merged revisions 113013 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r113013 | jpeeler | 2008-04-07 10:18:10 -0500 (Mon, 07 Apr 2008) | 15 lines

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

........
r113012 | jpeeler | 2008-04-07 10:16:44 -0500 (Mon, 07 Apr 2008) | 7 lines

(closes issue #12362)
(closes issue #12372)
Reported by: vinsik
Tested by: tecnoxarxa

This one line change makes an if inside a for loop (in realtime_peer) check all the ast_variables the loop was intending to test rather than just the first one.

........

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

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


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

2008-04-07 21:36:47 +00:00

..

h323

Merged revisions 103823 via svnmerge from

2008-02-19 20:31:15 +00:00

misdn

Merged revisions 109475 via svnmerge from

2008-03-18 16:26:59 +00:00

xpmr

Allow chan_usbradio to compile again.

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

chan_agent.c

Merged revisions 109576 via svnmerge from

2008-03-18 17:59:49 +00:00

chan_alsa.c

Merged revisions 106239 via svnmerge from

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

chan_console.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +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 112821 via svnmerge from

2008-04-04 19:30:35 +00:00

chan_h323.c

Merged revisions 106239 via svnmerge from

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

chan_iax2.c

Merged revisions 111017 via svnmerge from

2008-03-26 18:44:32 +00:00

chan_jingle.c

Merged revisions 107718 via svnmerge from

2008-03-11 20:54:38 +00:00

chan_local.c

Merged revisions 105570 via svnmerge from

2008-03-03 17:17:27 +00:00

chan_mgcp.c

Merged revisions 106239 via svnmerge from

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

chan_misdn.c

Merged revisions 109475 via svnmerge from

2008-03-18 16:26:59 +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 113241 via svnmerge from

2008-04-07 21:36:47 +00:00

chan_skinny.c

Merged revisions 113119 via svnmerge from

2008-04-07 19:10:45 +00:00

chan_unistim.c

Merged revisions 106239 via svnmerge from

2008-03-06 00:22:20 +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

chan_zap.c

Merged revisions 112600 via svnmerge from

2008-04-03 14:42:58 +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

Start untangling header inclusion in a way that does not affect

2007-11-16 20:04:58 +00:00

iax2-parser.h

Merged revisions 75445 via svnmerge from

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

iax2-provision.c

HUGE improvements to QoS/CoS handling by IgorG

2007-12-16 10:51:53 +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

Doxygen updates, formatting.

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

Makefile

Merged revisions 107715 via svnmerge from

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

misdn_config.c

Merged revisions 100930 via svnmerge from

2008-01-29 17:42:48 +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