[asterisk-commits] jdixon: branch jdixon/chan_usbradio-1.4 r155798 - in /team/jdixon/chan_usbrad...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Nov 10 14:32:22 CST 2008
Author: jdixon
Date: Mon Nov 10 14:32:21 2008
New Revision: 155798
URL: http://svn.digium.com/view/asterisk?view=rev&rev=155798
Log:
Merged revisions 147429-147430,147517,147681,147941,147997,148257,148611,148736,148912,148916,148987,148990,149061,149130,149200,149204,149207,149266,149452,149683,149840,150056,150124,150298,150301,150304,150557,150637,150816,151100,151167,151240-151241,151763,151905,152059,152215,152286,152368,152463,152535,152538-152539,152811,152922,152958,152992,153095,153114,153270,153337,153651,153823,154060,154066,154263,154266,154365,154685,154724,155011,155398,155553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r147429 | kpfleming | 2008-10-07 15:59:08 -0700 (Tue, 07 Oct 2008) | 3 lines
don't start a PBX on incoming PRI call channels until after we're done setting channel variables and other things on the channel, otherwise the channel might go away (if the dialplan hangs up quickly) before we are done, which results in a spectacular crash
........
r147430 | kpfleming | 2008-10-07 16:14:57 -0700 (Tue, 07 Oct 2008) | 1 line
revert this change until i can understand why it results in locking order changes
........
r147517 | file | 2008-10-08 07:51:42 -0700 (Wed, 08 Oct 2008) | 2 lines
If we receive DTMF make sure that the state of the speech structure goes back to being not ready. (issue #LUMENVOX-8)
........
r147681 | kpfleming | 2008-10-08 15:22:09 -0700 (Wed, 08 Oct 2008) | 3 lines
when parsing a text configuration option, ensure that the buffer on the stack is actually large enough to hold the legal values of that option, and also ensure that sscanf() knows to stop parsing if it would overrun the buffer (without these changes, specifying "buffers=...,immediate" would overflow the buffer on the stack, and could not have worked as expected)
........
r147941 | jpeeler | 2008-10-09 11:56:00 -0700 (Thu, 09 Oct 2008) | 6 lines
(closes issue #13139)
Reported by: krisk84
Tested by: krisk84
This change prevents a call that is placed in the parkinglot to be picked up before the PBX is finished. If another extension dials the parking extension before the PBX thread has completed at minimum warnings will occur about the PBX not properly being terminated. At worst, a crash could occur.
........
r147997 | tilghman | 2008-10-09 12:38:33 -0700 (Thu, 09 Oct 2008) | 4 lines
When blank, callerid name and number should display "unknown caller" in voicemail
emails.
(Closes issue #13643)
........
r148257 | tilghman | 2008-10-10 09:25:31 -0700 (Fri, 10 Oct 2008) | 7 lines
User not notified of temporary greeting, if ODBC storage is in use.
(closes issue #13659)
Reported by: moliveras
Patches:
20081009__bug13659.diff.txt uploaded by Corydon76 (license 14)
Tested by: moliveras
........
r148611 | kpfleming | 2008-10-14 00:54:41 -0700 (Tue, 14 Oct 2008) | 3 lines
it would be nice if this message printing code had actually been tested before it was committed...
........
r148736 | kpfleming | 2008-10-14 03:30:54 -0700 (Tue, 14 Oct 2008) | 3 lines
on Ubuntu (at least), recent versions of ld in binutils delete all debugging symbols when -x is supplied; since the reasons why -x is being passed are lost in the mists of time, remove it so debugging will work properly
........
r148912 | mmichelson | 2008-10-14 10:33:38 -0700 (Tue, 14 Oct 2008) | 9 lines
Deadlock prevention in chan_local.
(closes issue #13676)
Reported by: tacvbo
Patches:
13676.patch uploaded by putnopvut (license 60)
Tested by: tacvbo
........
r148916 | tilghman | 2008-10-14 10:41:08 -0700 (Tue, 14 Oct 2008) | 4 lines
Ensure that mail headers are 7-bit clean, even when UTF-8 characters are used
in headers like 'Subject' and 'To'.
Closes AST-107.
........
r148987 | tilghman | 2008-10-14 12:03:08 -0700 (Tue, 14 Oct 2008) | 2 lines
Some compilers warn, some don't. Fixing.
........
r148990 | lmadsen | 2008-10-14 12:05:12 -0700 (Tue, 14 Oct 2008) | 4 lines
Add in some missing updates to the CHANGES file for sip.conf
(closes issue #13100)
Reported and patch by: gknispel_proformatique
........
r149061 | tilghman | 2008-10-14 13:09:06 -0700 (Tue, 14 Oct 2008) | 6 lines
Check correct values in the return of ast_waitfor(); also, get rid of a
possible memory leak.
(closes issue #13658)
Reported by: explidous
Patch by: me
........
r149130 | mmichelson | 2008-10-14 13:49:02 -0700 (Tue, 14 Oct 2008) | 7 lines
Don't allow reserved characters to be used in register
lines in sip.conf.
(closes issue #13570)
Reported by: putnopvut
........
r149200 | mmichelson | 2008-10-14 15:40:42 -0700 (Tue, 14 Oct 2008) | 12 lines
Update the queue with the correct number of calls and
whether the call was completed within the service level
when a transfer takes place. This way, we do not "break"
the leastrecent and fewestcalls strategies by not logging
a call until after the transferred call has ended.
(closes issue #13395)
Reported by: Marquis
Patches:
app_queue.c.transfer.patch uploaded by Marquis (license 32)
........
r149204 | mmichelson | 2008-10-14 16:00:01 -0700 (Tue, 14 Oct 2008) | 12 lines
Add a tolerance period for sync-triggered audiohooks
so that if packetization of audio is close (but not equal)
we don't end up flushing the audiohooks over small
inconsistencies in synchronization.
Related to issue #13005, and solves the issue
for most people who were experiencing the problem.
However, a small number of people are still experiencing
the problem on long calls, so I am not closing
the issue yet
........
r149207 | mmichelson | 2008-10-14 16:10:26 -0700 (Tue, 14 Oct 2008) | 9 lines
Call register_peer_exten even in the case that the peer's
IP/port does not change.
(closes issue #13309)
Reported by: dimas
Patches:
v2-13309.patch uploaded by dimas (license 88)
........
r149266 | mmichelson | 2008-10-14 16:43:58 -0700 (Tue, 14 Oct 2008) | 4 lines
Change this warning to an error message. Suggestion
comes from Sean Bright. Thanks Sean!
........
r149452 | kpfleming | 2008-10-15 03:30:40 -0700 (Wed, 15 Oct 2008) | 3 lines
fix some problems when parsing SIP messages that have the maximum number of headers or body lines that we support
........
r149683 | bweschke | 2008-10-15 11:28:54 -0700 (Wed, 15 Oct 2008) | 4 lines
An update to the documentation/example of agents.conf.sample with the correct parameter for this feature as defined in chan_agent.c
(closes issue #13709)
........
r149840 | bweschke | 2008-10-15 14:34:02 -0700 (Wed, 15 Oct 2008) | 4 lines
Another documentation fix.
(closes issue #13708)
........
r150056 | murf | 2008-10-16 08:26:10 -0700 (Thu, 16 Oct 2008) | 50 lines
This patch is relevant to:
ABE-1628 and RYM-150398 and AST-103 in internal Digium
bug trackers.
These fixes address a really subtle memory corruption
problem that would happen in machines heavily loaded
in production environments. The corruption would
always take the form of the STMT object getting
nulled out and one of the unixODBC calls would
crash trying to access statement->connection.
It isn't fully proven yet, but the server has
now been running 2.5 days without appreciable
memory growth, or any gain of %cpu, and no
crashes. Whether this is the problem or not
on that server, these fixes are still warranted.
As it turns out, **I** introduced these errors
unwittingly, when I corrected another crash earlier.
I had formed the build_query routine, and failed
to remove mutex_unlock calls in 3 places in the
transplanted code. These unlocks would only
happen in error situations, but unlocking the
mutex early set the code up for a catastrophic
failure, it appears. It would happen only once
every 100K-200K or more calls, under heavy load...
but that is enough.
If another crash occurs, with the same MO,
I'll come back and remove my confession from the log, and
we'll keep searching, but the fact that we
have Asterisk dying from an asynchronous
wiping of the STMT object, only on some connection
error, and that the server has lived for 2.5
days on this code without a crash, sure make
it look like this was the problem!
Also, in several points, Statement handles are
set to NULL after SQLFreeHandle. This was mainly
for insurance, to guarantee a crash. As it turns
out, the code does not appear to be attempting
to use these freed pointers.
Asterisk owes a debt of gratitude to Federico Alves
and Frediano Ziglio for their untiring efforts in
finding this bug, among others.
........
r150124 | rmudgett | 2008-10-16 08:56:06 -0700 (Thu, 16 Oct 2008) | 1 line
Fix memory leak found by customer
........
r150298 | mmichelson | 2008-10-16 16:34:37 -0700 (Thu, 16 Oct 2008) | 10 lines
Don't try to call a dialplan function's read callback from
the manager's GetVar handler if an invalid channel has
been specified. Several dialplan functions, including
CHANNEL and SIP_HEADER, do not check for NULL-ness of
the channel being passed in.
(closes issue #13715)
Reported by: makoto
........
r150301 | mmichelson | 2008-10-16 16:35:07 -0700 (Thu, 16 Oct 2008) | 3 lines
And don't forget to return on the error condition
........
r150304 | mmichelson | 2008-10-16 16:40:54 -0700 (Thu, 16 Oct 2008) | 6 lines
Reverting changes from commits 150298 and 150301 since
I was mistakenly under the assumption that dialplan functions
*always* required that a channel be present. I need to go
home earlier, I think :)
........
r150557 | qwell | 2008-10-17 08:31:35 -0700 (Fri, 17 Oct 2008) | 9 lines
Correctly allow chan_dahdi to compile against older versions of Zaptel.
Don't always define HAVE_ZAPTEL_CHANALARMS (since we check if it's defined..)
Minor cleanup to make things clear.
(closes issue #13726)
Reported by: tzafrir
Patches:
dahdi_def.diff uploaded by tzafrir (license 46)
........
r150637 | murf | 2008-10-17 10:18:31 -0700 (Fri, 17 Oct 2008) | 11 lines
Interesting crash. In this case, you exit the
bridge with peer completely GONE.
I moved the channel find call up to cover the
whole peer CDR reset code segment. This appears
to solve the crash without changing the logic
at all.
........
r150816 | bweschke | 2008-10-17 18:42:23 -0700 (Fri, 17 Oct 2008) | 6 lines
Using the GetVar handler in AMI is potentially dangerous (insta-crash [tm]) when you use a dialplan function that requires a channel and then you don't provide one or provide an invalid one in the Channel: parameter. We'll handle this situation exactly the same way it was handled in pbx.c back on r61766.
We'll create a bogus channel for the function call and destroy it when we're done. If we have trouble allocating the bogus channel then we're not going to try executing the function call at all and run the risk of crashing.
(closes issue #13715)
reported by: makoto
patch by: bweschke
........
r151100 | bweschke | 2008-10-19 12:07:05 -0700 (Sun, 19 Oct 2008) | 7 lines
Fix the 1.4 branch compile again broken with r150557 when using with Zaptel and not DAHDI
(closes issue #13740)
reported by: jmls
patch by: bweschke
........
r151167 | bweschke | 2008-10-19 12:51:16 -0700 (Sun, 19 Oct 2008) | 11 lines
As per kpfleming's comments to the prior commit, I'm reverting some of the changes here.
A comment was made in bug #13726
"3. The same mistake as in (2) is done in a few other places in the code that check for: #if defined(HAVE_ZAPTEL) || defined(HAVE_DAHDI)
Harmless, but still incorrect."
In the case of main/asterisk.c, this is not incorrect because without HAVE_ZAPTEL defined, we're missing
the include for ioctl and the namespace that defines DAHDI_TIMERCONFIG which is still required when
using Zaptel with the 1.4 branch.
........
r151240 | kpfleming | 2008-10-19 21:45:56 -0700 (Sun, 19 Oct 2008) | 3 lines
break up acinclude.m4 into individual files, which will make it easier to maintain, easier to add new macros (less patching) and will ease maintenance of these macros across Asterisk branches
........
r151241 | kpfleming | 2008-10-19 21:57:33 -0700 (Sun, 19 Oct 2008) | 2 lines
rename this macro to properly reflect what it does
........
r151763 | twilson | 2008-10-23 09:04:42 -0700 (Thu, 23 Oct 2008) | 9 lines
Backport fix from 1.6.0 that allows you to set parkedcalltransfers=no|caller|callee|both, but default to both which would be the equivalent of the existing behaviour.
The problem was that if someone parked a call, the callee and caller would both get assigned the builtin transfer feature, which would not only be potentially giving someone the ability to transfer themselves when they shouldn't have it, but would also dissallow reinviting the media off of the call.
(closes issue #12854)
Reported by: davidw
Patches:
parkingfix4.diff.txt uploaded by otherwiseguy
Tested by: davidw, otherwiseguy
........
r151905 | russell | 2008-10-25 03:59:02 -0700 (Sat, 25 Oct 2008) | 8 lines
Move AMI initialization to occur after loading modules. This prevents a
deadlock when someone tries to initiate a module reload from the AMI just
as Asterisk is starting.
(closes issue #13778)
Reported by: hotsblanc
Fix suggested by hotsblanc
........
r152059 | seanbright | 2008-10-26 13:23:36 -0700 (Sun, 26 Oct 2008) | 7 lines
Since passing \0 as the second argument to strchr is valid (and will
match the trailing \0 of a string) we need to check that first, otherwise
we end up with incorrect results. Fix suggested by reporter.
(closes issue #13787)
Reported by: meitinger
........
r152215 | tilghman | 2008-10-27 14:32:00 -0700 (Mon, 27 Oct 2008) | 6 lines
Inherit ALL elements of CallerID across a local channel.
(closes issue #13368)
Reported by: Peter Schlaile
Patches:
20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)
........
r152286 | jpeeler | 2008-10-27 16:28:49 -0700 (Mon, 27 Oct 2008) | 2 lines
Buffer policy setting for half is not needed.
........
r152368 | tilghman | 2008-10-28 10:04:56 -0700 (Tue, 28 Oct 2008) | 8 lines
Reset all DIAL variables back to blank, in case Dial is called multiple times
per call (which could otherwise lead to inconsistent status reports).
(closes issue #13216)
Reported by: ruddy
Patches:
20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
Tested by: ruddy
........
r152463 | tilghman | 2008-10-28 15:32:34 -0700 (Tue, 28 Oct 2008) | 3 lines
Quoting in the wrong direction
(Fixes AST-107)
........
r152535 | murf | 2008-10-28 21:36:32 -0700 (Tue, 28 Oct 2008) | 46 lines
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
........
r152538 | murf | 2008-10-28 22:19:04 -0700 (Tue, 28 Oct 2008) | 14 lines
A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.
I hope this doesn't spoil some vast, eternal plan...
........
r152539 | russell | 2008-10-28 22:23:51 -0700 (Tue, 28 Oct 2008) | 7 lines
Fix an incorrect usage of sizeof()
(closes issue #13795)
Reported by: andrew53
Patches:
chan_sip_sizeof.patch uploaded by andrew53 (license 519)
........
r152811 | kpfleming | 2008-10-30 09:53:48 -0700 (Thu, 30 Oct 2008) | 3 lines
instead of comparing the string pointer to 0, let's compare the value that was actually parsed out of the string (found by sparse)
........
r152922 | tilghman | 2008-10-30 12:43:38 -0700 (Thu, 30 Oct 2008) | 6 lines
Unlock before returning, when extension doesn't exist.
(closes issue #13807)
Reported by: eliel
Patches:
chan_local.c.patch uploaded by eliel (license 64)
........
r152958 | tilghman | 2008-10-30 13:33:28 -0700 (Thu, 30 Oct 2008) | 3 lines
Cannot join detached threads. See http://www.opengroup.org/onlinepubs/000095399/functions/pthread_join.html
(Closes issue #13400)
........
r152992 | seanbright | 2008-10-30 13:58:24 -0700 (Thu, 30 Oct 2008) | 2 lines
The -I argument to aclocal needs a space before the include directory name.
........
r153095 | twilson | 2008-10-31 08:45:29 -0700 (Fri, 31 Oct 2008) | 5 lines
Recent CDR fixes moved execution of the 'h' exten into the bridging code, so variables that were set after ast_bridge_call was called would not show up in the 'h' exten. Added a callback function to handle setting variables, etc. from w/in the bridging code. Calls back into a nested function within the function calling ast_bridge_call
(closes issue #13793)
Reported by: greenfieldtech
........
r153114 | tilghman | 2008-10-31 09:30:32 -0700 (Fri, 31 Oct 2008) | 3 lines
Turn off qualify on uncached realtime peers.
(Closes issue #13383)
........
r153270 | twilson | 2008-10-31 15:36:57 -0700 (Fri, 31 Oct 2008) | 2 lines
Add end_bridge_callback for app_follome and add AUTOLOOP flag to res_features
........
r153337 | kpfleming | 2008-11-01 11:22:39 -0700 (Sat, 01 Nov 2008) | 3 lines
fix a bunch of potential problems found by gcc 4.3.x, primarily bare strings being passed to printf()-like functions and ignored results from read()/write() and friends
........
r153651 | russell | 2008-11-02 11:51:17 -0800 (Sun, 02 Nov 2008) | 2 lines
features.h depends on linkedlists.h, so include it
........
r153823 | kpfleming | 2008-11-03 05:01:18 -0800 (Mon, 03 Nov 2008) | 3 lines
somehow missed a bunch of gcc 4.3.x warnings in this branch on the first pass
........
r154060 | tilghman | 2008-11-03 13:48:21 -0800 (Mon, 03 Nov 2008) | 3 lines
Remove the potential for a division by zero error.
(Closes issue #13810)
........
r154066 | tilghman | 2008-11-03 14:27:10 -0800 (Mon, 03 Nov 2008) | 5 lines
Attempting to expunge a mailbox when the mailstream is NULL will crash Asterisk.
(Closes issue #13829)
Reported by: jaroth
Patch by: me (modified jaroth's patch)
........
r154263 | tilghman | 2008-11-04 10:58:05 -0800 (Tue, 04 Nov 2008) | 3 lines
Make the monitor thread non-detached, so it can be joined (suggested by Russell
on -dev list).
........
r154266 | rmudgett | 2008-11-04 11:01:08 -0800 (Tue, 04 Nov 2008) | 4 lines
JIRA ABE-1703
mISDN sets the channel to the wrong state when it receives
the indication AST_CONTROL_RINGING.
........
r154365 | tilghman | 2008-11-04 12:49:33 -0800 (Tue, 04 Nov 2008) | 9 lines
On busy systems, it's possible for the values checked within a single line
of code to change, unless the structure is locked to ensure a consistent
state.
(closes issue #13717)
Reported by: kowalma
Patches:
20081102__bug13717.diff.txt uploaded by Corydon76 (license 14)
Tested by: kowalma
........
r154685 | murf | 2008-11-05 08:06:53 -0800 (Wed, 05 Nov 2008) | 1 line
This fix was prompted by communication from user, who was seeing thousands of error logs... looks like EAGAIN. Made such uninteresting.
........
r154724 | mmichelson | 2008-11-05 08:44:34 -0800 (Wed, 05 Nov 2008) | 6 lines
The logic of a strcasecmp call was reversed
(closes issue #13841)
Reported by: clegall_proformatique
........
r155011 | mmichelson | 2008-11-06 11:45:52 -0800 (Thu, 06 Nov 2008) | 8 lines
The documentation listed the ability to set 'maxmsg' per
context. The truth is that you can only set this in the general section
or per mailbox. Thus I am updating the sample config file to be more
accurate.
Thanks to sasargen on IRC for bringing up this issue.
........
r155398 | tilghman | 2008-11-07 14:27:32 -0800 (Fri, 07 Nov 2008) | 7 lines
Clarify error message.
(closes issue #13809)
Reported by: denke
Patches:
20081104__bug13809.diff.txt uploaded by Corydon76 (license 14)
Tested by: denke
........
r155553 | seanbright | 2008-11-08 17:08:07 -0800 (Sat, 08 Nov 2008) | 6 lines
Use static functions here instead of nested ones. This requires a small
change to the ast_bridge_config struct as well. To understand the reason
for this change, see the following post:
http://gcc.gnu.org/ml/gcc-help/2008-11/msg00049.html
........
Added:
team/jdixon/chan_usbradio-1.4/autoconf/
- copied from r155553, branches/1.4/autoconf/
team/jdixon/chan_usbradio-1.4/autoconf/acx_pthread.m4
- copied unchanged from r155553, branches/1.4/autoconf/acx_pthread.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_c_compile_check.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_c_compile_check.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_c_define_check.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_c_define_check.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_check_gnu_make.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_check_gnu_make.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_check_openh323.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_check_openh323.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_check_pwlib.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_check_pwlib.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_ext_lib.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_ext_lib.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_func_fork.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_func_fork.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_gcc_attribute.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_gcc_attribute.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_prog_egrep.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_prog_egrep.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_prog_ld.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_prog_ld.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_prog_ld_gnu.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_prog_ld_gnu.m4
team/jdixon/chan_usbradio-1.4/autoconf/ast_prog_sed.m4
- copied unchanged from r155553, branches/1.4/autoconf/ast_prog_sed.m4
Removed:
team/jdixon/chan_usbradio-1.4/acinclude.m4
Modified:
team/jdixon/chan_usbradio-1.4/ (props changed)
team/jdixon/chan_usbradio-1.4/CHANGES
team/jdixon/chan_usbradio-1.4/Makefile
team/jdixon/chan_usbradio-1.4/agi/eagi-sphinx-test.c
team/jdixon/chan_usbradio-1.4/agi/eagi-test.c
team/jdixon/chan_usbradio-1.4/apps/app_adsiprog.c
team/jdixon/chan_usbradio-1.4/apps/app_authenticate.c
team/jdixon/chan_usbradio-1.4/apps/app_chanspy.c
team/jdixon/chan_usbradio-1.4/apps/app_dial.c
team/jdixon/chan_usbradio-1.4/apps/app_festival.c
team/jdixon/chan_usbradio-1.4/apps/app_followme.c
team/jdixon/chan_usbradio-1.4/apps/app_queue.c
team/jdixon/chan_usbradio-1.4/apps/app_sms.c
team/jdixon/chan_usbradio-1.4/apps/app_speech_utils.c
team/jdixon/chan_usbradio-1.4/apps/app_voicemail.c
team/jdixon/chan_usbradio-1.4/apps/app_waitforsilence.c
team/jdixon/chan_usbradio-1.4/bootstrap.sh
team/jdixon/chan_usbradio-1.4/cdr/cdr_odbc.c
team/jdixon/chan_usbradio-1.4/channels/chan_agent.c
team/jdixon/chan_usbradio-1.4/channels/chan_alsa.c
team/jdixon/chan_usbradio-1.4/channels/chan_dahdi.c
team/jdixon/chan_usbradio-1.4/channels/chan_h323.c
team/jdixon/chan_usbradio-1.4/channels/chan_iax2.c
team/jdixon/chan_usbradio-1.4/channels/chan_local.c
team/jdixon/chan_usbradio-1.4/channels/chan_misdn.c
team/jdixon/chan_usbradio-1.4/channels/chan_oss.c
team/jdixon/chan_usbradio-1.4/channels/chan_sip.c
team/jdixon/chan_usbradio-1.4/channels/chan_skinny.c
team/jdixon/chan_usbradio-1.4/configs/agents.conf.sample
team/jdixon/chan_usbradio-1.4/configs/features.conf.sample
team/jdixon/chan_usbradio-1.4/configs/voicemail.conf.sample
team/jdixon/chan_usbradio-1.4/configure
team/jdixon/chan_usbradio-1.4/configure.ac
team/jdixon/chan_usbradio-1.4/formats/format_gsm.c
team/jdixon/chan_usbradio-1.4/formats/format_ogg_vorbis.c
team/jdixon/chan_usbradio-1.4/formats/format_wav.c
team/jdixon/chan_usbradio-1.4/formats/format_wav_gsm.c
team/jdixon/chan_usbradio-1.4/funcs/func_channel.c
team/jdixon/chan_usbradio-1.4/funcs/func_enum.c
team/jdixon/chan_usbradio-1.4/funcs/func_odbc.c
team/jdixon/chan_usbradio-1.4/funcs/func_strings.c
team/jdixon/chan_usbradio-1.4/include/asterisk/audiohook.h
team/jdixon/chan_usbradio-1.4/include/asterisk/channel.h
team/jdixon/chan_usbradio-1.4/include/asterisk/features.h
team/jdixon/chan_usbradio-1.4/include/asterisk/pbx.h
team/jdixon/chan_usbradio-1.4/main/ast_expr2f.c
team/jdixon/chan_usbradio-1.4/main/asterisk.c
team/jdixon/chan_usbradio-1.4/main/audiohook.c
team/jdixon/chan_usbradio-1.4/main/cdr.c
team/jdixon/chan_usbradio-1.4/main/channel.c
team/jdixon/chan_usbradio-1.4/main/cli.c
team/jdixon/chan_usbradio-1.4/main/db1-ast/hash/hash_page.c
team/jdixon/chan_usbradio-1.4/main/file.c
team/jdixon/chan_usbradio-1.4/main/http.c
team/jdixon/chan_usbradio-1.4/main/manager.c
team/jdixon/chan_usbradio-1.4/main/rtp.c
team/jdixon/chan_usbradio-1.4/main/translate.c
team/jdixon/chan_usbradio-1.4/main/utils.c
team/jdixon/chan_usbradio-1.4/pbx/ael/ael.flex
team/jdixon/chan_usbradio-1.4/pbx/ael/ael.tab.c
team/jdixon/chan_usbradio-1.4/pbx/ael/ael.tab.h
team/jdixon/chan_usbradio-1.4/pbx/ael/ael.y
team/jdixon/chan_usbradio-1.4/pbx/ael/ael_lex.c
team/jdixon/chan_usbradio-1.4/pbx/pbx_config.c
team/jdixon/chan_usbradio-1.4/pbx/pbx_dundi.c
team/jdixon/chan_usbradio-1.4/res/res_agi.c
team/jdixon/chan_usbradio-1.4/res/res_crypto.c
team/jdixon/chan_usbradio-1.4/res/res_features.c
team/jdixon/chan_usbradio-1.4/res/res_indications.c
team/jdixon/chan_usbradio-1.4/res/res_jabber.c
team/jdixon/chan_usbradio-1.4/res/res_musiconhold.c
team/jdixon/chan_usbradio-1.4/utils/astman.c
team/jdixon/chan_usbradio-1.4/utils/frame.c
team/jdixon/chan_usbradio-1.4/utils/muted.c
team/jdixon/chan_usbradio-1.4/utils/stereorize.c
team/jdixon/chan_usbradio-1.4/utils/streamplayer.c
Propchange: team/jdixon/chan_usbradio-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 10 14:32:21 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-82381,82383-147385
+/branches/1.4:1-82381,82383-155797
Modified: team/jdixon/chan_usbradio-1.4/CHANGES
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/CHANGES?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/CHANGES (original)
+++ team/jdixon/chan_usbradio-1.4/CHANGES Mon Nov 10 14:32:21 2008
@@ -203,10 +203,11 @@
1. mohinterpret
2. mohsuggest
2. agents.conf
+ o multiplelogin variable added
o maxlogintries variable added
o autologoffunavail variable added
o endcall variable added
- o agentgoodbye variable added
+ o goodbye variable added
o createlink variable REMOVED
3. alsa.conf
o mohinterpret variable added
@@ -229,6 +230,7 @@
o atxfernoanswertimeout variable added
o parkcall variable added (one step parking)
o improved documentation for dynamic feature declarations!
+ o added parkedcallltransfers option to control builtin transfers with parking
9. iax.conf
o adsi variable added
o mohinterpret variable added
@@ -295,8 +297,15 @@
21. rtp.conf
o rtcpinterval varaible added
22. sip.conf
+ o allowguest variable can't be set to 'osp'
o allowoverlap variable added
o allowtransfer variable added
+ o limitonpeer variable added
+ o directrtpsetup variable added
+ o buggymwi variable added
+ o ospauth variable REMOVED
+ o notifyhold variable added
+ o autoframing variable added
o tos variable REMOVED
o tos_sip variable added
o tos_audio variable added
@@ -305,18 +314,22 @@
o t1min variable added
o musicclass variable REMOVED
o mohinterpret variable added
- o maxcallbitratesuggest variable added
+ o mohsuggest variable added
o allowsubscribe variable added
o videosupport variable added
o maxcallbitrate variable added
o g726nonstandard variable added
o dumphistory variable added
- o allowsubscribe variable added
o t38pt_udptl variable added
+ o t38pt_rtp variable added
+ o t38pt_tcp variable added
+ o rfc2833compensate variable added
+ o matchexterniplocally variable added
o canreinvite variable can also now be set to 'nonat'
o rtsavesysname variable added
o JitterBuffer support added
o t38pt_usertpsource variable added
+ o regcontext variable can contains multiple contexts separated by an '&'
23. skinny.conf
o port variable renamed to bindport
o JitterBuffer support added
Modified: team/jdixon/chan_usbradio-1.4/Makefile
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/Makefile?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/Makefile (original)
+++ team/jdixon/chan_usbradio-1.4/Makefile Mon Nov 10 14:32:21 2008
@@ -269,7 +269,7 @@
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else
# These are used for all but Darwin
- SOLINK=-shared -Xlinker -x
+ SOLINK=-shared
ifneq ($(findstring BSD,$(OSARCH)),)
LDFLAGS+=-L/usr/local/lib
endif
Modified: team/jdixon/chan_usbradio-1.4/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/agi/eagi-sphinx-test.c?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/agi/eagi-sphinx-test.c (original)
+++ team/jdixon/chan_usbradio-1.4/agi/eagi-sphinx-test.c Mon Nov 10 14:32:21 2008
@@ -70,7 +70,9 @@
char *val;
/* Read environment */
for(;;) {
- fgets(buf, sizeof(buf), stdin);
+ if (!fgets(buf, sizeof(buf), stdin)) {
+ return -1;
+ }
if (feof(stdin))
return -1;
buf[strlen(buf) - 1] = '\0';
@@ -121,7 +123,9 @@
return NULL;
}
if (FD_ISSET(STDIN_FILENO, &fds)) {
- fgets(astresp, sizeof(astresp), stdin);
+ if (!fgets(astresp, sizeof(astresp), stdin)) {
+ return NULL;
+ }
if (feof(stdin)) {
fprintf(stderr, "Got hungup on apparently\n");
return NULL;
@@ -132,9 +136,10 @@
}
if (FD_ISSET(AUDIO_FILENO, &fds)) {
res = read(AUDIO_FILENO, audiobuf, sizeof(audiobuf));
- if (res > 0) {
- if (sphinx_sock > -1)
- write(sphinx_sock, audiobuf, res);
+ if ((res > 0) && (sphinx_sock > -1)) {
+ if (write(sphinx_sock, audiobuf, res) < 0) {
+ fprintf(stderr, "write() failed: %s\n", strerror(errno));
+ }
}
}
if ((sphinx_sock > -1) && FD_ISSET(sphinx_sock, &fds)) {
Modified: team/jdixon/chan_usbradio-1.4/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/agi/eagi-test.c?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/agi/eagi-test.c (original)
+++ team/jdixon/chan_usbradio-1.4/agi/eagi-test.c Mon Nov 10 14:32:21 2008
@@ -24,7 +24,9 @@
char *val;
/* Read environment */
for(;;) {
- fgets(buf, sizeof(buf), stdin);
+ if (!fgets(buf, sizeof(buf), stdin)) {
+ return -1;
+ }
if (feof(stdin))
return -1;
buf[strlen(buf) - 1] = '\0';
@@ -68,7 +70,9 @@
return NULL;
}
if (FD_ISSET(STDIN_FILENO, &fds)) {
- fgets(astresp, sizeof(astresp), stdin);
+ if (!fgets(astresp, sizeof(astresp), stdin)) {
+ return NULL;
+ }
if (feof(stdin)) {
fprintf(stderr, "Got hungup on apparently\n");
return NULL;
Modified: team/jdixon/chan_usbradio-1.4/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_adsiprog.c?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_adsiprog.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_adsiprog.c Mon Nov 10 14:32:21 2008
@@ -1364,7 +1364,9 @@
/* Create "main" as first subroutine */
getsubbyname(scr, "main", NULL, 0);
while(!feof(f)) {
- fgets(buf, sizeof(buf), f);
+ if (!fgets(buf, sizeof(buf), f)) {
+ continue;
+ }
if (!feof(f)) {
lineno++;
/* Trim off trailing return */
Modified: team/jdixon/chan_usbradio-1.4/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_authenticate.c?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_authenticate.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_authenticate.c Mon Nov 10 14:32:21 2008
@@ -167,7 +167,9 @@
char *md5secret = NULL;
while (!feof(f)) {
- fgets(buf, sizeof(buf), f);
+ if (!fgets(buf, sizeof(buf), f)) {
+ continue;
+ }
if (!ast_strlen_zero(buf)) {
size_t len = strlen(buf);
if (buf[len - 1] == '\n')
Modified: team/jdixon/chan_usbradio-1.4/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_chanspy.c?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_chanspy.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_chanspy.c Mon Nov 10 14:32:21 2008
@@ -38,6 +38,7 @@
#include <string.h>
#include <unistd.h>
#include <ctype.h>
+#include <errno.h>
#include "asterisk/file.h"
#include "asterisk/logger.h"
@@ -190,8 +191,11 @@
return -1;
}
- if (csth->fd)
- write(csth->fd, f->data, f->datalen);
+ if (csth->fd) {
+ if (write(csth->fd, f->data, f->datalen) < 0) {
+ ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
+ }
+ }
ast_frfree(f);
Modified: team/jdixon/chan_usbradio-1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_dial.c?view=diff&rev=155798&r1=155797&r2=155798
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_dial.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_dial.c Mon Nov 10 14:32:21 2008
@@ -126,15 +126,19 @@
" Optionally, an extension, or extension and context may be specified. \n"
" Otherwise, the current extension is used. You cannot use any additional\n"
" action post answer options in conjunction with this option.\n"
-" h - Allow the called party to hang up by sending the '*' DTMF digit.\n"
-" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
+" h - Allow the called party to hang up by sending the '*' DTMF digit, or\n"
+" whatever sequence was defined in the featuremap section for\n"
+" 'disconnect' in features.conf\n"
+" H - Allow the calling party to hang up by hitting the '*' DTMF digit, or\n"
+" whatever sequence was defined in the featuremap section for\n"
+" 'disconnect' in features.conf\n"
" i - Asterisk will ignore any forwarding requests it may receive on this\n"
" dial attempt.\n"
" j - Jump to priority n+101 if all of the requested channels were busy.\n"
" k - Allow the called party to enable parking of the call by sending\n"
-" the DTMF sequence defined for call parking in features.conf.\n"
+" the DTMF sequence defined for call parking in the featuremap section of features.conf.\n"
" K - Allow the calling party to enable parking of the call by sending\n"
-" the DTMF sequence defined for call parking in features.conf.\n"
+" the DTMF sequence defined for call parking in the featuremap section of features.conf.\n"
" L(x[:y][:z]) - Limit the call to 'x' ms. Play a warning when 'y' ms are\n"
" left. Repeat the warning every 'z' ms. The following special\n"
" variables can be used with this option:\n"
@@ -195,13 +199,17 @@
" S(x) - Hang up the call after 'x' seconds *after* the called party has\n"
" answered the call.\n"
" t - Allow the called party to transfer the calling party by sending the\n"
-" DTMF sequence defined in features.conf.\n"
[... 7871 lines stripped ...]
More information about the asterisk-commits
mailing list