Commit Graph

15692 Commits

Author SHA1 Message Date
Olle Johansson
7204cf07f2 Merged revisions 126845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r126845 | oej | 2008-07-01 14:54:57 +0200 (Tis, 01 Jul 2008) | 14 lines


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

........
r126844 | oej | 2008-07-01 14:53:01 +0200 (Tis, 01 Jul 2008) | 5 lines

Clear up documentation on "domain=" setting in sip.conf

Reported by: davidw
(closes issue #12413)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 13:07:47 +00:00
Olle Johansson
b6318501ef Merged revisions 126790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r126790 | oej | 2008-07-01 13:58:17 +0200 (Tis, 01 Jul 2008) | 14 lines

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

........
r126789 | oej | 2008-07-01 13:51:38 +0200 (Tis, 01 Jul 2008) | 6 lines

Report 200 OK to all in-dialog OPTIONs requests (to confirm that the dialog
exist). Don't bother checking the request URI.

(closes issue #11264)
Reported by: ibc

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 12:02:41 +00:00
Olle Johansson
75ee025252 Merged revisions 126755 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r126755 | oej | 2008-07-01 11:51:22 +0200 (Tis, 01 Jul 2008) | 15 lines

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

........
r126735 | oej | 2008-07-01 09:49:15 +0200 (Tis, 01 Jul 2008) | 7 lines

Fix bad XML for hold notification.
Reported by: gowen72
Patches: 
      hold.patch uploaded by gowen72 (license 432)
(closes issue #12942)


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126756 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-01 09:53:12 +00:00
Jeff Peeler
6bc1dc43ed Merged revisions 126675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r126675 | jpeeler | 2008-06-30 17:34:08 -0500 (Mon, 30 Jun 2008) | 1 line

rename zapata.conf.sample to chan_dahdi.conf.sample
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 22:34:37 +00:00
Matthew Fredrickson
29c39f4361 Merged revisions 126637 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r126637 | mattf | 2008-06-30 15:25:46 -0500 (Mon, 30 Jun 2008) | 1 line

Add support to see MTP2 down events when the link layer drops in SS7
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 20:32:37 +00:00
Russell Bryant
38999877fb Merged revisions 126574 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r126574 | russell | 2008-06-30 11:07:25 -0500 (Mon, 30 Jun 2008) | 18 lines

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

........
r126573 | russell | 2008-06-30 11:05:08 -0500 (Mon, 30 Jun 2008) | 10 lines

Fix a typo in the non-DEBUG_THREADS version of the recently added DEADLOCK_AVOIDANCE()
macro.  This caused the lock to not actually be released, and as a result, not
avoid deadlocks at all.  This resolves the issues reported in the last while about
Asterisk locking up all over the place (and most commonly, in chan_iax2).

(closes issue #12927)
(closes issue #12940)
(closes issue #12925)
(potentially closes others ...)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126575 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 16:09:52 +00:00
Olle Johansson
48076d5903 Merged revisions 126517 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r126517 | oej | 2008-06-30 15:03:53 +0200 (MÃ¥n, 30 Jun 2008) | 20 lines

The following patch with some changes for trunk...

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

........
r126516 | oej | 2008-06-30 14:50:55 +0200 (MÃ¥n, 30 Jun 2008) | 10 lines

Send all responses to an INVITE reliably, so that we retransmit if we don't get an ACK and
also fail if we don't get the very same precious ACK. Based on patch by tsearle, with
my own additions.

(closes issue #12951)

Reported by: tsearle
Patches: 
      busy_retransmit.patch uploaded by tsearle (license 373)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 13:07:19 +00:00
Sean Bright
9863a997c0 Blocked revisions 126513 via svnmerge
........
r126513 | seanbright | 2008-06-30 07:57:42 -0400 (Mon, 30 Jun 2008) | 4 lines

Cast a few more strings to char *, so that we can compile cleanly against
FreeTDS 0.60.  Update the docs to reflect that we can now compile and run
against all modern releases of FreeTDS (0.60 through 0.82)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-30 11:58:04 +00:00
Kevin P. Fleming
789d5b96c3 finish converting this module
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 17:02:40 +00:00
Kevin P. Fleming
b8cfb78cc0 Merged revisions 126356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r126356 | kpfleming | 2008-06-29 09:19:29 -0700 (Sun, 29 Jun 2008) | 9 lines

various minor fixes created while i worked on getting *every* Asterisk module to build on laptop in dev mode:

remove weird pre-setting of LUA paths; they are not necessary; also use the proper path for including the files in pbx_lua.c

make the compiler shut up about some ignored function results in pbx_gtkconsole; this module is badly coded anyway


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 17:02:25 +00:00
Kevin P. Fleming
b148e15762 don't know how this got missed in the DAHDI conversion of this branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 17:00:56 +00:00
Sean Bright
1a797f47ea Blocked revisions 126319 via svnmerge
........
r126319 | seanbright | 2008-06-29 09:20:01 -0400 (Sun, 29 Jun 2008) | 2 lines

This was bogus, need to find a better way.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 13:20:31 +00:00
Sean Bright
e3dfce8119 Blocked revisions 126312 via svnmerge
........
r126312 | seanbright | 2008-06-29 09:11:55 -0400 (Sun, 29 Jun 2008) | 4 lines

While we're at it, escape all the columns in our TDS queries as well.  Double
quotes seems to be more standard than square brackets (Sybase and SQL Server
both support them).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 13:13:20 +00:00
Sean Bright
18af01717e Merged revisions 126274 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r126274 | seanbright | 2008-06-29 08:06:46 -0400 (Sun, 29 Jun 2008) | 6 lines

Quote column names when inserting CDRs into postgres to avoid conflicts
with reserved words.

(closes issue #12947)
Reported by: panolex

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-29 12:07:31 +00:00
Sean Bright
8b7210c2ee Blocked revisions 126226 via svnmerge
........
r126226 | seanbright | 2008-06-28 17:28:16 -0400 (Sat, 28 Jun 2008) | 8 lines

Merge in changes from my cdr-tds-conversion branch.  This changes the internal
implementation from using the volatile libtds, to using the db-lib front end.
The unintended side effect of this is that we support (at least) versions 0.62
through 0.82 of the FreeTDS distribution without any #ifdef ugliness.

(closes issue #12844)
Reported by: jcollie

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-28 21:29:45 +00:00
Kevin P. Fleming
09022d2add Blocked revisions 126187 via svnmerge
........
r126187 | kpfleming | 2008-06-28 08:54:04 -0700 (Sat, 28 Jun 2008) | 3 lines

yay for airplane ride optimizations... sort the fields in ast_channel by alignment requirements, saving 36 bytes per instance on a 64-bit platform


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-28 15:58:11 +00:00
Kevin P. Fleming
9c4c17ae18 update this branch to use the trunk goodness version of menuselect
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-28 14:58:07 +00:00
Sean Bright
cf780a9462 Blocked revisions 126115 via svnmerge
........
r126115 | seanbright | 2008-06-27 19:29:56 -0400 (Fri, 27 Jun 2008) | 1 line

Pretty up the 'cdr show status' output.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 23:31:22 +00:00
Tilghman Lesher
b8ee51e4ba Blocked revisions 114174,114298,115258,115518,117524,117812,118059,119077,120063,120372,120672,120732,121993,122315,122434,122616,122664,124744,124909,125894 via svnmerge
................
r114174 | qwell | 2008-04-16 12:31:02 -0500 (Wed, 16 Apr 2008) | 14 lines

Blocked revisions 114173 via svnmerge

........
r114173 | qwell | 2008-04-16 12:30:09 -0500 (Wed, 16 Apr 2008) | 7 lines

Fix "fallthrough" behavior here, so config options in a previously configured user don't override settings in general.

(closes issue #12458)
Reported by: tzafrir
Patches:
      chanzap_users_sections.diff uploaded by tzafrir (license 46)

........

................
r114298 | tilghman | 2008-04-19 08:53:38 -0500 (Sat, 19 Apr 2008) | 11 lines

Blocked revisions 114297 via svnmerge

........
r114297 | tilghman | 2008-04-19 08:49:50 -0500 (Sat, 19 Apr 2008) | 4 lines

MOH usage information needs a terminating newline, or else
"asterisk -rx 'help moh reload'" will hang.  Reported via
-dev list, fixed by me.

........

................
r115258 | bbryant | 2008-05-02 15:26:00 -0500 (Fri, 02 May 2008) | 9 lines

Blocked revisions 115257 via svnmerge

........
r115257 | bbryant | 2008-05-02 15:25:42 -0500 (Fri, 02 May 2008) | 2 lines

Add new "pri show version" command to show the libpri version for support reasons.

........

................
r115518 | russell | 2008-05-07 13:17:43 -0500 (Wed, 07 May 2008) | 12 lines

Blocked revisions 115517 via svnmerge

........
r115517 | russell | 2008-05-07 13:17:19 -0500 (Wed, 07 May 2008) | 5 lines

Track peer references when stored in the sip_pvt struct as the peer related to
a qualify ping or a subscription.  This fixes some realtime related crashes.
(closes issue #12588)
(closes issue #12555)

........

................
r117524 | tilghman | 2008-05-21 13:45:26 -0500 (Wed, 21 May 2008) | 9 lines

Blocked revisions 117523 via svnmerge

........
r117523 | tilghman | 2008-05-21 13:44:53 -0500 (Wed, 21 May 2008) | 2 lines

Revert accidental commit of the last change

........

................
r117812 | tilghman | 2008-05-22 11:50:32 -0500 (Thu, 22 May 2008) | 13 lines

Blocked revisions 117809 via svnmerge

........
r117809 | tilghman | 2008-05-22 11:47:03 -0500 (Thu, 22 May 2008) | 6 lines

Take into account the length of delimiters when calculating result string length.
(closes issue #12696)
 Reported by: adomjan
 Patches: 
       func_realtime.c-longdelimiter.patch uploaded by adomjan (license 487)

........

................
r118059 | tilghman | 2008-05-23 08:20:13 -0500 (Fri, 23 May 2008) | 9 lines

Blocked revisions 118055 via svnmerge

........
r118055 | tilghman | 2008-05-23 08:18:44 -0500 (Fri, 23 May 2008) | 2 lines

Add format type checking for recently de-inlined function

........

................
r119077 | russell | 2008-05-29 15:49:48 -0500 (Thu, 29 May 2008) | 10 lines

Blocked revisions 119076 via svnmerge

........
r119076 | russell | 2008-05-29 15:48:33 -0500 (Thu, 29 May 2008) | 3 lines

Oddly enough, all of the contents of audiohook.h were in there twice.  I have
removed the second copy.

........

................
r120063 | tilghman | 2008-06-03 13:24:14 -0500 (Tue, 03 Jun 2008) | 15 lines

Blocked revisions 120061 via svnmerge

........
r120061 | tilghman | 2008-06-03 13:23:32 -0500 (Tue, 03 Jun 2008) | 8 lines

When listing the manager users, managers in users.conf are not shown, even
though they are allowed to connect.
(closes issue #12594)
 Reported by: bkruse
 Patches: 
       12594-managerusers-2.diff uploaded by qwell (license 4)
 Tested by: bkruse

........

................
r120372 | russell | 2008-06-04 11:28:37 -0500 (Wed, 04 Jun 2008) | 11 lines

Blocked revisions 120371 via svnmerge

........
r120371 | russell | 2008-06-04 11:26:43 -0500 (Wed, 04 Jun 2008) | 4 lines

Make the "dialplan remove include" CLI command actually work.  Also, tweak
some formatting, and make the success message a little bit more clear.
(closes AST-52)

........

................
r120672 | russell | 2008-06-05 11:39:25 -0500 (Thu, 05 Jun 2008) | 12 lines

Blocked revisions 120671 via svnmerge

........
r120671 | russell | 2008-06-05 11:38:52 -0500 (Thu, 05 Jun 2008) | 5 lines

It turns out that searching on the forwarding station isn't very useful for
most people, so pull in the changes that allow searching for SMDI messages
based on other components of the SMDI message.  Also, update the SMDI
documentation.

........

................
r120732 | russell | 2008-06-05 13:01:45 -0500 (Thu, 05 Jun 2008) | 9 lines

Blocked revisions 120731 via svnmerge

........
r120731 | russell | 2008-06-05 13:01:25 -0500 (Thu, 05 Jun 2008) | 2 lines

Add the UPGRADE.txt file from Asterisk 1.2, for handy reference.

........

................
r121993 | twilson | 2008-06-11 18:48:38 -0500 (Wed, 11 Jun 2008) | 9 lines

Blocked revisions 121992 via svnmerge

........
r121992 | twilson | 2008-06-11 18:47:23 -0500 (Wed, 11 Jun 2008) | 2 lines

Backport fix for 11520--for some reason I didn't do this back in February when I patched for trunk.

........

................
r122315 | jpeeler | 2008-06-12 14:11:23 -0500 (Thu, 12 Jun 2008) | 9 lines

Blocked revisions 122314 via svnmerge

........
r122314 | jpeeler | 2008-06-12 14:08:20 -0500 (Thu, 12 Jun 2008) | 2 lines

Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow.

........

................
r122434 | jpeeler | 2008-06-12 18:09:16 -0500 (Thu, 12 Jun 2008) | 12 lines

Blocked revisions 122208 via svnmerge

........
r122208 | jpeeler | 2008-06-12 10:46:08 -0500 (Thu, 12 Jun 2008) | 5 lines

(closes issue #12193)
Reported by: davidw
Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app


........

................
r122616 | jpeeler | 2008-06-13 12:38:28 -0500 (Fri, 13 Jun 2008) | 13 lines

Blocked revisions 122613 via svnmerge

........
r122613 | jpeeler | 2008-06-13 12:36:56 -0500 (Fri, 13 Jun 2008) | 6 lines

(closes issue #12846)
Reported by: Netview
Tested by: jpeeler

Use correct location to search for tonezone.

........

................
r122664 | jpeeler | 2008-06-13 13:58:29 -0500 (Fri, 13 Jun 2008) | 8 lines

Blocked revisions 122663 via svnmerge

........
r122663 | jpeeler | 2008-06-13 13:57:24 -0500 (Fri, 13 Jun 2008) | 1 line

fixed dahdi compatability header from assuming either dahdi or zaptel is installed (may not have either)
........

................
r124744 | kpfleming | 2008-06-23 16:24:34 -0500 (Mon, 23 Jun 2008) | 10 lines

Blocked revisions 124743 via svnmerge

........
r124743 | kpfleming | 2008-06-23 16:22:08 -0500 (Mon, 23 Jun 2008) | 3 lines

emit a warning if the old IAX2 call searching code finds a call when the new code did not... so that we can get rid of the old code in 2-3 months


........

................
r124909 | tilghman | 2008-06-24 15:55:06 -0500 (Tue, 24 Jun 2008) | 13 lines

Blocked revisions 124908 via svnmerge

........
r124908 | tilghman | 2008-06-24 15:52:43 -0500 (Tue, 24 Jun 2008) | 6 lines

Don't access the pvt structure if unable to acquire the lock.
(closes issue #12162)
 Reported by: norman
 Patches: 
       12162-lockfail.diff uploaded by qwell (license 4)

........

................
r125894 | tilghman | 2008-06-27 11:48:05 -0500 (Fri, 27 Jun 2008) | 14 lines

Blocked revisions 125893 via svnmerge

........
r125893 | tilghman | 2008-06-27 11:46:05 -0500 (Fri, 27 Jun 2008) | 7 lines

Since HAVE_DAHDI is defined to HAVE_ZAPTEL in dahdi_compat.h, we must first
check for HAVE_ZAPTEL.
(closes issue #12938)
 Reported by: opticron
 Patches: 
       tonezone_compat.diff uploaded by opticron (license 267)

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 22:43:29 +00:00
Tilghman Lesher
d0a5acecf4 Merged revisions 126057 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r126057 | tilghman | 2008-06-27 17:10:34 -0500 (Fri, 27 Jun 2008) | 12 lines

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

........
r126056 | tilghman | 2008-06-27 17:01:09 -0500 (Fri, 27 Jun 2008) | 4 lines

When we get a 408 Timeout, don't stop trying to re-register.
(closes issue #12863)
 Reported by: ricvil

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 22:12:08 +00:00
Mark Michelson
64174167cb Port revisions 124661 and 123650 from trunk to 1.6.0
Thanks to Atis Lezdins for pointing this out on the asterisk-dev
mailing list



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 21:00:47 +00:00
Tilghman Lesher
ef21aae34b Blocked revisions 126021 via svnmerge
........
r126021 | tilghman | 2008-06-27 15:38:59 -0500 (Fri, 27 Jun 2008) | 2 lines

Separate multiple items encoded into a single field with ';'

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126022 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 20:40:08 +00:00
Russell Bryant
2d13950a70 Merged revisions 125988 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125988 | russell | 2008-06-27 14:19:08 -0500 (Fri, 27 Jun 2008) | 3 lines

Fix a typo.  Someone on IRC copied this literally and then wondered why it
wasn't working.  :)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 19:20:27 +00:00
Matthew Fredrickson
968ef39187 Merged revisions 125984 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125984 | mattf | 2008-06-27 14:05:40 -0500 (Fri, 27 Jun 2008) | 1 line

Revert this part of the fix.  We'll fix it in libss7
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 19:06:21 +00:00
Matthew Fredrickson
3fcfde9258 Merged revisions 125982 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125982 | mattf | 2008-06-27 14:00:44 -0500 (Fri, 27 Jun 2008) | 1 line

Obviously somebody didn't compile with libss7 support when doing the DAHDI conversion.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 19:01:16 +00:00
Matthew Fredrickson
9cb4b02a1a Merged revisions 125980 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125980 | mattf | 2008-06-27 13:32:17 -0500 (Fri, 27 Jun 2008) | 1 line

Add support for new commands to block/unblock all CICs on a linkset
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125981 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 18:33:22 +00:00
Brett Bryant
9da0e24388 Merged revisions 125947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125947 | bbryant | 2008-06-27 12:35:41 -0500 (Fri, 27 Jun 2008) | 1 line

Small error in the function that converts peer transports to a string.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125948 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 17:36:14 +00:00
Tilghman Lesher
405af80010 Blocked revisions 125895 via svnmerge
........
r125895 | tilghman | 2008-06-27 12:02:56 -0500 (Fri, 27 Jun 2008) | 2 lines

Document DLA_UNLOCK and DLA_LOCK

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 17:03:41 +00:00
Brett Bryant
06c98e7444 Merged revisions 125891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125891 | bbryant | 2008-06-27 11:28:06 -0500 (Fri, 27 Jun 2008) | 6 lines

Change the way that the transport option works for sip users. transport will now take multiple arguments, the first one listed will be the one used 
for new dialogs, and the rest listed will be acceptable ways for that peer to contact us. This fixes a minor bug where, because SIP TCP/UDP run on 
the same port, could cause a TCP peer to be saved in the ast_db. There will also be warnings when a transport is changed for an unexpected reason.

(issue #12799)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:29:14 +00:00
Mark Michelson
043e029e48 Blocked revisions 125856 via svnmerge
........
r125856 | mmichelson | 2008-06-27 11:18:07 -0500 (Fri, 27 Jun 2008) | 3 lines

Remove debug message


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125863 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:19:46 +00:00
Mark Michelson
1fbfd723e8 Merged revisions 125855 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125855 | mmichelson | 2008-06-27 11:16:13 -0500 (Fri, 27 Jun 2008) | 5 lines

Ensure the thread-safety of the monexec variable in app_queue.

Thanks to Russell for pointing out the problem


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125859 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:19:16 +00:00
Tilghman Lesher
dbdc741920 Merged revisions 125853 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125853 | tilghman | 2008-06-27 11:00:05 -0500 (Fri, 27 Jun 2008) | 3 lines

Revert half of the fix, as this part may have been unnecessary (related to issue #12914)
Requested here: http://lists.digium.com/pipermail/asterisk-dev/2008-June/033658.html

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 16:01:47 +00:00
Mark Michelson
307dc9d032 Make sure to only include dahdi/user.h if we have
installed DAHDI. 



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 14:57:28 +00:00
Mark Michelson
489a80e711 I accidentally committed a change to chan_iax2.c in addition to a change
to app_queue.c. Reverting the change to chan_iax2.c, even though it may turn
out that this change is necessary.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 14:21:01 +00:00
Mark Michelson
aec8cda0c8 Merged revisions 125799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125799 | mmichelson | 2008-06-27 09:14:09 -0500 (Fri, 27 Jun 2008) | 3 lines

Remove an unneeded target from the Makefile


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 14:14:46 +00:00
Tilghman Lesher
cdad87e85f Blocked revisions 125796 via svnmerge
........
r125796 | tilghman | 2008-06-27 09:08:38 -0500 (Fri, 27 Jun 2008) | 2 lines

Push relatively unused compiler options down the list, keeping the popular options at the top.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 14:09:15 +00:00
Tilghman Lesher
a12130a093 Merged revisions 125794 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125794 | tilghman | 2008-06-27 08:54:13 -0500 (Fri, 27 Jun 2008) | 10 lines

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

........
r125793 | tilghman | 2008-06-27 08:45:03 -0500 (Fri, 27 Jun 2008) | 2 lines

In this debugging function, copy to a buffer instead of using potentially unsafe pointers.

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 14:07:13 +00:00
Tilghman Lesher
d93ad61286 Merged revisions 125741 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125741 | tilghman | 2008-06-27 07:28:38 -0500 (Fri, 27 Jun 2008) | 15 lines

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

........
r125740 | tilghman | 2008-06-27 07:19:39 -0500 (Fri, 27 Jun 2008) | 7 lines

Add proper deadlock avoidance.
(closes issue #12914)
 Reported by: ozan
 Patches: 
       20080625__bug12914.diff.txt uploaded by Corydon76 (license 14)
 Tested by: ozan

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 12:32:02 +00:00
Philippe Sultan
ca5d70859b Merged revisions 125703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125703 | phsultan | 2008-06-27 09:28:17 +0200 (Fri, 27 Jun 2008) | 1 line

Fix a compile time error that occurs if OpenSSL is not installed. Reported by Noel Morais on the users mailing list
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 07:41:54 +00:00
Mark Michelson
a8979176c1 SENTINEL is not defined in 1.6.0
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 01:09:04 +00:00
Mark Michelson
b43587a16e Merged revisions 125666 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125666 | mmichelson | 2008-06-26 19:22:03 -0500 (Thu, 26 Jun 2008) | 3 lines

Make this compile with dev-mode on


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 00:22:23 +00:00
Mark Michelson
6250e77c59 Merged revisions 125649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125649 | mmichelson | 2008-06-26 19:15:54 -0500 (Thu, 26 Jun 2008) | 15 lines

The monitor-join option for queues was deprecated in favor of using
MixMonitor to mix audio. However, it was pointed out to me that because
of this, the command set for the MONITOR_EXEC variable is ignored as well.
This means that people can't do their own custom mixing commands at the end
of recordings in order to make, for instance, stereo recordings of calls.

With this patch, app_queue will set the "joinfiles" variable for the channel's
monitor if MONITOR_EXEC is not zero-length. This means that for normal audio
mixing, MixMonitor is still the preferred choice, but we allow custom
mixing to be done with the two Monitor streams if desired.

(closes issue #12923)
Reported by: snyfer


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125650 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 00:17:39 +00:00
Mark Michelson
22bfcffec8 Blocked revisions 125647 via svnmerge
........
r125647 | mmichelson | 2008-06-26 18:35:29 -0500 (Thu, 26 Jun 2008) | 16 lines

Improve consistency between app_dial and app_queue with regards
to how language is handled between two channels whose native
language is different. Prior to this patch, app_dial would have
the callee inherit the caller's language, and app_queue would not.

After this patch, app_dial no longer has the language inheritance
capability. This seems to make the most sense since it seems more
natural for a person to hear files played back in his/her native
language instead of the language of the person on the far end of
the call. See the CHANGES file for hints on how to keep the 
previous behavior of app_dial if desired.

(closes issue #12489)
Reported by: bcnit


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:36:11 +00:00
Michiel van Baak
3b3e75ff1a Blocked revisions 125596 via svnmerge
........
r125596 | mvanbaak | 2008-06-27 01:18:46 +0200 (Fri, 27 Jun 2008) | 5 lines

remove block of commented code to set __ourip
This is now handled in skinny_register and load_config.

part two of chan_skinny cleanup

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:19:49 +00:00
Michiel van Baak
3ab5a844b3 Blocked revisions 125593 via svnmerge
........
r125593 | mvanbaak | 2008-06-27 01:14:08 +0200 (Fri, 27 Jun 2008) | 4 lines

remove paging device from chan_skinny.
This has never been used, and noone could give us info about what
it is used for.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:15:09 +00:00
Mark Michelson
74e07ac0aa Merged revisions 125591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125591 | mmichelson | 2008-06-26 18:06:18 -0500 (Thu, 26 Jun 2008) | 3 lines

Fix a really stupid mistake


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:06:47 +00:00
Jason Parker
2de235d2b0 Merged revisions 125589 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125589 | qwell | 2008-06-26 18:04:18 -0500 (Thu, 26 Jun 2008) | 9 lines

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

........
r125587 | qwell | 2008-06-26 18:03:15 -0500 (Thu, 26 Jun 2008) | 1 line

Make sure to unlock the lock_info lock (huh?).  Possible deadlock?
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125590 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:05:04 +00:00
Mark Michelson
9152577c24 Merged revisions 125586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125586 | mmichelson | 2008-06-26 18:01:02 -0500 (Thu, 26 Jun 2008) | 19 lines

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

........
r125585 | mmichelson | 2008-06-26 17:52:39 -0500 (Thu, 26 Jun 2008) | 11 lines

Add the interface of a queue member to the output of the "queue show" command
so that it can easily be associated with a queue member's name. This helps
so that the appropriate queue member can be removed or paused since the 
interface is required, not the member's name.

(closes issue #12783)
Reported by: davevg
Patches:
      app_queue.diff uploaded by davevg (license 209) with small mod from me


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 23:04:12 +00:00
Tilghman Lesher
be0a82a3bb Merged revisions 125583 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r125583 | tilghman | 2008-06-26 17:49:16 -0500 (Thu, 26 Jun 2008) | 2 lines

Don't hang if the command is blank

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 22:50:17 +00:00
Mark Michelson
6d89f9ac86 Merged revisions 125531 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r125531 | mmichelson | 2008-06-26 17:03:54 -0500 (Thu, 26 Jun 2008) | 17 lines

Blocked revisions 125530 via svnmerge

........
r125530 | mmichelson | 2008-06-26 17:02:55 -0500 (Thu, 26 Jun 2008) | 10 lines

Backport of attended transfer queue_log patch from trunk.

This patch allows for attended transfers to be logged in the
queue_log the same way that blind transfers have always been.

It was decided by popular opinion on the asterisk-dev mailing
list that this should be backported to 1.4. Thanks to everyone
who gave an opinion.


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-26 22:06:20 +00:00