[asterisk-commits] murf: branch group/CDRfix5 r82832 - in /team/group/CDRfix5: ./ apps/ build_to...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Tue Sep 18 13:14:06 CDT 2007


Author: murf
Date: Tue Sep 18 13:14:05 2007
New Revision: 82832

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82832
Log:
Merged revisions 82231-82235,82237,82239,82241-82242,82244,82246-82248,82251,82253-82254,82256-82258,82262,82264,82266,82268-82270,82273,82275,82277,82279,82281-82283,82287-82290,82292,82294,82297,82310-82312,82314,82318,82320-82321,82327,82329,82336,82338,82341,82345,82347,82349,82352,82359,82373,82377,82386,82389,82391,82393,82395,82397,82400-82401,82454,82457,82496,82516,82546,82568,82593,82595,82628,82660,82678-82679,82710,82712,82728,82752,82776,82793,82800,82803 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r82231 | file | 2007-09-11 07:10:04 -0600 (Tue, 11 Sep 2007) | 6 lines

(closes issue #10692)
Reported by: snuffy
Patches:
      minivm.diff uploaded by snuffy (license 35)
Instead of using err (which is not available under Solaris) use fdprintf with stderr.

................
r82232 | file | 2007-09-11 07:15:37 -0600 (Tue, 11 Sep 2007) | 6 lines

(closes issue #10695)
Reported by: junky
Patches:
      count_showconn.diff uploaded by junky (license 177)
Provide a count of connected users to manager.

................
r82233 | file | 2007-09-11 07:37:26 -0600 (Tue, 11 Sep 2007) | 2 lines

Fix building under FreeBSD. Make sure alloca.h exists before including it.

................
r82234 | file | 2007-09-11 07:41:03 -0600 (Tue, 11 Sep 2007) | 2 lines

Include compat.h to hopefully make it compatible with FreeBSD.

................
r82235 | file | 2007-09-11 07:46:08 -0600 (Tue, 11 Sep 2007) | 2 lines

Include string compatibility file in hashtest2.

................
r82237 | russell | 2007-09-11 08:10:17 -0600 (Tue, 11 Sep 2007) | 10 lines

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

........
r82236 | russell | 2007-09-11 09:09:43 -0500 (Tue, 11 Sep 2007) | 2 lines

Document why membercount can not simply be replaced by ao2_container_count()

........

................
r82239 | russell | 2007-09-11 08:25:20 -0600 (Tue, 11 Sep 2007) | 10 lines

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

........
r82238 | russell | 2007-09-11 09:21:17 -0500 (Tue, 11 Sep 2007) | 2 lines

Add a missing unref of a queue member in an error handling block

........

................
r82241 | russell | 2007-09-11 08:35:06 -0600 (Tue, 11 Sep 2007) | 10 lines

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

........
r82240 | russell | 2007-09-11 09:34:12 -0500 (Tue, 11 Sep 2007) | 2 lines

Add a couple more missing unrefs of queue member objects

........

................
r82242 | file | 2007-09-11 08:50:12 -0600 (Tue, 11 Sep 2007) | 6 lines

(closes issue #10560)
Reported by: ruffle
Patches:
      rb uploaded by ruffle (license 201)
Show whether the conference is locked or not on the CLI.

................
r82244 | file | 2007-09-11 08:58:11 -0600 (Tue, 11 Sep 2007) | 14 lines

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

........
r82243 | file | 2007-09-11 11:56:39 -0300 (Tue, 11 Sep 2007) | 6 lines

(closes issue #10577)
Reported by: jamesgolovich
Patches:
      asterisk-dundifree.diff.txt uploaded by jamesgolovich (license 176)
Don't leak memory when unloading DUNDi.

........

................
r82246 | russell | 2007-09-11 09:28:46 -0600 (Tue, 11 Sep 2007) | 17 lines

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

........
r82245 | russell | 2007-09-11 10:26:51 -0500 (Tue, 11 Sep 2007) | 9 lines

(closes issue #10553)
Reported by: juggie
Patches:
      res_agi_fgets-2.patch uploaded by juggie (license 24)
Tested by: juggie

When using fastagi, fgets() can return before a full line is read.  Add explicit
handling for the case where it gets interrupted.

........

................
r82247 | russell | 2007-09-11 09:31:04 -0600 (Tue, 11 Sep 2007) | 3 lines

Remove an unused variable.  I have no idea why this was marked with the unused
attribute instead of just removing it.  :)

................
r82248 | file | 2007-09-11 09:34:40 -0600 (Tue, 11 Sep 2007) | 6 lines

(closes issue #10666)
Reported by: arkadia
Patches:
      cdr_lockorder.patch uploaded by arkadia (license 233)
Optimize CDR stuff a bit.

................
r82251 | russell | 2007-09-11 10:05:03 -0600 (Tue, 11 Sep 2007) | 12 lines

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

........
r82250 | russell | 2007-09-11 11:03:42 -0500 (Tue, 11 Sep 2007) | 4 lines

The sample dundi.conf claims support for a wildcard peer entry - [*], but the
code did not support it.  This patch makes it work.
(closes issue #10546, patch by dds, with some changes by me)

........

................
r82253 | mmichelson | 2007-09-11 10:12:09 -0600 (Tue, 11 Sep 2007) | 14 lines

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

........
r82252 | mmichelson | 2007-09-11 11:05:56 -0500 (Tue, 11 Sep 2007) | 6 lines

All instances of ao2_iterators which were just named 'i' have been renamed
to 'mem_iter' so that when refcounted queues are merged into trunk, there will be
little confusion regarding iterator names, especially when a queue and member iterator
are used in the same function.


........

................
r82254 | crichter | 2007-09-11 10:15:10 -0600 (Tue, 11 Sep 2007) | 9 lines

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

........
r82249 | crichter | 2007-09-11 18:01:27 +0200 (Di, 11 Sep 2007) | 1 line

fixed a hold/retrieve issue.
........

................
r82256 | murf | 2007-09-11 11:16:16 -0600 (Tue, 11 Sep 2007) | 1 line

fixing up the pthread stuff for hashtest2
................
r82257 | file | 2007-09-11 11:58:48 -0600 (Tue, 11 Sep 2007) | 6 lines

(closes issue #9433)
Reported by: junky
Patches:
      register_trying.diff.txt uploaded by jcmoore
Disable sending 100 Trying on REGISTER attempts and make it an option. This has been signed off by oej.

................
r82258 | file | 2007-09-11 12:37:39 -0600 (Tue, 11 Sep 2007) | 2 lines

Lil' bit more documentation to keep folks happy.

................
r82262 | murf | 2007-09-11 14:49:21 -0600 (Tue, 11 Sep 2007) | 9 lines

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

........
r82261 | murf | 2007-09-11 14:36:15 -0600 (Tue, 11 Sep 2007) | 1 line

this change should fix issue # 10659 -- what I worry about is how many other bug reports it may generate. Hopefully, we can please the/a majority. Hopefully. We shall see. Calls not marked ANSWERED and with only one channel name will not be posted. This should eliminate the double CDR's.
........

................
r82264 | russell | 2007-09-11 14:50:42 -0600 (Tue, 11 Sep 2007) | 13 lines

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

........
r82263 | russell | 2007-09-11 15:49:34 -0500 (Tue, 11 Sep 2007) | 5 lines

Fix another missing unref of member objects.  This one was pointed out by Marta.
When building the outgoing list in try_calling(), a member reference is stored
in each outgoing entry.  However, when this list got destroyed, the reference
was not released.

........

................
r82266 | file | 2007-09-11 15:43:47 -0600 (Tue, 11 Sep 2007) | 12 lines

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

........
r82265 | file | 2007-09-11 18:41:49 -0300 (Tue, 11 Sep 2007) | 4 lines

(closes issue #10679)
Reported by: andrew
Build under dev mode when K6OPTS is enabled.

........

................
r82268 | murf | 2007-09-11 16:37:20 -0600 (Tue, 11 Sep 2007) | 1 line

This solves an unreported solaris compile problem (missing -lnsl -lsocket).
................
r82269 | russell | 2007-09-11 16:38:02 -0600 (Tue, 11 Sep 2007) | 11 lines

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

........
r82267 | russell | 2007-09-11 17:37:17 -0500 (Tue, 11 Sep 2007) | 3 lines

Fix incorrect uses of ao2_find().  Every one of these calls was reading bogus
memory ...

........

................
r82270 | russell | 2007-09-11 16:38:53 -0600 (Tue, 11 Sep 2007) | 2 lines

remove unused functions that made this file not build under dev mode

................
r82273 | mattf | 2007-09-11 17:07:49 -0600 (Tue, 11 Sep 2007) | 1 line

Fix to make sure we don't hangup a call when getting a RLC without sending REL.  Found making sure we are Q.784 (the SS7 test specification) compliant
................
r82275 | mmichelson | 2007-09-12 08:29:15 -0600 (Wed, 12 Sep 2007) | 14 lines

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

........
r82274 | mmichelson | 2007-09-12 09:24:53 -0500 (Wed, 12 Sep 2007) | 6 lines

We should only initialize a realtime queue when it is allocated, not every time we access it. This prevents the members ao2_container
from being reallocated every time the queue is accessed.

I also removed a debug message I had accidentally left in on a previous commit.


........

................
r82277 | mmichelson | 2007-09-12 08:31:36 -0600 (Wed, 12 Sep 2007) | 3 lines

Blocking changes from revision 82276


................
r82279 | russell | 2007-09-12 09:12:52 -0600 (Wed, 12 Sep 2007) | 11 lines

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

........
r82278 | russell | 2007-09-12 10:11:11 -0500 (Wed, 12 Sep 2007) | 3 lines

revert patch from issue #10553, as someone not using fastagi reported that this
broke their system.

........

................
r82281 | russell | 2007-09-12 09:19:11 -0600 (Wed, 12 Sep 2007) | 12 lines

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

........
r82280 | russell | 2007-09-12 10:16:49 -0500 (Wed, 12 Sep 2007) | 4 lines

Clean up the output of "asterisk -h".  This tweaks the wording and wraps lines
at 80 characters.
(closes issue #10699, seanbright)

........

................
r82282 | russell | 2007-09-12 09:53:40 -0600 (Wed, 12 Sep 2007) | 10 lines

Change the traversal to use ao2_callback() instead of an ao2_iterator.  Using
ao2_callback() is a much more efficient way of performing an operation on every
item in the container.  This change makes hashtest2 run in about 25% of the
time it ran before on my system.

In general, I would say that it makes the most sense to use an ao2_iterator if
the operation being performed is going to take a long time and you don't want
to keep the container locked while you work with each object.  Otherwise,
the use of ao2_callback is preferred.

................
r82283 | mmichelson | 2007-09-12 10:24:45 -0600 (Wed, 12 Sep 2007) | 5 lines

Fixes Solaris build warnings

(closes issue #10698, reported and patched by snuffy)


................
r82287 | dhubbard | 2007-09-12 14:47:32 -0600 (Wed, 12 Sep 2007) | 9 lines

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

........
r82286 | dhubbard | 2007-09-12 15:24:24 -0500 (Wed, 12 Sep 2007) | 1 line

remove a race condition for the creation of recordthread's, and fix a small memory leak.  This closes issue# 10636
........

................
r82288 | murf | 2007-09-12 14:50:40 -0600 (Wed, 12 Sep 2007) | 1 line

This fix closes issue #10642 -- it's not perfect, but should retain most blank lines in config files, via read/write cycles.
................
r82289 | mmichelson | 2007-09-12 15:17:45 -0600 (Wed, 12 Sep 2007) | 4 lines

Removed an unneeded ao2_ref. This was a problem because unless get_member_status returned QUEUE_NORMAL, a NULL member
would be unreferenced. While this didn't cause any crashes or anything terrible, it still is incorrect


................
r82290 | tilghman | 2007-09-12 15:25:57 -0600 (Wed, 12 Sep 2007) | 12 lines

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

........
r82285 | tilghman | 2007-09-12 15:12:06 -0500 (Wed, 12 Sep 2007) | 4 lines

Working on issue #10531 exposed a rather nasty 64-bit issue on ast_mktime, so we
updated the localtime.c file from source.  Next we'll have to write ast_strptime
to match.

........

................
r82292 | tilghman | 2007-09-12 15:32:24 -0600 (Wed, 12 Sep 2007) | 10 lines

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

........
r82291 | tilghman | 2007-09-12 16:28:33 -0500 (Wed, 12 Sep 2007) | 2 lines

Oops, wrong location for FreeBSD zone files

........

................
r82294 | qwell | 2007-09-12 15:55:32 -0600 (Wed, 12 Sep 2007) | 4 lines

After some discussions, we decided that the return values here were a bit messy.

This also fixes a bug on reload, where peers may not have reregistered properly.

................
r82297 | russell | 2007-09-12 15:57:30 -0600 (Wed, 12 Sep 2007) | 11 lines

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

........
r82296 | russell | 2007-09-12 16:56:32 -0500 (Wed, 12 Sep 2007) | 3 lines

Fix a check of the wrong pointer, as pointed out by an XXX comment left in 
the code.  The problem was harmless, however.

........

................
r82310 | phsultan | 2007-09-13 05:54:56 -0600 (Thu, 13 Sep 2007) | 12 lines

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

........
r82309 | phsultan | 2007-09-13 13:47:14 +0200 (Thu, 13 Sep 2007) | 4 lines

Closes issue #9401, reported and patched by irrot, with slight
modifications by me.

Handle DTMF sent by Asterisk properly.
........

................
r82311 | russell | 2007-09-13 07:34:24 -0600 (Thu, 13 Sep 2007) | 3 lines

Fix a missing unref of a member struct.  This was pointed out by Marta.  Thanks!
This function in 1.4 didn't have the problem.

................
r82312 | phsultan | 2007-09-13 08:00:56 -0600 (Thu, 13 Sep 2007) | 1 line

Reflect Jingle DTMF specification changes
................
r82314 | phsultan | 2007-09-13 09:05:16 -0600 (Thu, 13 Sep 2007) | 8 lines

Changed Jingle and Jingle DTMF namespaces.

As both specifications are in the Experimental status, the namespaces
specified therein shall be of the form
"http://www.xmpp.org/extensions/xep-XXXX.html#ns".

See the Namespace issuance section in XEP-0053 :
http://www.xmpp.org/extensions/xep-0053.html#namespaces
................
r82318 | phsultan | 2007-09-13 09:10:08 -0600 (Thu, 13 Sep 2007) | 1 line

Assign namespace properly
................
r82320 | phsultan | 2007-09-13 09:25:18 -0600 (Thu, 13 Sep 2007) | 1 line

Modify rule filters to match with the Jingle namespace constant
................
r82321 | russell | 2007-09-13 09:26:40 -0600 (Thu, 13 Sep 2007) | 3 lines

Various code and documentation cleanups for res_config_sqlite
(closes issue #10711, rbraun_proformatique)

................
r82327 | mmichelson | 2007-09-13 10:27:42 -0600 (Thu, 13 Sep 2007) | 15 lines

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

........
r82326 | mmichelson | 2007-09-13 11:25:59 -0500 (Thu, 13 Sep 2007) | 7 lines

Added logic to handle the unlikely case that someone has two queues with the same name.
Asterisk will log a warning message letting the user know that one was already defined with that
name and is it skipping all further instances. This also will work for realtime queues but in order
for that to happen, the user would have to trigger a perfectly timed reload as a realtime queue is being
looked up, which is highly unlikely (but taken care of nonetheless).


........

................
r82329 | file | 2007-09-13 10:58:59 -0600 (Thu, 13 Sep 2007) | 2 lines

Add setvar support to chan_zap. Just like you can in chan_sip and chan_iax2 you can now use it with zaptel channels. (done while in Montreal at the Asterisk bootcamp!)

................
r82336 | kpfleming | 2007-09-13 12:13:44 -0600 (Thu, 13 Sep 2007) | 18 lines

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

................
r82335 | kpfleming | 2007-09-13 11:12:00 -0700 (Thu, 13 Sep 2007) | 10 lines

Merged revisions 82334 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r82334 | kpfleming | 2007-09-13 11:10:12 -0700 (Thu, 13 Sep 2007) | 2 lines

clarify the OpenSSL and OpenH323 license exceptions

........

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

................
r82338 | russell | 2007-09-13 12:52:35 -0600 (Thu, 13 Sep 2007) | 12 lines

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

........
r82337 | russell | 2007-09-13 13:45:59 -0500 (Thu, 13 Sep 2007) | 4 lines

Only compile in tracking astobj2 statistics if dev-mode is enabled.  Also, when
dev mode is enabled, register the CLI command that can be used to run the astobj2
test and print out statistics.

........

................
r82341 | russell | 2007-09-13 13:16:24 -0600 (Thu, 13 Sep 2007) | 9 lines

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

........
r82339 | russell | 2007-09-13 13:57:08 -0500 (Thu, 13 Sep 2007) | 1 line

resolve a warning when not building under dev mode
........

................
r82345 | qwell | 2007-09-13 14:13:58 -0600 (Thu, 13 Sep 2007) | 17 lines

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

........
r82344 | qwell | 2007-09-13 15:11:40 -0500 (Thu, 13 Sep 2007) | 9 lines

Fix a crash that could occur in cdr_csv when mutliple threads tried to close the same file.

Do we actually need the locking here?  What happens if you open the same file twice, and
 two threads try to write to it at the same time?  Is fputs() going to write out the entire
 line at once?  I suspect that it could be possible for the second fopen to run during the
 first fputs, so the position could be in the middle of the previously written line...

Issue 10347, initial patch by explidous (but I removed all of the paranoia stuff..)

........

................
r82347 | mmichelson | 2007-09-13 14:17:41 -0600 (Thu, 13 Sep 2007) | 12 lines

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

........
r82346 | mmichelson | 2007-09-13 15:16:37 -0500 (Thu, 13 Sep 2007) | 4 lines

Preemptively fixing a possible segfault. It is possible that queuename is NULL 
(meaning pause ALL queues), so use q->name instead.


........

................
r82349 | mmichelson | 2007-09-13 15:23:32 -0600 (Thu, 13 Sep 2007) | 3 lines

Added the ability to pause and unpause members via the CLI


................
r82352 | mmichelson | 2007-09-13 15:53:01 -0600 (Thu, 13 Sep 2007) | 4 lines

Changed "in" to "queue" in "queue {pause|unpause} member" command to be more clear.
Also added check to be sure that sixth argument is the word "reason" if full command is given


................
r82359 | qwell | 2007-09-13 17:12:16 -0600 (Thu, 13 Sep 2007) | 12 lines

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

........
r82358 | qwell | 2007-09-13 18:11:27 -0500 (Thu, 13 Sep 2007) | 4 lines

Fix a small typo.

retrytime > waittime

........

................
r82373 | phsultan | 2007-09-14 07:02:31 -0600 (Fri, 14 Sep 2007) | 1 line

Fix DTMF following what has been done in issue #9401. Thanks irroot.
................
r82377 | mmichelson | 2007-09-14 08:44:15 -0600 (Fri, 14 Sep 2007) | 13 lines

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

........
r82376 | mmichelson | 2007-09-14 09:42:29 -0500 (Fri, 14 Sep 2007) | 5 lines

Fixing a typo in the coding guidelines

(closes issue #10717, reported and patched by leedm777)


........

................
r82386 | russell | 2007-09-14 09:52:28 -0600 (Fri, 14 Sep 2007) | 11 lines

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

........
r82385 | russell | 2007-09-14 10:50:49 -0500 (Fri, 14 Sep 2007) | 3 lines

Add checking for libusb here, so nobody has to deal with conflicts in the
chan_usbradio-1.4 branch every time the configure script gets changed

........

................
r82389 | russell | 2007-09-14 09:58:31 -0600 (Fri, 14 Sep 2007) | 2 lines

Add chan_usbradio to trunk

................
r82391 | russell | 2007-09-14 10:02:39 -0600 (Fri, 14 Sep 2007) | 2 lines

use the standard license header for the xpmr files

................
r82393 | tilghman | 2007-09-14 11:29:23 -0600 (Fri, 14 Sep 2007) | 2 lines

Add a direct execute method to res_odbc (closes issue #10722)

................
r82395 | qwell | 2007-09-14 11:51:22 -0600 (Fri, 14 Sep 2007) | 13 lines

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

........
r82394 | qwell | 2007-09-14 12:48:05 -0500 (Fri, 14 Sep 2007) | 5 lines

If a channel does not have an owner, do not try to set a channel variable.
This will end up making the channel variable global, which is not right.

Closes issue #10720, patch by flefoll.

........

................
r82397 | mmichelson | 2007-09-14 12:34:53 -0600 (Fri, 14 Sep 2007) | 13 lines

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

........
r82396 | mmichelson | 2007-09-14 13:28:36 -0500 (Fri, 14 Sep 2007) | 5 lines

Adding member name field to manager events where they were missing before

(closes issue #10721, reported by snar)


........

................
r82400 | mmichelson | 2007-09-14 12:37:00 -0600 (Fri, 14 Sep 2007) | 3 lines

Blocking revision 82398


................
r82401 | qwell | 2007-09-14 13:49:05 -0600 (Fri, 14 Sep 2007) | 4 lines

Add support in chan_skinny for sending RTP directly to the endpoints.

Closes issue #9154, patch by DEA

................
r82454 | russell | 2007-09-14 15:21:23 -0600 (Fri, 14 Sep 2007) | 11 lines

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

........
r82435 | russell | 2007-09-14 16:17:08 -0500 (Fri, 14 Sep 2007) | 3 lines

Add a note to help clarify the value set with the echocancel option.
(inspired by Malcolm's blog post on blogs.digium.com about HPEC)

........

................
r82457 | murf | 2007-09-14 15:30:44 -0600 (Fri, 14 Sep 2007) | 9 lines

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

........
r82444 | murf | 2007-09-14 15:19:27 -0600 (Fri, 14 Sep 2007) | 1 line

closes issue #10668; thanks to arkadia for his patch; had to leave out the bit about ending the previous cdr in the fork; it would destroy current implementations.
........

................
r82496 | tilghman | 2007-09-16 09:32:00 -0600 (Sun, 16 Sep 2007) | 2 lines

Option maxmessage should be maxsecs per-folder, too (closes issue #10729)

................
r82516 | file | 2007-09-16 20:02:09 -0600 (Sun, 16 Sep 2007) | 12 lines

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

........
r82514 | file | 2007-09-16 23:00:59 -0300 (Sun, 16 Sep 2007) | 4 lines

(closes issue #10734)
Reported by: asgaroth
Instead of passing a NULL pointer into snprintf pass "". It makes Solaris much happier.

........

................
r82546 | file | 2007-09-16 20:20:40 -0600 (Sun, 16 Sep 2007) | 4 lines

(closes issue #10715)
Reported by: the-chopper
Don't bother hanging up the new channel if it does not exist yet.

................
r82568 | dbailey | 2007-09-17 08:58:19 -0600 (Mon, 17 Sep 2007) | 2 lines

Fix memory leak introduced when POST support was added.

................
r82593 | kpfleming | 2007-09-17 10:44:13 -0600 (Mon, 17 Sep 2007) | 15 lines

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

........
r82590 | kpfleming | 2007-09-17 11:33:30 -0500 (Mon, 17 Sep 2007) | 2 lines

fix a couple of places where a logical member name (if specified) was not used, but instead the direct interface was listed

........
r82592 | kpfleming | 2007-09-17 11:40:12 -0500 (Mon, 17 Sep 2007) | 2 lines

revert a change that wasn't supposed to be committed... doh!

........

................
r82595 | russell | 2007-09-17 10:58:23 -0600 (Mon, 17 Sep 2007) | 13 lines

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

........
r82594 | russell | 2007-09-17 11:46:59 -0500 (Mon, 17 Sep 2007) | 5 lines

Handle the case where there are multiple dynamic features with the same digit
mapping, but won't always match the activated on/by access controls.  In that
case, the code needs to keep trying features for a match.
(reported by Atis on the asterisk-dev list, patched by me)

........

................
r82628 | russell | 2007-09-17 12:57:56 -0600 (Mon, 17 Sep 2007) | 3 lines

Make the MALLOC_DEBUG output for free() useful again.  After changing calls to
free to be ast_free, astmm said all calls to free were coming from utils.h

................
r82660 | russell | 2007-09-17 14:10:10 -0600 (Mon, 17 Sep 2007) | 14 lines

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

........
r82644 | russell | 2007-09-17 15:00:32 -0500 (Mon, 17 Sep 2007) | 6 lines

Initialize some memory to fix crashes when leaving voicemail.  This problem
was fixed by running Asterisk under valgrind.
(closes issue #10746, reported by arcivanov, patched by me)

*** IMPORTANT NOTE:  We need to check to see if this same bug exists elsewhere.

........

................
r82678 | russell | 2007-09-17 14:19:58 -0600 (Mon, 17 Sep 2007) | 12 lines

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

........
r82676 | russell | 2007-09-17 15:16:25 -0500 (Mon, 17 Sep 2007) | 4 lines

Put a memset in ast_localtime() instead of a couple places in app_voicemail
to prevent the problem everywhere instead of just a couple of places.
(related to issue #10746)

........

................
r82679 | russell | 2007-09-17 14:24:50 -0600 (Mon, 17 Sep 2007) | 3 lines

Add support for #include, var_metric, and cat_metric in res_config_sqlite
(closes issue #10738, rbraun_proformatique)

................
r82710 | qwell | 2007-09-17 15:44:38 -0600 (Mon, 17 Sep 2007) | 4 lines

Fix the sample redirect to point to a valid file in the Asterisk GUI.

Closes issue #10748, patch by bkruse

................
r82712 | qwell | 2007-09-17 15:52:07 -0600 (Mon, 17 Sep 2007) | 4 lines

Don't try to continue loading cdr_sqlite3_custom on a module load failure (such as the config not existing)

Closes issue #10749, patch by seanbright.

................
r82728 | russell | 2007-09-17 16:59:36 -0600 (Mon, 17 Sep 2007) | 1 line

convert various places that access the channel lock directly to use the channel lock wrappers
................
r82752 | qwell | 2007-09-18 09:29:26 -0600 (Tue, 18 Sep 2007) | 13 lines

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

(Closes issue #10753)
........
r82751 | qwell | 2007-09-18 10:28:21 -0500 (Tue, 18 Sep 2007) | 4 lines

Correct the allowexternaldomains option in SIP sample config.

Issue 10753

........

................
r82776 | russell | 2007-09-18 10:10:48 -0600 (Tue, 18 Sep 2007) | 4 lines

Don't use ast_channel_lock_both() here, it only exists in one of my branches.
This is theoretically a potential deadlock, but it's the way it was before so
I'm going to leave it this way for now.

................
r82793 | russell | 2007-09-18 10:14:14 -0600 (Tue, 18 Sep 2007) | 4 lines

Make sure that libpthread doesn't try to call free() directly when MALLOC_DEBUG
is enabled.  If it does, Asterisk will crash as the address isn't the real
beginning of the allocation.

................
r82800 | qwell | 2007-09-18 10:16:36 -0600 (Tue, 18 Sep 2007) | 9 lines

(closes issue #10755)
Reported by: snar
Patches:
      app-queue-cdr-trunk.patch uploaded by snar (license 245)
      queues.conf.patch uploaded by snar (license 245)

Add an updatecdr option to queues.conf, so that if a "member name" is specified,
 the cdr record will be updated with that, rather than the channel.

................
r82803 | russell | 2007-09-18 10:34:05 -0600 (Tue, 18 Sep 2007) | 12 lines

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

........
r82802 | russell | 2007-09-18 11:31:01 -0500 (Tue, 18 Sep 2007) | 4 lines

When copying the contents from the wildcard peer, do a deep copy instead of
shallow copy so that it doesn't crash when beging destroyed.
(closes issue #10546, patch by me)

........

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

Added:
    team/group/CDRfix5/channels/chan_usbradio.c
      - copied unchanged from r82803, trunk/channels/chan_usbradio.c
    team/group/CDRfix5/channels/xpmr/
      - copied from r82803, trunk/channels/xpmr/
    team/group/CDRfix5/channels/xpmr/sinetabx.h
      - copied unchanged from r82803, trunk/channels/xpmr/sinetabx.h
    team/group/CDRfix5/channels/xpmr/xpmr.c
      - copied unchanged from r82803, trunk/channels/xpmr/xpmr.c
    team/group/CDRfix5/channels/xpmr/xpmr.h
      - copied unchanged from r82803, trunk/channels/xpmr/xpmr.h
    team/group/CDRfix5/channels/xpmr/xpmr_coef.h
      - copied unchanged from r82803, trunk/channels/xpmr/xpmr_coef.h
Modified:
    team/group/CDRfix5/   (props changed)
    team/group/CDRfix5/CHANGES
    team/group/CDRfix5/LICENSE
    team/group/CDRfix5/apps/app_dial.c
    team/group/CDRfix5/apps/app_meetme.c
    team/group/CDRfix5/apps/app_queue.c
    team/group/CDRfix5/apps/app_sms.c
    team/group/CDRfix5/apps/app_voicemail.c
    team/group/CDRfix5/apps/app_zapscan.c
    team/group/CDRfix5/build_tools/menuselect-deps.in
    team/group/CDRfix5/cdr/cdr_csv.c
    team/group/CDRfix5/cdr/cdr_sqlite3_custom.c
    team/group/CDRfix5/channels/chan_agent.c
    team/group/CDRfix5/channels/chan_alsa.c
    team/group/CDRfix5/channels/chan_gtalk.c
    team/group/CDRfix5/channels/chan_iax2.c
    team/group/CDRfix5/channels/chan_jingle.c
    team/group/CDRfix5/channels/chan_local.c
    team/group/CDRfix5/channels/chan_mgcp.c
    team/group/CDRfix5/channels/chan_misdn.c
    team/group/CDRfix5/channels/chan_sip.c
    team/group/CDRfix5/channels/chan_skinny.c
    team/group/CDRfix5/channels/chan_zap.c
    team/group/CDRfix5/channels/misdn/isdn_lib.c
    team/group/CDRfix5/codecs/gsm/src/long_term.c
    team/group/CDRfix5/codecs/gsm/src/lpc.c
    team/group/CDRfix5/configs/http.conf.sample
    team/group/CDRfix5/configs/queues.conf.sample
    team/group/CDRfix5/configs/res_config_sqlite.conf
    team/group/CDRfix5/configs/sip.conf.sample
    team/group/CDRfix5/configs/skinny.conf.sample
    team/group/CDRfix5/configs/zapata.conf.sample
    team/group/CDRfix5/configure
    team/group/CDRfix5/configure.ac
    team/group/CDRfix5/doc/CODING-GUIDELINES
    team/group/CDRfix5/doc/res_config_sqlite.txt
    team/group/CDRfix5/funcs/func_strings.c
    team/group/CDRfix5/include/asterisk.h
    team/group/CDRfix5/include/asterisk/autoconfig.h.in
    team/group/CDRfix5/include/asterisk/doxyref.h
    team/group/CDRfix5/include/asterisk/jingle.h
    team/group/CDRfix5/include/asterisk/localtime.h
    team/group/CDRfix5/include/asterisk/res_odbc.h
    team/group/CDRfix5/include/asterisk/threadstorage.h
    team/group/CDRfix5/include/asterisk/utils.h
    team/group/CDRfix5/main/app.c
    team/group/CDRfix5/main/asterisk.c
    team/group/CDRfix5/main/astobj2.c
    team/group/CDRfix5/main/config.c
    team/group/CDRfix5/main/http.c
    team/group/CDRfix5/main/manager.c
    team/group/CDRfix5/main/minimime/minimime.c
    team/group/CDRfix5/main/minimime/mm_mem.c
    team/group/CDRfix5/main/minimime/tests/create.c
    team/group/CDRfix5/main/minimime/tests/parse.c
    team/group/CDRfix5/main/pbx.c
    team/group/CDRfix5/main/stdtime/localtime.c
    team/group/CDRfix5/main/stdtime/tzfile.h
    team/group/CDRfix5/makeopts.in
    team/group/CDRfix5/pbx/pbx_config.c
    team/group/CDRfix5/pbx/pbx_dundi.c
    team/group/CDRfix5/pbx/pbx_spool.c
    team/group/CDRfix5/res/ael/pval.c
    team/group/CDRfix5/res/res_agi.c
    team/group/CDRfix5/res/res_config_sqlite.c
    team/group/CDRfix5/res/res_features.c
    team/group/CDRfix5/res/res_odbc.c
    team/group/CDRfix5/utils/Makefile
    team/group/CDRfix5/utils/hashtest2.c

Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 18 13:14:05 2007
@@ -1,1 +1,1 @@
-/trunk:1-82208
+/trunk:1-82831

Modified: team/group/CDRfix5/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/CHANGES?view=diff&rev=82832&r1=82831&r2=82832
==============================================================================
--- team/group/CDRfix5/CHANGES (original)
+++ team/group/CDRfix5/CHANGES Tue Sep 18 13:14:05 2007
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------
 --- Functionality changes since Asterisk 1.4-beta was branched ----------------
 -------------------------------------------------------------------------------
 
@@ -50,6 +50,7 @@
   * New CLI command "core show settings"
   * Added 'core show channels count' CLI command.
   * Added the ability to set the core debug and verbose values on a per-file basis.
+  * Added 'queue pause member' and 'queue unpause member' CLI commands
 
 SIP changes
 -----------
@@ -81,7 +82,10 @@
   * Added rtpdest option to CHANNEL() dialplan function.
   * Added SIPREFERRINGCONTEXT and SIPREFERREDBYHDR variables which are set when a transfer takes place.
   * SIP now adds a header to the CANCEL if the call was answered by another phone
-    in the same dial command, or if the new c option in dial() is used.
+     in the same dial command, or if the new c option in dial() is used.
+  * The new default is that 100 Trying is not sent on REGISTER attempts as the RFC specifically
+     states it is not needed. For phones, however, that do require it the registertrying option
+     has been added so it can be enabled. 
 
 IAX2 changes
 ------------
@@ -217,6 +221,7 @@
     those carriers that transmit CID via dtmf after a polarity change.
   * CID matching information is now shown when doing 'dialplan show'.
   * Added zap show version CLI command to chan_zap.
+  * Added setvar support to zapata.conf channel entries.
 
 H.323 Changes
 -------------

Modified: team/group/CDRfix5/LICENSE
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/LICENSE?view=diff&rev=82832&r1=82831&r2=82832
==============================================================================
--- team/group/CDRfix5/LICENSE (original)
+++ team/group/CDRfix5/LICENSE Tue Sep 18 13:14:05 2007
@@ -32,7 +32,7 @@
 would strongly encourage you to make the same exception that we do).
 
 Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323.
+OpenH323 and distribute the resulting binary files.
 
 In addition, Asterisk implements two management/control protocols: the
 Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface

Modified: team/group/CDRfix5/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_dial.c?view=diff&rev=82832&r1=82831&r2=82832
==============================================================================
--- team/group/CDRfix5/apps/app_dial.c (original)
+++ team/group/CDRfix5/apps/app_dial.c Tue Sep 18 13:14:05 2007
@@ -1973,7 +1973,7 @@
 	if (!con)
 		ast_log(LOG_ERROR, "Dial virtual context 'app_dial_gosub_virtual_context' does not exist and unable to create\n");
 	else
-		ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free, "app_dial");
+		ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_dial");
 
 	res = ast_register_application(app, dial_exec, synopsis, descrip);
 	res |= ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);

Modified: team/group/CDRfix5/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_meetme.c?view=diff&rev=82832&r1=82831&r2=82832
==============================================================================
--- team/group/CDRfix5/apps/app_meetme.c (original)
+++ team/group/CDRfix5/apps/app_meetme.c Tue Sep 18 13:14:05 2007
@@ -344,6 +344,8 @@
 	unsigned int isdynamic:1;               /*!< Created on the fly? */
 	unsigned int locked:1;                  /*!< Is the conference locked? */
 	pthread_t recordthread;                 /*!< thread for recording */
+	ast_mutex_t recordthreadlock;		/*!< control threads trying to start recordthread */
+	pthread_attr_t attr;                    /*!< thread attribute */
 	const char *recordingfilename;          /*!< Filename to record the Conference into */
 	const char *recordingformat;            /*!< Format to record the Conference in */
 	char pin[MAX_PIN];                      /*!< If protected by a PIN */
@@ -782,6 +784,8 @@
 
 	ast_mutex_init(&cnf->playlock);
 	ast_mutex_init(&cnf->listenlock);
+	cnf->recordthread = AST_PTHREADT_NULL;
+	ast_mutex_init(&cnf->recordthreadlock);
 	ast_copy_string(cnf->confno, confno, sizeof(cnf->confno));
 	ast_copy_string(cnf->pin, pin, sizeof(cnf->pin));
 	ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin));
@@ -850,8 +854,8 @@
 	int hr, min, sec;
 	int i = 0, total = 0;
 	time_t now;
-	char *header_format = "%-14s %-14s %-10s %-8s  %-8s\n";
-	char *data_format = "%-12.12s   %4.4d	      %4.4s       %02d:%02d:%02d  %-8s\n";
+	char *header_format = "%-14s %-14s %-10s %-8s  %-8s  %-6s\n";
+	char *data_format = "%-12.12s   %4.4d	      %4.4s       %02d:%02d:%02d  %-8s  %-6s\n";
 	char cmdline[1024] = "";
 
 	if (argc > 8)
@@ -870,7 +874,7 @@
 			AST_LIST_UNLOCK(&confs);
 			return RESULT_SUCCESS;
 		}
-		ast_cli(fd, header_format, "Conf Num", "Parties", "Marked", "Activity", "Creation");
+		ast_cli(fd, header_format, "Conf Num", "Parties", "Marked", "Activity", "Creation", "Locked");
 		AST_LIST_TRAVERSE(&confs, cnf, list) {
 			if (cnf->markedusers == 0)
 				strcpy(cmdline, "N/A ");
@@ -880,7 +884,7 @@
 			min = ((now - cnf->start) % 3600) / 60;
 			sec = (now - cnf->start) % 60;
 
-			ast_cli(fd, data_format, cnf->confno, cnf->users, cmdline, hr, min, sec, cnf->isdynamic ? "Dynamic" : "Static");
+			ast_cli(fd, data_format, cnf->confno, cnf->users, cmdline, hr, min, sec, cnf->isdynamic ? "Dynamic" : "Static", cnf->locked ? "Yes" : "No");
 
 			total += cnf->users; 	
 		}
@@ -1282,7 +1286,10 @@
 		ast_hangup(conf->chan);
 	else
 		close(conf->fd);
-	
+
+	ast_mutex_destroy(&conf->playlock);
+	ast_mutex_destroy(&conf->listenlock);
+	ast_mutex_destroy(&conf->recordthreadlock);
 	ast_free(conf);
 
 	return 0;
@@ -1468,7 +1475,8 @@
 		}
 	}
 
-	if ((conf->recording == MEETME_RECORD_OFF) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL)))) {
+	ast_mutex_lock(&conf->recordthreadlock);
+	if ((conf->recordthread == AST_PTHREADT_NULL) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL)))) {
 		ast_set_read_format(conf->lchan, AST_FORMAT_SLINEAR);
 		ast_set_write_format(conf->lchan, AST_FORMAT_SLINEAR);
 		ztc.chan = 0;
@@ -1482,6 +1490,7 @@
 			ast_pthread_create_detached_background(&conf->recordthread, NULL, recordthread, conf);
 		}
 	}

[... 7841 lines stripped ...]



More information about the asterisk-commits mailing list