[asterisk-commits] file: branch file/bridging r81458 - in /team/file/bridging: ./ apps/ channels...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Sep 4 19:32:56 CDT 2007
Author: file
Date: Tue Sep 4 19:32:55 2007
New Revision: 81458
URL: http://svn.digium.com/view/asterisk?view=rev&rev=81458
Log:
Merged revisions 81332-81335,81341,81343-81345,81347-81348,81350,81353-81356,81361-81365,81368,81370,81372,81376-81378,81380,81382,81384,81387-81391,81393-81394,81396,81398,81400,81402,81404,81407-81408,81411,81413,81417,81419,81427,81430-81432,81434,81436,81438,81440-81441,81443,81445,81449,81452,81454,81456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r81332 | file | 2007-08-29 11:16:07 -0300 (Wed, 29 Aug 2007) | 12 lines
Merged revisions 81331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81331 | file | 2007-08-29 11:13:55 -0300 (Wed, 29 Aug 2007) | 4 lines
(closes issue #9690)
Reported by: mattv
Make rtp timeouts work even if two RTP streams are directly bridged in the RTP stack.
........
................
r81333 | mmichelson | 2007-08-29 11:19:33 -0300 (Wed, 29 Aug 2007) | 5 lines
Changing a NOTICE to a DEBUG.
(closes issue #10591, reported and patched by junky, with small modification by me)
................
r81334 | file | 2007-08-29 12:19:11 -0300 (Wed, 29 Aug 2007) | 2 lines
Add API calls for iterating through an event. This should allow events to have multiple information elements (while there was nothing preventing it before you could not actually access any except the first one).
................
r81335 | tilghman | 2007-08-29 12:21:10 -0300 (Wed, 29 Aug 2007) | 2 lines
Changed one too many variable settings in issue #9315 (closes issue #10592)
................
r81341 | mmichelson | 2007-08-29 12:57:27 -0300 (Wed, 29 Aug 2007) | 16 lines
Merged revisions 81340 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81340 | mmichelson | 2007-08-29 10:52:42 -0500 (Wed, 29 Aug 2007) | 8 lines
This fix creates a more accurate way of detecting whether realtime members were deleted.
(closes issue 10541, reported by Alric, patched by me)
The REALLY nice things about this patch is that queue members now have a "realtime" field
which will be true if the member is a realtime member. This means we can check this value
prior to certain processing if it should ONLY be done for realtime members.
........
................
r81343 | russell | 2007-08-29 12:59:10 -0300 (Wed, 29 Aug 2007) | 11 lines
Merged revisions 81342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81342 | russell | 2007-08-29 10:57:29 -0500 (Wed, 29 Aug 2007) | 3 lines
If chan_h323 is not being built, don't use g++ to do the final link of Asterisk.
(in response to a question on the asterisk-dev list)
........
................
r81344 | file | 2007-08-29 13:03:51 -0300 (Wed, 29 Aug 2007) | 2 lines
To keep others happy... revert part of my additions so trunk works.
................
r81345 | file | 2007-08-29 13:07:35 -0300 (Wed, 29 Aug 2007) | 2 lines
This concludes bringing trunk back to a working state.
................
r81347 | mmichelson | 2007-08-29 13:09:02 -0300 (Wed, 29 Aug 2007) | 11 lines
Merged revisions 81346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81346 | mmichelson | 2007-08-29 11:08:09 -0500 (Wed, 29 Aug 2007) | 3 lines
Changed some tabs to spaces
........
................
r81348 | file | 2007-08-29 13:25:30 -0300 (Wed, 29 Aug 2007) | 2 lines
Return ast_event_get_ie_raw to using an iterator and fix logic in ast_event_iterator_next.
................
r81350 | mmichelson | 2007-08-29 13:39:40 -0300 (Wed, 29 Aug 2007) | 20 lines
Merged revisions 81349 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81349 | mmichelson | 2007-08-29 11:35:29 -0500 (Wed, 29 Aug 2007) | 12 lines
This patch, in essence, will correctly pause a realtime queue member and reflect those
changes in the realtime engine.
(issue #10424, reported by irroot, patch by me)
This patch creates a new function called update_realtime_member_field, which is a generic
function which will allow any one field of a realtime queue member to be updated. This patch
only uses this function to update the paused status of a queue member, but it lays the foundation
for persisting the state of a realtime member the same way that static members' state is maintained
when using the persistentmembers setting
........
................
r81353 | russell | 2007-08-29 15:27:48 -0300 (Wed, 29 Aug 2007) | 1 line
there is not actually code that sends these over the network in trunk yet
................
r81354 | russell | 2007-08-29 15:33:31 -0300 (Wed, 29 Aug 2007) | 1 line
Change pointer aritmetic on void * to char *
................
r81355 | russell | 2007-08-29 16:33:57 -0300 (Wed, 29 Aug 2007) | 2 lines
Fix parenthesis from my last commit
................
r81356 | russell | 2007-08-29 16:41:16 -0300 (Wed, 29 Aug 2007) | 1 line
Try to clarify the rules on changing ast_event and ast_event_ie
................
r81361 | murf | 2007-08-29 17:55:40 -0300 (Wed, 29 Aug 2007) | 1 line
This code was in team/murf/bug8684-trunk; it should fix bug 8684 in trunk. I didn't add it to 1.4 yet, because it's not entirely clear to me if this is a bug fix or an enhancement. A lot of files were affected by small changes like ast_variable_new getting an added arg, for the file name the var was defined in; ast_category_new gets added args of filename and lineno; ast_category and ast_variable structures now record file and lineno for each entry; a list of all #include and #execs in a config file (or any of its inclusions are now kept in the ast_config struct; at save time, each entry is put back into its proper file of origin, in order. #include and #exec directives are folded in properly. Headers indicating that the file was generated, are generated also for each included file. Some changes to main/manager.c to take care of file renaming, via the UpdateConfig command. Multiple inclusions of the same file are handled by exploding these into multiple include files, unique
ly named. There's probably more, but I can't remember it right now.
................
r81362 | russell | 2007-08-29 18:25:07 -0300 (Wed, 29 Aug 2007) | 1 line
make trunk build again. murf will have to review this to see if it was the right fix, as it is related to his last change.
................
r81363 | murf | 2007-08-29 18:30:26 -0300 (Wed, 29 Aug 2007) | 1 line
init newer so compile won't complain.
................
r81364 | file | 2007-08-29 18:55:15 -0300 (Wed, 29 Aug 2007) | 2 lines
Make the event header file work under C++.
................
r81365 | mmichelson | 2007-08-29 19:05:37 -0300 (Wed, 29 Aug 2007) | 3 lines
Added the MEMBERREALTIME variable when using setinterfacevar in queues.conf
................
r81368 | crichter | 2007-08-30 05:50:44 -0300 (Thu, 30 Aug 2007) | 19 lines
Merged revisions 81367 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81367 | crichter | 2007-08-30 10:31:59 +0200 (Do, 30 Aug 2007) | 11 lines
Fixed a severe issue where a misdn_read would lock the channel, but read would
not return because it blocks. later chan_misdn would try to queue a frame like
a AST_CONTROL_ANSWER which could result in a deadlock situation. misdn_read
will now not block forever anymore, and we don't queue the ANSWER frame at all
when we already was called with misdn_answer -> answer would be called twice.
Also we don't explicitly send a RELEASE_COMPLETE on receiption of a RELEASE
anymore, because mISDN does that for us, this resulted in a problem on some
switches, which would block our port after some calls for a short while.
........
................
r81370 | file | 2007-08-30 11:26:05 -0300 (Thu, 30 Aug 2007) | 12 lines
Merged revisions 81369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81369 | file | 2007-08-30 11:23:40 -0300 (Thu, 30 Aug 2007) | 4 lines
(issue #10599)
Reported by: dimas
Handle the -1 control subclass during feature dialing (it indicates to stop sounds).
........
................
r81372 | file | 2007-08-30 11:42:41 -0300 (Thu, 30 Aug 2007) | 6 lines
(closes issue #10603)
Reported by: jmls
Patches:
pbx.diff uploaded by jmls (license 141)
Add REASON dialplan variable for when an originated call fails and the failed extension is executed.
................
r81376 | crichter | 2007-08-30 11:54:30 -0300 (Thu, 30 Aug 2007) | 9 lines
Merged revisions 81373 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81373 | crichter | 2007-08-30 16:43:33 +0200 (Do, 30 Aug 2007) | 1 line
Fixed some warnings.
........
................
r81377 | file | 2007-08-30 11:55:25 -0300 (Thu, 30 Aug 2007) | 13 lines
Blocked revisions 81375 via svnmerge
........
r81375 | file | 2007-08-30 11:53:43 -0300 (Thu, 30 Aug 2007) | 6 lines
(closes issue #10603)
Reported by: jmls
Patches:
pbx.diff uploaded by jmls (license 141)
Backport changes from 81372. Add REASON dialplan variable for when an originated call fails and the failed extension is executed.
........
................
r81378 | tilghman | 2007-08-30 12:24:54 -0300 (Thu, 30 Aug 2007) | 2 lines
Add ReadExten app and VALID_EXTEN function (closes issue #10082)
................
r81380 | russell | 2007-08-30 12:34:18 -0300 (Thu, 30 Aug 2007) | 11 lines
Merged revisions 81379 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81379 | russell | 2007-08-30 10:33:48 -0500 (Thu, 30 Aug 2007) | 3 lines
Fix a typo, update a reload command, and remove an unused configuration file.
(closes issue #10606, casper)
........
................
r81382 | mmichelson | 2007-08-30 12:36:43 -0300 (Thu, 30 Aug 2007) | 11 lines
Merged revisions 81381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81381 | mmichelson | 2007-08-30 10:35:51 -0500 (Thu, 30 Aug 2007) | 3 lines
Changed some manager event messages to reflect whether a queue member is a realtime member or not
........
................
r81384 | russell | 2007-08-30 12:40:18 -0300 (Thu, 30 Aug 2007) | 11 lines
Merged revisions 81383 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81383 | russell | 2007-08-30 10:38:29 -0500 (Thu, 30 Aug 2007) | 3 lines
Add missing checks for the PTRACING define.
(closes issue #10559, paravoid)
........
................
r81387 | tilghman | 2007-08-30 14:51:46 -0300 (Thu, 30 Aug 2007) | 2 lines
Always force reread of the config when we're rotating the log file (closes issue #10598)
................
r81388 | mmichelson | 2007-08-30 15:52:44 -0300 (Thu, 30 Aug 2007) | 4 lines
Added note to sample queues.conf file to line up with most recent change regarding setinterfacevar.
MEMBERREALTIME indicates whether a member is realtime.
................
r81389 | tilghman | 2007-08-30 16:43:36 -0300 (Thu, 30 Aug 2007) | 2 lines
Change wording as requested by Kevin
................
r81390 | tilghman | 2007-08-30 17:31:45 -0300 (Thu, 30 Aug 2007) | 2 lines
A schedule id of 0 is not possible and is used to flag that we want to add a new item
................
r81391 | file | 2007-08-30 17:55:19 -0300 (Thu, 30 Aug 2007) | 6 lines
(closes issue #10336)
Reported by: junky
Patches:
minivm_output2.diff uploaded by junky (license 177)
Change console output of minivm show stats to be more simple for external parsing.
................
r81393 | murf | 2007-08-30 18:16:20 -0300 (Thu, 30 Aug 2007) | 9 lines
Merged revisions 81392 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81392 | murf | 2007-08-30 15:11:48 -0600 (Thu, 30 Aug 2007) | 1 line
via issue 10599, where 'CDR already initialized' messages are being generated. Since all channels will have an init'd CDR attached at creation time, this message is now particularly useless. Removed.
........
................
r81394 | file | 2007-08-30 18:17:21 -0300 (Thu, 30 Aug 2007) | 4 lines
(closes issue #10565)
Reported by: tootai
Make sure the external IP address has the standard SIP port set for when the user does not specify the port in the externip setting.
................
r81396 | file | 2007-08-30 18:25:52 -0300 (Thu, 30 Aug 2007) | 14 lines
Merged revisions 81395 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81395 | file | 2007-08-30 18:23:50 -0300 (Thu, 30 Aug 2007) | 6 lines
(closes issue #10514)
Reported by: casper
Patches:
chan_sip.c.80129.diff uploaded by casper (license 55)
Remove needless check for AUTH_UNKNOWN_DOMAIN. It was impossible for it to ever be that value.
........
................
r81398 | mmichelson | 2007-08-30 19:08:51 -0300 (Thu, 30 Aug 2007) | 15 lines
Merged revisions 81397 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81397 | mmichelson | 2007-08-30 17:05:56 -0500 (Thu, 30 Aug 2007) | 7 lines
Removing an extraneous (and possibly misleading) log message. Firstly, if the announce file isn't found, the
streaming functions will report it. Secondly, not all non-zero returns from play_file mean that the announce file
wasn't found. Positive return values simply mean that a digit was pressed (most likely to skip through the announcement).
(closes issue #10612, reported and patched by dimas)
........
................
r81400 | tilghman | 2007-08-30 20:52:32 -0300 (Thu, 30 Aug 2007) | 2 lines
Add new queryable fields from zaptel to 'zap show status'
................
r81402 | file | 2007-08-30 20:55:39 -0300 (Thu, 30 Aug 2007) | 12 lines
Merged revisions 81401 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81401 | file | 2007-08-30 20:53:41 -0300 (Thu, 30 Aug 2007) | 4 lines
(closes issue #10009)
Reported by: dimas
Don't output a bridge failed warning message if it failed because one of the channels was part of the masquerade process. That is perfectly normal.
........
................
r81404 | file | 2007-08-31 11:40:21 -0300 (Fri, 31 Aug 2007) | 12 lines
Merged revisions 81403 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81403 | file | 2007-08-31 11:38:59 -0300 (Fri, 31 Aug 2007) | 4 lines
(closes issue #10618)
Reported by: dimas
Don't pass through the stopped sounds frame.... just drop it.
........
................
r81407 | file | 2007-08-31 12:54:32 -0300 (Fri, 31 Aug 2007) | 10 lines
Merged revisions 81406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81406 | file | 2007-08-31 12:53:16 -0300 (Fri, 31 Aug 2007) | 2 lines
Make it the engine's responsible to check for the presence of results.
........
................
r81408 | kpfleming | 2007-08-31 12:58:31 -0300 (Fri, 31 Aug 2007) | 10 lines
Merged revisions 81405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81405 | kpfleming | 2007-08-31 10:51:45 -0500 (Fri, 31 Aug 2007) | 2 lines
add missing "transcoder show" (and deprecated "show transcoder") CLI commands that were in 1.2 but never added to 1.4
........
................
r81411 | phsultan | 2007-08-31 14:43:50 -0300 (Fri, 31 Aug 2007) | 11 lines
Merged revisions 81410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81410 | phsultan | 2007-08-31 19:38:26 +0200 (Fri, 31 Aug 2007) | 3 lines
Make the 'gtalk show channels' CLI command available.
Closes issue 10548, reported by keepitcool.
........
................
r81413 | qwell | 2007-08-31 15:46:02 -0300 (Fri, 31 Aug 2007) | 13 lines
Merged revisions 81412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10621)
........
r81412 | qwell | 2007-08-31 13:44:44 -0500 (Fri, 31 Aug 2007) | 4 lines
Re-order dial options to be in line with the existing alpha order.
Issue 10621, initial patch by junky
........
................
r81417 | mmichelson | 2007-08-31 16:50:26 -0300 (Fri, 31 Aug 2007) | 14 lines
Merged revisions 81416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81416 | mmichelson | 2007-08-31 14:48:55 -0500 (Fri, 31 Aug 2007) | 6 lines
Fixed broken behavior of a reload on realtime queues. Prior to this patch, if a reload was issued and
a realtime queue had callers waiting in it, then the queue would be removed from the queue list, but it would
not actually be freed (in fact, a debug message warning about a memory leak would come up). With this patch,
reloads do not touch realtime queues at all.
........
................
r81419 | russell | 2007-08-31 18:29:25 -0300 (Fri, 31 Aug 2007) | 10 lines
Merged revisions 81418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81418 | russell | 2007-08-31 16:27:49 -0500 (Fri, 31 Aug 2007) | 2 lines
Remove references to a debugging parameter that does not exist
........
................
r81427 | mmichelson | 2007-09-01 03:03:22 -0300 (Sat, 01 Sep 2007) | 12 lines
Merged revisions 81426 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81426 | mmichelson | 2007-09-01 01:02:06 -0500 (Sat, 01 Sep 2007) | 4 lines
Making match_by_addr into ao2_match_by_addr and making it available
everywhere since it could be a handy callback to have
........
................
r81430 | tilghman | 2007-09-02 11:37:53 -0300 (Sun, 02 Sep 2007) | 2 lines
We shouldn't use a filename blindly without checking to make sure it's unused first
................
r81431 | tilghman | 2007-09-03 00:01:31 -0300 (Mon, 03 Sep 2007) | 10 lines
Merged revisions 81415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81415 | tilghman | 2007-08-31 14:16:52 -0500 (Fri, 31 Aug 2007) | 2 lines
The IF() function was not allowing true values that had embedded colons (closes issue #10613)
........
................
r81432 | tilghman | 2007-09-03 15:01:58 -0300 (Mon, 03 Sep 2007) | 2 lines
Once we get past the file checks, we're loading, so clear the FILEUNCHANGED flag (fixes #include) (closes issue #10629)
................
r81434 | russell | 2007-09-03 15:59:08 -0300 (Mon, 03 Sep 2007) | 13 lines
Merged revisions 81433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81433 | russell | 2007-09-03 13:57:53 -0500 (Mon, 03 Sep 2007) | 5 lines
Remove a couple of calls to ast_string_field_free_pools() on peers in error
handling blocks in the code for building peers. The peer object destructor
does this and doing it twice will cause a crash.
(closes issue #10625, reported by and patched by pnlarsson)
........
................
r81436 | file | 2007-09-04 10:11:49 -0300 (Tue, 04 Sep 2007) | 15 lines
Merged revisions 81435 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81435 | file | 2007-09-04 10:10:56 -0300 (Tue, 04 Sep 2007) | 7 lines
(closes issue #10610)
Reported by: john
Patches:
dns.c.patch uploaded by john (license 218)
Tested by: mvanbaak
Don't return a match if no SRV record actually exists.
........
................
r81438 | file | 2007-09-04 10:47:33 -0300 (Tue, 04 Sep 2007) | 12 lines
Merged revisions 81437 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81437 | file | 2007-09-04 10:46:23 -0300 (Tue, 04 Sep 2007) | 4 lines
(closes issue #10476)
Reported by: mdu113
Only look for the end of a digit when waiting for a digit. This in turn disables emulation in the core.
........
................
r81440 | file | 2007-09-04 11:25:21 -0300 (Tue, 04 Sep 2007) | 14 lines
Merged revisions 81439 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81439 | file | 2007-09-04 11:23:18 -0300 (Tue, 04 Sep 2007) | 6 lines
(closes issue #10632)
Reported by: jamesgolovich
Patches:
asterisk-iaxfirmwareleak.diff.txt uploaded by jamesgolovich (license 176)
Fix memory leak when unloading chan_iax2. The firmware files were not being freed.
........
................
r81441 | file | 2007-09-04 11:28:13 -0300 (Tue, 04 Sep 2007) | 6 lines
(closes issue #10633)
Reported by: pabelanger
Patches:
extensions.ael.sample.patch uploaded by pabelanger (license 224)
Update extensions.ael.sample with voicemail and | changes.
................
r81443 | kpfleming | 2007-09-04 13:41:14 -0300 (Tue, 04 Sep 2007) | 10 lines
Merged revisions 81442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81442 | kpfleming | 2007-09-04 11:40:39 -0500 (Tue, 04 Sep 2007) | 2 lines
there is no point in sending 401 Unauthorized to a UAS that sent us a properly-formatted Authentication header with the expected username and nonce but an incorrect response (which indicates the shared secret does not match)... instead, let's send 403 Forbidden so that the UAS doesn't retry with the same authentication credentials repeatedly
........
................
r81445 | russell | 2007-09-04 15:02:02 -0300 (Tue, 04 Sep 2007) | 2 lines
logger.h depends on options.h, so go ahead and include it
................
r81449 | russell | 2007-09-04 15:40:07 -0300 (Tue, 04 Sep 2007) | 12 lines
Merged revisions 81448 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81448 | russell | 2007-09-04 13:37:44 -0500 (Tue, 04 Sep 2007) | 4 lines
Remove the typedefs on ao2_container and ao2_iterator. This is simply because
we don't typedef objects anywhere else in Asterisk, so we might as well make
this follow the same convention.
........
................
r81452 | russell | 2007-09-04 16:51:37 -0300 (Tue, 04 Sep 2007) | 4 lines
Don't check for and include strlcpy and strlcat in editline. We also include
them directly in Asterisk. For platforms that need them (like my mac), you
will get a linker error due to the functions being included twice.
................
r81454 | qwell | 2007-09-04 16:56:46 -0300 (Tue, 04 Sep 2007) | 13 lines
Merged revisions 81453 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10644)
........
r81453 | qwell | 2007-09-04 14:56:06 -0500 (Tue, 04 Sep 2007) | 4 lines
Change default followme config file to point to the correct files.
Issue 10644, patch by pabelanger
........
................
r81456 | qwell | 2007-09-04 17:59:04 -0300 (Tue, 04 Sep 2007) | 13 lines
Merged revisions 81455 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10634)
........
r81455 | qwell | 2007-09-04 15:54:51 -0500 (Tue, 04 Sep 2007) | 4 lines
Rather than attempt to play a file, we can just check whether it exists.
Issue 10634, patch by me, testing by pabelanger, sanity checked by bweschke
........
................
Added:
team/file/bridging/apps/app_readexten.c
- copied unchanged from r81456, trunk/apps/app_readexten.c
Removed:
team/file/bridging/configs/modem.conf.sample
Modified:
team/file/bridging/ (props changed)
team/file/bridging/CHANGES
team/file/bridging/apps/app_dial.c
team/file/bridging/apps/app_directory.c
team/file/bridging/apps/app_followme.c
team/file/bridging/apps/app_meetme.c
team/file/bridging/apps/app_minivm.c
team/file/bridging/apps/app_parkandannounce.c
team/file/bridging/apps/app_queue.c
team/file/bridging/apps/app_voicemail.c
team/file/bridging/channels/chan_gtalk.c
team/file/bridging/channels/chan_iax2.c
team/file/bridging/channels/chan_misdn.c
team/file/bridging/channels/chan_sip.c
team/file/bridging/channels/chan_skinny.c
team/file/bridging/channels/chan_zap.c
team/file/bridging/channels/h323/ast_h323.cxx
team/file/bridging/channels/iax2-parser.c
team/file/bridging/channels/misdn/isdn_lib.c
team/file/bridging/codecs/codec_zap.c
team/file/bridging/configs/enum.conf.sample
team/file/bridging/configs/extensions.ael.sample
team/file/bridging/configs/followme.conf.sample
team/file/bridging/configs/queues.conf.sample
team/file/bridging/funcs/func_logic.c
team/file/bridging/include/asterisk/astobj2.h
team/file/bridging/include/asterisk/config.h
team/file/bridging/include/asterisk/event.h
team/file/bridging/include/asterisk/event_defs.h
team/file/bridging/include/asterisk/logger.h
team/file/bridging/main/Makefile
team/file/bridging/main/astobj2.c
team/file/bridging/main/cdr.c
team/file/bridging/main/channel.c
team/file/bridging/main/config.c
team/file/bridging/main/dns.c
team/file/bridging/main/editline/configure
team/file/bridging/main/editline/configure.in
team/file/bridging/main/event.c
team/file/bridging/main/http.c
team/file/bridging/main/logger.c
team/file/bridging/main/manager.c
team/file/bridging/main/pbx.c
team/file/bridging/main/sched.c
team/file/bridging/pbx/pbx_spool.c
team/file/bridging/res/res_config_odbc.c
team/file/bridging/res/res_config_pgsql.c
team/file/bridging/res/res_config_sqlite.c
team/file/bridging/res/res_features.c
team/file/bridging/res/res_speech.c
team/file/bridging/utils/extconf.c
Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/file/bridging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 4 19:32:55 2007
@@ -1,1 +1,1 @@
-/trunk:1-81326
+/trunk:1-81457
Modified: team/file/bridging/CHANGES
URL: http://svn.digium.com/view/asterisk/team/file/bridging/CHANGES?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/CHANGES (original)
+++ team/file/bridging/CHANGES Tue Sep 4 19:32:55 2007
@@ -272,3 +272,5 @@
* The device state functionality in the Local channel driver has been updated
to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
to just UNKNOWN if the extension exists.
+ * When originating a call using AMI or pbx_spool that fails the reason for failure
+ will now be available in the failed extension using the REASON dialplan variable.
Modified: team/file/bridging/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_dial.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_dial.c (original)
+++ team/file/bridging/apps/app_dial.c Tue Sep 4 19:32:55 2007
@@ -293,13 +293,15 @@
AST_APP_OPTION('i', OPT_IGNORE_FORWARDING),
AST_APP_OPTION('k', OPT_CALLEE_PARK),
AST_APP_OPTION('K', OPT_CALLER_PARK),
+ AST_APP_OPTION('k', OPT_CALLEE_PARK),
+ AST_APP_OPTION('K', OPT_CALLER_PARK),
AST_APP_OPTION_ARG('L', OPT_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
AST_APP_OPTION_ARG('m', OPT_MUSICBACK, OPT_ARG_MUSICBACK),
AST_APP_OPTION_ARG('M', OPT_CALLEE_MACRO, OPT_ARG_CALLEE_MACRO),
AST_APP_OPTION('n', OPT_SCREEN_NOINTRO),
AST_APP_OPTION('N', OPT_SCREEN_NOCLID),
+ AST_APP_OPTION('o', OPT_ORIGINAL_CLID),
AST_APP_OPTION_ARG('O', OPT_OPERMODE,OPT_ARG_OPERMODE),
- AST_APP_OPTION('o', OPT_ORIGINAL_CLID),
AST_APP_OPTION('p', OPT_SCREENING),
AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
AST_APP_OPTION('r', OPT_RINGBACK),
Modified: team/file/bridging/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_directory.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_directory.c (original)
+++ team/file/bridging/apps/app_directory.c Tue Sep 4 19:32:55 2007
@@ -386,7 +386,7 @@
/* Does the context exist within the config file? If not, make one */
cat = ast_category_get(cfg, context);
if (!cat) {
- cat = ast_category_new(context);
+ cat = ast_category_new(context, "", 99999);
if (!cat) {
ast_log(LOG_WARNING, "Out of memory\n");
ast_config_destroy(cfg);
@@ -402,7 +402,7 @@
snprintf(tmp, sizeof(tmp), "no-password,%s,hidefromdir=%s",
fullname ? fullname : "",
hidefromdir ? hidefromdir : "no");
- var = ast_variable_new(mailbox, tmp);
+ var = ast_variable_new(mailbox, tmp, "");
if (var)
ast_variable_append(cat, var);
else
Modified: team/file/bridging/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_followme.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_followme.c (original)
+++ team/file/bridging/apps/app_followme.c Tue Sep 4 19:32:55 2007
@@ -963,12 +963,8 @@
if (ast_play_and_record(chan, "vm-rec-name", namerecloc, 5, "sln", &duration, 128, 0, NULL) < 0)
goto outrun;
- /* The following call looks like we're going to playback the file, but we're actually */
- /* just checking to see if we *can* play it. */
- if (ast_streamfile(chan, namerecloc, chan->language))
+ if (!ast_fileexists(namerecloc, NULL, chan->language))
ast_copy_string(namerecloc, "", sizeof(namerecloc));
- else
- ast_stopstream(chan);
if (ast_streamfile(chan, targs.plsholdprompt, chan->language))
goto outrun;
Modified: team/file/bridging/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_meetme.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_meetme.c (original)
+++ team/file/bridging/apps/app_meetme.c Tue Sep 4 19:32:55 2007
@@ -2420,7 +2420,7 @@
ast_log(LOG_NOTICE,"The requested confno is '%s'?\n", confno);
AST_LIST_LOCK(&confs);
AST_LIST_TRAVERSE(&confs, cnf, list) {
- ast_log(LOG_NOTICE,"Does conf %s match %s?\n", confno, cnf->confno);
+ ast_debug(3,"Does conf %s match %s?\n", confno, cnf->confno);
if (!strcmp(confno, cnf->confno))
break;
}
@@ -2458,7 +2458,7 @@
return NULL;
AST_STANDARD_APP_ARGS(args, parse);
- ast_log(LOG_NOTICE,"Will conf %s match %s?\n", confno, args.confno);
+ ast_debug(3,"Will conf %s match %s?\n", confno, args.confno);
if (!strcasecmp(args.confno, confno)) {
/* Bingo it's a valid conference */
cnf = build_conf(args.confno,
Modified: team/file/bridging/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_minivm.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_minivm.c (original)
+++ team/file/bridging/apps/app_minivm.c Tue Sep 4 19:32:55 2007
@@ -2141,7 +2141,7 @@
if (varname && (varval = strchr(varname, '='))) {
*varval = '\0';
varval++;
- if ((tmpvar = ast_variable_new(varname, varval))) {
+ if ((tmpvar = ast_variable_new(varname, varval, ""))) {
tmpvar->next = vmu->chanvars;
vmu->chanvars = tmpvar;
}
@@ -2659,9 +2659,9 @@
ast_cli(fd, "* Mini-Voicemail statistics\n");
ast_cli(fd, " -------------------------\n");
ast_cli(fd, "\n");
- ast_cli(fd, " Voicemail accounts: %-5.5d\n", global_stats.voicemailaccounts);
- ast_cli(fd, " Templates: %-5.5d\n", global_stats.templates);
- ast_cli(fd, " Timezones: %-5.5d\n", global_stats.timezones);
+ ast_cli(fd, " Voicemail accounts: %5d\n", global_stats.voicemailaccounts);
+ ast_cli(fd, " Templates: %5d\n", global_stats.templates);
+ ast_cli(fd, " Timezones: %5d\n", global_stats.timezones);
if (global_stats.receivedmessages == 0) {
ast_cli(fd, " Received messages since last reset: <none>\n");
} else {
Modified: team/file/bridging/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_parkandannounce.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_parkandannounce.c (original)
+++ team/file/bridging/apps/app_parkandannounce.c Tue Sep 4 19:32:55 2007
@@ -130,7 +130,7 @@
snprintf(buf, sizeof(buf), "%d", lot);
oh.parent_channel = chan;
- oh.vars = ast_variable_new("_PARKEDAT", buf);
+ oh.vars = ast_variable_new("_PARKEDAT", buf, "");
dchan = __ast_request_and_dial(dialtech, AST_FORMAT_SLINEAR, args.dial, 30000, &outstate, chan->cid.cid_num, chan->cid.cid_name, &oh);
if (dchan) {
Modified: team/file/bridging/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_queue.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_queue.c (original)
+++ team/file/bridging/apps/app_queue.c Tue Sep 4 19:32:55 2007
@@ -318,6 +318,7 @@
int penalty; /*!< Are we a last resort? */
int calls; /*!< Number of calls serviced by this member */
int dynamic; /*!< Are we dynamically added? */
+ int realtime; /*!< Is this member realtime? */
int status; /*!< Status of queue member */
int paused; /*!< Are we paused (not accepting calls)? */
time_t lastcall; /*!< When last successful call was hungup */
@@ -600,7 +601,7 @@
"LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
- q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : "static",
+ q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : cur->realtime ? "realtime" : "static",
cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
}
}
@@ -1049,6 +1050,7 @@
if (!m) {
if ((m = create_queue_member(interface, membername, penalty, paused))) {
m->dead = 0;
+ m->realtime = 1;
add_to_interfaces(interface);
if (prev_m) {
prev_m->next = m;
@@ -1173,10 +1175,10 @@
queue_set_param(q, tmp_name, v->value, -1, 0);
}
- /* Temporarily set non-dynamic members dead so we can detect deleted ones.
+ /* Temporarily set realtime members dead so we can detect deleted ones.
* Also set the membercount correctly for realtime*/
for (m = q->members; m; m = m->next, q->membercount++) {
- if (!m->dynamic)
+ if (m->realtime)
m->dead = 1;
}
@@ -1263,6 +1265,25 @@
return q;
}
+static int update_realtime_member_field(struct member *mem, const char *queue_name, const char *field, const char *value)
+{
+ struct ast_variable *var;
+ int ret = -1;
+
+ if(!(var = ast_load_realtime("queue_members", "interface", mem->interface, "queue_name", queue_name, NULL)))
+ return ret;
+ while (var) {
+ if(!strcmp(var->name, "uniqueid"))
+ break;
+ var = var->next;
+ }
+ if(var && !ast_strlen_zero(var->value)) {
+ if ((ast_update_realtime("queue_members", "uniqueid", var->value, field, value, NULL)) > -1)
+ ret = 0;
+ }
+ return ret;
+}
+
static void update_realtime_members(struct call_queue *q)
{
struct ast_config *member_config = NULL;
@@ -1278,9 +1299,9 @@
ast_mutex_lock(&q->lock);
- /* Temporarily set non-dynamic members dead so we can detect deleted ones.*/
+ /* Temporarily set realtime members dead so we can detect deleted ones.*/
for (m = q->members; m; m = m->next) {
- if (!m->dynamic)
+ if (m->realtime)
m->dead = 1;
}
@@ -1636,7 +1657,7 @@
"LastCall: %d\r\n"
"Status: %d\r\n"
"Paused: %d\r\n",
- q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : "static",
+ q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : cur->realtime ? "realtime": "static",
cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
}
}
@@ -2637,8 +2658,7 @@
res2 |= ast_safe_sleep(peer, qe->parent->memberdelay * 1000);
}
if (!res2 && announce) {
- if (play_file(peer, announce))
- ast_log(LOG_WARNING, "Announcement file '%s' is unavailable, continuing anyway...\n", announce);
+ play_file(peer, announce);
}
if (!res2 && qe->parent->reportholdtime) {
if (!play_file(peer, qe->parent->sound_reporthold)) {
@@ -2804,8 +2824,8 @@
/* if setinterfacevar is defined, make member variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setinterfacevar) {
- snprintf(interfacevar,sizeof(interfacevar), "MEMBERINTERFACE=%s|MEMBERNAME=%s|MEMBERCALLS=%d|MEMBERLASTCALL=%ld|MEMBERPENALTY=%d|MEMBERDYNAMIC=%d",
- member->interface, member->membername, member->calls, (long)member->lastcall, member->penalty, member->dynamic);
+ snprintf(interfacevar,sizeof(interfacevar), "MEMBERINTERFACE=%s|MEMBERNAME=%s|MEMBERCALLS=%d|MEMBERLASTCALL=%ld|MEMBERPENALTY=%d|MEMBERDYNAMIC=%d|MEMBERREALTIME=%d",
+ member->interface, member->membername, member->calls, (long)member->lastcall, member->penalty, member->dynamic, member->realtime);
pbx_builtin_setvar(qe->chan, interfacevar);
}
@@ -3171,6 +3191,9 @@
if (queue_persistent_members)
dump_queue_members(q);
+ if(mem->realtime)
+ update_realtime_member_field(mem, queuename, "paused", paused ? "1" : "0");
+
ast_queue_log(q->name, "NONE", mem->membername, (paused ? "PAUSE" : "UNPAUSE"), "%s", "");
manager_event(EVENT_FLAG_AGENT, "QueueMemberPaused",
@@ -3980,8 +4003,10 @@
AST_LIST_LOCK(&queues);
use_weight=0;
/* Mark all queues as dead for the moment */
- AST_LIST_TRAVERSE(&queues, q, list)
- q->dead = 1;
+ AST_LIST_TRAVERSE(&queues, q, list) {
+ if(!q->realtime)
+ q->dead = 1;
+ }
/* Chug through config file */
cat = NULL;
@@ -4188,8 +4213,9 @@
ast_str_set(&out, 0, " %s", mem->interface);
if (mem->penalty)
ast_str_append(&out, 0, " with penalty %d", mem->penalty);
- ast_str_append(&out, 0, "%s%s (%s)",
+ ast_str_append(&out, 0, "%s%s%s (%s)",
mem->dynamic ? " (dynamic)" : "",
+ mem->realtime ? " (realtime)" : "",
mem->paused ? " (paused)" : "",
devstate2str(mem->status));
if (mem->calls)
Modified: team/file/bridging/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_voicemail.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/apps/app_voicemail.c (original)
+++ team/file/bridging/apps/app_voicemail.c Tue Sep 4 19:32:55 2007
@@ -960,7 +960,7 @@
if (!strcasecmp(category, vmu->mailbox)) {
if (!(tmp = ast_variable_retrieve(cfg, category, "vmsecret"))) {
ast_debug(3, "looks like we need to make vmsecret!\n");
- var = ast_variable_new("vmsecret", newpassword);
+ var = ast_variable_new("vmsecret", newpassword, "");
}
new = alloca(strlen(newpassword)+1);
sprintf(new, "%s", newpassword);
Modified: team/file/bridging/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/channels/chan_gtalk.c?view=diff&rev=81458&r1=81457&r2=81458
==============================================================================
--- team/file/bridging/channels/chan_gtalk.c (original)
+++ team/file/bridging/channels/chan_gtalk.c Tue Sep 4 19:32:55 2007
@@ -1568,13 +1568,54 @@
/*! \brief CLI command "gtalk show channels" */
static int gtalk_show_channels(int fd, int argc, char **argv)
{
+#define FORMAT "%-30.30s %-30.30s %-15.15s %-5.5s %-5.5s \n"
+ struct gtalk_pvt *p;
+ struct ast_channel *chan;
+ int numchans = 0;
+ char them[100];
+ char *jid = NULL;
+ char *resource = NULL;
+
if (argc != 3)
return RESULT_SHOWUSAGE;
+
ast_mutex_lock(>alklock);
[... 3655 lines stripped ...]
More information about the asterisk-commits
mailing list