[asterisk-commits] murf: branch group/CDRfix5 r76172 - in /team/group/CDRfix5: ./ apps/ cdr/ cha...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jul 20 15:03:10 CDT 2007
Author: murf
Date: Fri Jul 20 15:03:09 2007
New Revision: 76172
URL: http://svn.digium.com/view/asterisk?view=rev&rev=76172
Log:
Merged revisions 75200,75227,75254-75255,75259-75260,75307,75351,75365,75379,75381,75400,75402,75404,75406,75438,75442-75443,75446,75448,75451,75505,75530,75566,75584-75586,75620,75622,75624,75659,75706,75709-75710,75713-75714,75734,75750,75761,75805-75806,75808,75841,75857,75873-75875,75878,75894,75911,75929-75930,75977,75979,75981-75983,76015,76034-76035,76037,76055-76056,76070,76091,76138,76140 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r75200 | file | 2007-07-16 08:39:29 -0600 (Mon, 16 Jul 2007) | 2 lines
Applications no longer need to call ast_module_user_add and ast_module_user_remove. This is now taken care of in the pbx_exec function outside of the application.
................
r75227 | file | 2007-07-16 09:57:01 -0600 (Mon, 16 Jul 2007) | 2 lines
I found this sillyness when I did my ast_module_user conversion. Return immediately if no data was passed to the Verbose application.
................
r75254 | mmichelson | 2007-07-16 12:18:19 -0600 (Mon, 16 Jul 2007) | 16 lines
Merged revisions 75253 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75253 | mmichelson | 2007-07-16 13:16:15 -0500 (Mon, 16 Jul 2007) | 8 lines
Restoring functionality from 1.2 wherein Retrydial will not exit if there is no announce file specified.
This change makes it so that if there is no announce file specified, the application will continue until finished (or caller hangs up).
If a bogus announce file is specified, then a warning message will be printed saying that the file could not be found, but execution will
still continue.
(closes issue #10186, reported by jon, patched by me)
........
................
r75255 | file | 2007-07-16 12:24:29 -0600 (Mon, 16 Jul 2007) | 2 lines
For my next trick I will make it so dialplan functions no longer need to call ast_module_user_add and ast_module_user_remove. These are now called in the ast_func_read and ast_func_write functions outside of the module.
................
r75259 | file | 2007-07-16 12:36:02 -0600 (Mon, 16 Jul 2007) | 2 lines
Add in check for the GCC attribute deprecated. It may be used soon!
................
r75260 | file | 2007-07-16 12:38:28 -0600 (Mon, 16 Jul 2007) | 2 lines
Change the function name slightly... just for kpfleming!
................
r75307 | kpfleming | 2007-07-16 14:58:56 -0600 (Mon, 16 Jul 2007) | 19 lines
Merged revisions 75306 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75306 | kpfleming | 2007-07-16 15:53:24 -0500 (Mon, 16 Jul 2007) | 11 lines
Merged revisions 75304 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75304 | kpfleming | 2007-07-16 15:46:58 -0500 (Mon, 16 Jul 2007) | 3 lines
provide proper copyright/license attribution for this structure that was copied from a BSD-licensed header file long, long ago...
........
................
................
r75351 | qwell | 2007-07-17 06:01:05 -0600 (Tue, 17 Jul 2007) | 6 lines
Fix an incorrect parenthesization (TODO: Find a better word) in app_dial
Pointed out by Fanzhou Zhao
Closes issue #10216
................
r75365 | rizzo | 2007-07-17 06:46:25 -0600 (Tue, 17 Jul 2007) | 7 lines
Initialize a variable to avoid a warning when the compiler
(and/or the optimization level) may think it is used uninitialized.
The code was indeed correct, but unfortunately the result of
some compiler checks such as -Wunused and -Wuninitialized depends
heavily on the optimization level.
................
r75379 | rizzo | 2007-07-17 08:32:15 -0600 (Tue, 17 Jul 2007) | 16 lines
Introduce ast_parse_arg() , a generic function to parse strings
in a consistent way. This is meant to replace the custom code
which is repeated all over the place in the various files when
parsing config files, CLI entries and other string information.
Right now the code supports parsing int32, uint32 and sockaddr_in with
optional default values and bound checks. It contains minimal error
checking, but that can be easily extended as the need arises.
Being a new API i am introducing this only in trunk, though I believe
that once the interface has been ironed out it might become a
worthwhile addition to 1.4 as well - basically, the first time
we will need to fix a piece of argument parsing code, we might as
well bring in this change and use the new API instead.
................
r75381 | file | 2007-07-17 08:48:17 -0600 (Tue, 17 Jul 2007) | 2 lines
Make trunk build once again.
................
r75400 | murf | 2007-07-17 13:40:29 -0600 (Tue, 17 Jul 2007) | 1 line
via 10206, I have added an option (e) to Dial to allow the h exten to get run on peer. Had to upgrade ast_flag stuff to 64 bits to do this.
................
r75402 | russell | 2007-07-17 13:46:13 -0600 (Tue, 17 Jul 2007) | 11 lines
Merged revisions 75401 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75401 | russell | 2007-07-17 14:45:07 -0500 (Tue, 17 Jul 2007) | 3 lines
Remove a duplicated newline character in AGI debug output.
(closes issue #10207, patch by seanbright)
........
................
r75404 | russell | 2007-07-17 14:01:54 -0600 (Tue, 17 Jul 2007) | 20 lines
Merged revisions 75403 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75403 | russell | 2007-07-17 15:01:12 -0500 (Tue, 17 Jul 2007) | 12 lines
(closes issue #10209)
Reported by: juggie
Patches:
10209-trunk-2.patch uploaded by juggie
Tested by: juggie, blitzrage
In ast_pbx_run(), mark a channel as hung up after an application returned -1,
or when it runs out of extensions to execute. This is so that code can detect
that this channel has been hung up for things like making sure DeadAGI is used
on actual dead channels, and is beneficial for other things, like making sure
someone doesn't try to start spying on a channel that is about to go away.
........
................
r75406 | mmichelson | 2007-07-17 14:05:19 -0600 (Tue, 17 Jul 2007) | 14 lines
Merged revisions 75405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75405 | mmichelson | 2007-07-17 15:03:48 -0500 (Tue, 17 Jul 2007) | 6 lines
Fixing an error I made earlier. ast_fileexists can return -1 on failure, so I need to be sure that we only enter the if
statement if it is successful.
Related to my fix to issue #10186
........
................
r75438 | russell | 2007-07-17 14:34:52 -0600 (Tue, 17 Jul 2007) | 15 lines
Blocked revisions 75437 via svnmerge
........
r75437 | russell | 2007-07-17 15:33:06 -0500 (Tue, 17 Jul 2007) | 8 lines
(issue #10210)
Reported by: juggie
Patches:
10210-1.4-grr.patch uploaded by juggie (license #24)
Tested by: juggie, blitzrage
Log a warning if someone uses DeadAGI on a live channel.
........
................
r75442 | russell | 2007-07-17 14:42:50 -0600 (Tue, 17 Jul 2007) | 20 lines
Merged revisions 75441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75441 | russell | 2007-07-17 15:42:12 -0500 (Tue, 17 Jul 2007) | 12 lines
Merged revisions 75440 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75440 | russell | 2007-07-17 15:41:41 -0500 (Tue, 17 Jul 2007) | 4 lines
After parsing information elements in IAX frames, set the data length to zero,
so that code later on does not think it has data to copy.
(ASA-2007-015)
........
................
................
r75443 | file | 2007-07-17 14:44:55 -0600 (Tue, 17 Jul 2007) | 9 lines
Blocked revisions 75439 via svnmerge
........
r75439 | file | 2007-07-17 17:40:57 -0300 (Tue, 17 Jul 2007) | 2 lines
Ensure that the pointer to STUN data does not go to unaccessible memory. (ASA-2007-017)
........
................
r75446 | russell | 2007-07-17 14:49:09 -0600 (Tue, 17 Jul 2007) | 21 lines
Merged revisions 75445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75445 | russell | 2007-07-17 15:48:21 -0500 (Tue, 17 Jul 2007) | 13 lines
Merged revisions 75444 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75444 | russell | 2007-07-17 15:45:27 -0500 (Tue, 17 Jul 2007) | 5 lines
Ensure that when encoding the contents of an ast_frame into an iax_frame, that
the size of the destination buffer is known in the iax_frame so that code
won't write past the end of the allocated buffer when sending outgoing frames.
(ASA-2007-014)
........
................
................
r75448 | russell | 2007-07-17 14:52:20 -0600 (Tue, 17 Jul 2007) | 8 lines
Blocked revisions 75447 via svnmerge
........
r75447 | russell | 2007-07-17 15:51:25 -0500 (Tue, 17 Jul 2007) | 1 line
cast arguments to ast_log so that it builds without warnings for me
........
................
r75451 | russell | 2007-07-17 14:58:40 -0600 (Tue, 17 Jul 2007) | 19 lines
Merged revisions 75450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75450 | russell | 2007-07-17 15:57:56 -0500 (Tue, 17 Jul 2007) | 11 lines
Merged revisions 75449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75449 | russell | 2007-07-17 15:57:09 -0500 (Tue, 17 Jul 2007) | 3 lines
Properly check for the length in the skinny packet to prevent an invalid memcpy.
(ASA-2007-016)
........
................
................
r75505 | murf | 2007-07-17 15:52:51 -0600 (Tue, 17 Jul 2007) | 1 line
Spotted this bug today myself, trying to reproduce a BE bug. Use a vert bar instead of a comma, when calling RAND.
................
r75530 | tilghman | 2007-07-18 06:38:36 -0600 (Wed, 18 Jul 2007) | 10 lines
Merged revisions 75529 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75529 | tilghman | 2007-07-18 07:29:41 -0500 (Wed, 18 Jul 2007) | 2 lines
Using a freed frame causes crashes (closes issue #9317)
........
................
r75566 | file | 2007-07-18 07:59:01 -0600 (Wed, 18 Jul 2007) | 2 lines
Minor code tweaks. Variables were being checked wrong in some situations and didn't need to be checked in others.
................
r75584 | file | 2007-07-18 08:20:19 -0600 (Wed, 18 Jul 2007) | 13 lines
Merged revisions 75583 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75583 | file | 2007-07-18 11:18:53 -0300 (Wed, 18 Jul 2007) | 5 lines
(closes issue #10224)
Reported by: irroot
Record the threadid of each running thread before shutting them down as the thread themselves may change the value.
........
................
r75585 | murf | 2007-07-18 08:35:07 -0600 (Wed, 18 Jul 2007) | 1 line
This corrects the problem with flags and %lld formats on 64-bit machines, where uint64_t is NOT acceptable for %lld, and also works on 32-bit machines. At least, with gcc.
................
r75586 | file | 2007-07-18 08:59:20 -0600 (Wed, 18 Jul 2007) | 2 lines
Clean up func_curl a bit.
................
r75620 | file | 2007-07-18 09:26:52 -0600 (Wed, 18 Jul 2007) | 10 lines
Merged revisions 75619 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75619 | file | 2007-07-18 12:25:45 -0300 (Wed, 18 Jul 2007) | 2 lines
Don't bother reloading chan_h323 if it did not load successfully in the first place. This would otherwise cause a crash.
........
................
r75622 | file | 2007-07-18 09:42:11 -0600 (Wed, 18 Jul 2007) | 13 lines
Merged revisions 75621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75621 | file | 2007-07-18 12:41:06 -0300 (Wed, 18 Jul 2007) | 5 lines
(closes issue #10165)
Reported by: elandivar
It is possible for hold status to exist without call limits set, so we need to ensure update_call_counter is executed regardless.
........
................
r75624 | file | 2007-07-18 09:45:18 -0600 (Wed, 18 Jul 2007) | 10 lines
Merged revisions 75623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75623 | file | 2007-07-18 12:44:02 -0300 (Wed, 18 Jul 2007) | 2 lines
Few more places that needs to check for onhold state.
........
................
r75659 | dhubbard | 2007-07-18 11:59:56 -0600 (Wed, 18 Jul 2007) | 17 lines
Merged revisions 75658 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75658 | dhubbard | 2007-07-18 12:56:30 -0500 (Wed, 18 Jul 2007) | 9 lines
Merged revisions 75657 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75657 | dhubbard | 2007-07-18 12:48:33 -0500 (Wed, 18 Jul 2007) | 1 line
removed the word 'pissed' from ast_log(...) function call for BE-90
........
................
................
r75706 | tilghman | 2007-07-18 13:47:20 -0600 (Wed, 18 Jul 2007) | 2 lines
Merge in ast_strftime branch, which changes timestamps to be accurate to the microsecond, instead of only to the second
................
r75709 | russell | 2007-07-18 13:50:21 -0600 (Wed, 18 Jul 2007) | 1 line
convert some lines indented with spaces to tabs
................
r75710 | qwell | 2007-07-18 13:51:18 -0600 (Wed, 18 Jul 2007) | 13 lines
Merged revisions 75707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #9887)
........
r75707 | qwell | 2007-07-18 14:48:12 -0500 (Wed, 18 Jul 2007) | 4 lines
Fix issues with new 79x1 phones.
Issue 9887, patches by DEA
........
................
r75713 | file | 2007-07-18 14:01:52 -0600 (Wed, 18 Jul 2007) | 9 lines
Blocked revisions 75712 via svnmerge
........
r75712 | file | 2007-07-18 17:00:23 -0300 (Wed, 18 Jul 2007) | 2 lines
Backport GCC 4.2 fixes. Without these Asterisk won't build under devmode using GCC 4.2.
........
................
r75714 | qwell | 2007-07-18 14:05:45 -0600 (Wed, 18 Jul 2007) | 13 lines
Merged revisions 75711 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #9245)
........
r75711 | qwell | 2007-07-18 14:54:32 -0500 (Wed, 18 Jul 2007) | 4 lines
Fixes for 7935/7936 conference phones.
Issue 9245, patch by slimey.
........
................
r75734 | qwell | 2007-07-18 14:18:00 -0600 (Wed, 18 Jul 2007) | 9 lines
Merged revisions 75732 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75732 | qwell | 2007-07-18 15:17:27 -0500 (Wed, 18 Jul 2007) | 1 line
Umm, why are we transmitting dialtone on cfwdall?
........
................
r75750 | tilghman | 2007-07-18 14:43:54 -0600 (Wed, 18 Jul 2007) | 18 lines
Merged revisions 75749 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75749 | tilghman | 2007-07-18 15:40:18 -0500 (Wed, 18 Jul 2007) | 10 lines
Merged revisions 75748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75748 | tilghman | 2007-07-18 15:31:36 -0500 (Wed, 18 Jul 2007) | 2 lines
Store prior to copy (closes issue #10193)
........
................
................
r75761 | russell | 2007-07-18 15:10:27 -0600 (Wed, 18 Jul 2007) | 21 lines
Merged revisions 75759 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75759 | russell | 2007-07-18 16:09:46 -0500 (Wed, 18 Jul 2007) | 13 lines
Merged revisions 75757 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75757 | russell | 2007-07-18 16:09:13 -0500 (Wed, 18 Jul 2007) | 5 lines
When traversing the queue of frames for possible retransmission after
receiving a VNAK, handle sequence number wraparound so that all frames that
should be retransmitted actually do get retransmitted.
(issue #10227, reported and patched by mihai)
........
................
................
r75805 | tilghman | 2007-07-18 16:40:03 -0600 (Wed, 18 Jul 2007) | 2 lines
Change IAX variables to use datastores (closes issue #9315)
................
r75806 | russell | 2007-07-18 16:52:54 -0600 (Wed, 18 Jul 2007) | 5 lines
I thought I noticed a memory leak earlier when I saw that the contents of this
list were not destroyed when the module is unloaded. However, after reading
the code related to the use of this list a lot today, I realized that it isn't
necessary. So, I have added a comment to explain why it isn't necessary.
................
r75808 | qwell | 2007-07-18 17:00:30 -0600 (Wed, 18 Jul 2007) | 9 lines
Merged revisions 75807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75807 | qwell | 2007-07-18 17:59:18 -0500 (Wed, 18 Jul 2007) | 1 line
Need to make sure we set milliseconds and timestamp - pointed out by the recent ast_ time stuff from Tilghman
........
................
r75841 | tilghman | 2007-07-18 21:37:12 -0600 (Wed, 18 Jul 2007) | 2 lines
Fix trunk where I broke it earlier (for ast_strftime branch)
................
r75857 | tilghman | 2007-07-18 22:45:20 -0600 (Wed, 18 Jul 2007) | 2 lines
Allow chan_misdn to build in dev-mode
................
r75873 | rizzo | 2007-07-19 01:41:45 -0600 (Thu, 19 Jul 2007) | 4 lines
portability fix: use %f instead of %lf when printing double.
The l is useless.
................
r75874 | rizzo | 2007-07-19 01:51:34 -0600 (Thu, 19 Jul 2007) | 4 lines
ast_sip_ouraddrfor() never fails, so make it void
and remove the code that would never be called.
................
r75875 | rizzo | 2007-07-19 02:00:03 -0600 (Thu, 19 Jul 2007) | 4 lines
document the use of externip, externhost and other nat-related options,
as well as the handling of the sip socket.
................
r75878 | rizzo | 2007-07-19 02:07:04 -0600 (Thu, 19 Jul 2007) | 8 lines
print more of the network settings (externip, externhost etc.)
in the "sip show settings" cli output. I have put these in a
separate section, probably even bindaddr and SIP port should go
there.
There are more things to add here e.g. localnet and so on.
................
r75894 | rizzo | 2007-07-19 06:38:13 -0600 (Thu, 19 Jul 2007) | 4 lines
comment out some terribly expensive debugging code
in the body of ast_apply_ha()
................
r75911 | russell | 2007-07-19 08:46:49 -0600 (Thu, 19 Jul 2007) | 3 lines
Remove some debug code that was added in revision 75894, which removed some
other debug code. :)
................
r75929 | russell | 2007-07-19 09:53:50 -0600 (Thu, 19 Jul 2007) | 22 lines
Merged revisions 75928 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75928 | russell | 2007-07-19 10:53:15 -0500 (Thu, 19 Jul 2007) | 14 lines
Merged revisions 75927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75927 | russell | 2007-07-19 10:49:42 -0500 (Thu, 19 Jul 2007) | 6 lines
When processing full frames, take sequence number wraparound into account when
deciding whether or not we need to request retransmissions by sending a VNAK.
This code could cause VNAKs to be sent erroneously in some cases, and to not
be sent in other cases when it should have been.
(closes issue #10237, reported and patched by mihai)
........
................
................
r75930 | russell | 2007-07-19 09:59:19 -0600 (Thu, 19 Jul 2007) | 6 lines
(closes issue #10210, reported and patched by juggie)
This merges the trunk only part of the patches from this issue. In 1.4, res_agi
will issue a warning if you try to use DeadAGI on a channel that is not hung up.
Now, in trunk, it just plain won't let you do it.
................
r75977 | mmichelson | 2007-07-19 10:29:51 -0600 (Thu, 19 Jul 2007) | 18 lines
Merged revisions 75969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75969 | mmichelson | 2007-07-19 11:26:10 -0500 (Thu, 19 Jul 2007) | 10 lines
Changes in handling return values of several functions in app_queue. This all started as a fix for issue #10008
but now includes all of the following changes:
1. Simplifying the code to handle positive return values from ast API calls.
2. Removing the background_file function.
3. The fix for issue #10008
(closes issue #10008, reported and patched by dimas)
........
................
r75979 | mmichelson | 2007-07-19 13:02:38 -0600 (Thu, 19 Jul 2007) | 11 lines
Merged revisions 75978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75978 | mmichelson | 2007-07-19 13:59:30 -0500 (Thu, 19 Jul 2007) | 3 lines
The diff on this looks pretty big but all I did was remove a pointless if statement (always evaluates true).
........
................
r75981 | qwell | 2007-07-19 14:36:55 -0600 (Thu, 19 Jul 2007) | 9 lines
Blocked revisions 75980 via svnmerge
........
r75980 | qwell | 2007-07-19 15:36:06 -0500 (Thu, 19 Jul 2007) | 2 lines
Remove some duplicate code.
........
................
r75982 | murf | 2007-07-19 16:00:59 -0600 (Thu, 19 Jul 2007) | 1 line
This repairs a 'warning: ISO C90 forbids mixed declarations and code' message that cripples my dev-mode enabled build
................
r75983 | murf | 2007-07-19 17:24:27 -0600 (Thu, 19 Jul 2007) | 1 line
After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
................
r76015 | tilghman | 2007-07-19 19:54:52 -0600 (Thu, 19 Jul 2007) | 2 lines
Reduce some logging contention by switching several locks over to rwlocks
................
r76034 | rizzo | 2007-07-20 08:38:36 -0600 (Fri, 20 Jul 2007) | 13 lines
expose struct ast_ha so external code can do things such as printing it
(e.g. chan_sip.c in a subsequent commit).
Obviously exposing the internals of a data structure is far from ideal
(especially in a case like this where the implementation is very
inefficient and will need to be changed at some point).
On the other hand, it was also unclear what additional APIs should
we provide instead, and because exposing the stucture has no impact
on source and binary compatibility, this seemed to me the best option at
this time.
................
r76035 | rizzo | 2007-07-20 08:54:01 -0600 (Fri, 20 Jul 2007) | 33 lines
Extend the 'network settings' section with indication on the
localnet settings (requires the change in SVN 76034), and also
give an indication on whether/why/how the remapping of addresses
in SIP message is done or not.
I think this is especially useful for debugging the configuration,
as the address remapping depends on a combination of at least 3
parameters (localnet, externhost, externip) and successful DNS lookup.
An example of the output of this section is below:
Network Settings:
---------------------------
SIP address remapping: Enabled using externhost
Externhost: foo.dyndns.net
Externip: 80.64.128.23:0
Externrefresh: 10
Internal IP: 12.34.56.78:5060
Localnet: 192.168.0.0/255.255.0.0
10.0.0.0/255.0.0.0
I leave to the community the judgement if the above info is a
useful addition for 1.4. It is not a bugfix, but it is neither a
new feature, only a useful diagnostic tool.
Note that I would like to move there also the bindaddress/port
information, in the usual addr:port format e.g.
Bindaddress: 0.0.0.0:5060
so that network information is all in one place.
................
r76037 | rizzo | 2007-07-20 09:06:54 -0600 (Fri, 20 Jul 2007) | 8 lines
Don't use a field size for the last argument of printf format,
because in this case the string is left-aligned and it is not
truncated anyways.
Omitting the field size prevents the generation of trailing whitespace,
which makes the string fit in smaller windows.
................
r76055 | file | 2007-07-20 10:49:58 -0600 (Fri, 20 Jul 2007) | 9 lines
Blocked revisions 76054 via svnmerge
........
r76054 | file | 2007-07-20 13:49:13 -0300 (Fri, 20 Jul 2007) | 2 lines
Move makeannouncement variable declaration to proper place.
........
................
r76056 | file | 2007-07-20 10:51:09 -0600 (Fri, 20 Jul 2007) | 2 lines
It is impossible for the externhost variable to not exist, it is however possible for it to be empty.
................
r76070 | file | 2007-07-20 11:11:39 -0600 (Fri, 20 Jul 2007) | 14 lines
Merged revisions 76067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r76067 | file | 2007-07-20 14:10:17 -0300 (Fri, 20 Jul 2007) | 6 lines
(closes issue #10246)
Reported by: fkasumovic
Patches:
res_conver.patch uploaded by fkasumovic (license #101)
Use the last occurance of . to find the extension, not the first occurance.
........
................
r76091 | file | 2007-07-20 11:21:23 -0600 (Fri, 20 Jul 2007) | 22 lines
Merged revisions 76087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r76087 | file | 2007-07-20 14:20:09 -0300 (Fri, 20 Jul 2007) | 14 lines
Merged revisions 76080 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r76080 | file | 2007-07-20 14:16:48 -0300 (Fri, 20 Jul 2007) | 6 lines
(closes issue #10247)
Reported by: fkasumovic
Patches:
chan_sip.patch uploaded by fkasumovic (license #101)
Drop any peer realm authentication entries when reloading so multiple entries do not get added to the peer.
........
................
................
r76138 | russell | 2007-07-20 12:28:15 -0600 (Fri, 20 Jul 2007) | 14 lines
Merged revisions 76132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r76132 | russell | 2007-07-20 13:22:24 -0500 (Fri, 20 Jul 2007) | 6 lines
Use the define that specifies the default length of an artificially created
DTMF digit in the ast_senddigit() function. The define is set to 100ms by
default, which is the same thing that this function was using. But, using
the define lets changes take effect in this case, as well as the others where
it was already used.
........
................
r76140 | mmichelson | 2007-07-20 12:44:30 -0600 (Fri, 20 Jul 2007) | 14 lines
Merged revisions 76139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r76139 | mmichelson | 2007-07-20 13:42:27 -0500 (Fri, 20 Jul 2007) | 6 lines
When using users.conf for the entries in the directory, if multiple users had the same last name, only the first user listed would be available
in the directory.
(closes issue #10200, reported by mrskippy, patched by me)
........
................
Modified:
team/group/CDRfix5/ (props changed)
team/group/CDRfix5/apps/app_adsiprog.c
team/group/CDRfix5/apps/app_alarmreceiver.c
team/group/CDRfix5/apps/app_amd.c
team/group/CDRfix5/apps/app_authenticate.c
team/group/CDRfix5/apps/app_cdr.c
team/group/CDRfix5/apps/app_chanisavail.c
team/group/CDRfix5/apps/app_channelredirect.c
team/group/CDRfix5/apps/app_chanspy.c
team/group/CDRfix5/apps/app_controlplayback.c
team/group/CDRfix5/apps/app_db.c
team/group/CDRfix5/apps/app_dial.c
team/group/CDRfix5/apps/app_dictate.c
team/group/CDRfix5/apps/app_directed_pickup.c
team/group/CDRfix5/apps/app_directory.c
team/group/CDRfix5/apps/app_disa.c
team/group/CDRfix5/apps/app_dumpchan.c
team/group/CDRfix5/apps/app_echo.c
team/group/CDRfix5/apps/app_exec.c
team/group/CDRfix5/apps/app_externalivr.c
team/group/CDRfix5/apps/app_festival.c
team/group/CDRfix5/apps/app_flash.c
team/group/CDRfix5/apps/app_followme.c
team/group/CDRfix5/apps/app_forkcdr.c
team/group/CDRfix5/apps/app_getcpeid.c
team/group/CDRfix5/apps/app_ices.c
team/group/CDRfix5/apps/app_image.c
team/group/CDRfix5/apps/app_ivrdemo.c
team/group/CDRfix5/apps/app_macro.c
team/group/CDRfix5/apps/app_meetme.c
team/group/CDRfix5/apps/app_milliwatt.c
team/group/CDRfix5/apps/app_minivm.c
team/group/CDRfix5/apps/app_mixmonitor.c
team/group/CDRfix5/apps/app_morsecode.c
team/group/CDRfix5/apps/app_mp3.c
team/group/CDRfix5/apps/app_nbscat.c
team/group/CDRfix5/apps/app_osplookup.c
team/group/CDRfix5/apps/app_page.c
team/group/CDRfix5/apps/app_parkandannounce.c
team/group/CDRfix5/apps/app_playback.c
team/group/CDRfix5/apps/app_privacy.c
team/group/CDRfix5/apps/app_queue.c
team/group/CDRfix5/apps/app_read.c
team/group/CDRfix5/apps/app_readfile.c
team/group/CDRfix5/apps/app_record.c
team/group/CDRfix5/apps/app_rpt.c
team/group/CDRfix5/apps/app_sayunixtime.c
team/group/CDRfix5/apps/app_senddtmf.c
team/group/CDRfix5/apps/app_sendtext.c
team/group/CDRfix5/apps/app_setcallerid.c
team/group/CDRfix5/apps/app_skel.c
team/group/CDRfix5/apps/app_sms.c
team/group/CDRfix5/apps/app_softhangup.c
team/group/CDRfix5/apps/app_speech_utils.c
team/group/CDRfix5/apps/app_stack.c
team/group/CDRfix5/apps/app_system.c
team/group/CDRfix5/apps/app_talkdetect.c
team/group/CDRfix5/apps/app_test.c
team/group/CDRfix5/apps/app_transfer.c
team/group/CDRfix5/apps/app_url.c
team/group/CDRfix5/apps/app_userevent.c
team/group/CDRfix5/apps/app_verbose.c
team/group/CDRfix5/apps/app_voicemail.c
team/group/CDRfix5/apps/app_waitforring.c
team/group/CDRfix5/apps/app_while.c
team/group/CDRfix5/apps/app_zapateller.c
team/group/CDRfix5/apps/app_zapbarge.c
team/group/CDRfix5/apps/app_zapras.c
team/group/CDRfix5/apps/app_zapscan.c
team/group/CDRfix5/cdr/cdr_csv.c
team/group/CDRfix5/cdr/cdr_manager.c
team/group/CDRfix5/cdr/cdr_odbc.c
team/group/CDRfix5/cdr/cdr_pgsql.c
team/group/CDRfix5/cdr/cdr_radius.c
team/group/CDRfix5/cdr/cdr_sqlite.c
team/group/CDRfix5/cdr/cdr_tds.c
team/group/CDRfix5/channels/chan_agent.c
team/group/CDRfix5/channels/chan_h323.c
team/group/CDRfix5/channels/chan_iax2.c
team/group/CDRfix5/channels/chan_mgcp.c
team/group/CDRfix5/channels/chan_phone.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/iax2-parser.c
team/group/CDRfix5/channels/iax2-parser.h
team/group/CDRfix5/channels/misdn/ie.c
team/group/CDRfix5/channels/misdn/isdn_lib.c
team/group/CDRfix5/configure
team/group/CDRfix5/configure.ac
team/group/CDRfix5/funcs/func_curl.c
team/group/CDRfix5/funcs/func_cut.c
team/group/CDRfix5/funcs/func_enum.c
team/group/CDRfix5/funcs/func_rand.c
team/group/CDRfix5/funcs/func_realtime.c
team/group/CDRfix5/funcs/func_strings.c
team/group/CDRfix5/funcs/func_timeout.c
team/group/CDRfix5/funcs/func_version.c
team/group/CDRfix5/funcs/func_vmcount.c
team/group/CDRfix5/include/asterisk/acl.h
team/group/CDRfix5/include/asterisk/app.h
team/group/CDRfix5/include/asterisk/autoconfig.h.in
team/group/CDRfix5/include/asterisk/config.h
team/group/CDRfix5/include/asterisk/localtime.h
team/group/CDRfix5/include/asterisk/options.h
team/group/CDRfix5/include/asterisk/pbx.h
team/group/CDRfix5/include/asterisk/strings.h
team/group/CDRfix5/include/asterisk/utils.h
team/group/CDRfix5/main/acl.c
team/group/CDRfix5/main/app.c
team/group/CDRfix5/main/asterisk.c
team/group/CDRfix5/main/callerid.c
team/group/CDRfix5/main/cdr.c
team/group/CDRfix5/main/channel.c
team/group/CDRfix5/main/cli.c
team/group/CDRfix5/main/config.c
team/group/CDRfix5/main/dns.c
team/group/CDRfix5/main/http.c
team/group/CDRfix5/main/loader.c
team/group/CDRfix5/main/logger.c
team/group/CDRfix5/main/manager.c
team/group/CDRfix5/main/pbx.c
team/group/CDRfix5/main/say.c
team/group/CDRfix5/main/stdtime/localtime.c
team/group/CDRfix5/main/utils.c
team/group/CDRfix5/pbx/pbx_ael.c
team/group/CDRfix5/pbx/pbx_dundi.c
team/group/CDRfix5/pbx/pbx_realtime.c
team/group/CDRfix5/res/res_agi.c
team/group/CDRfix5/res/res_convert.c
team/group/CDRfix5/res/snmp/agent.c
team/group/CDRfix5/utils/ael_main.c
team/group/CDRfix5/utils/check_expr.c
Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
automerge = yes
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 Fri Jul 20 15:03:09 2007
@@ -1,1 +1,1 @@
-/trunk:1-75199
+/trunk:1-76171
Modified: team/group/CDRfix5/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_adsiprog.c?view=diff&rev=76172&r1=76171&r2=76172
==============================================================================
--- team/group/CDRfix5/apps/app_adsiprog.c (original)
+++ team/group/CDRfix5/apps/app_adsiprog.c Fri Jul 20 15:03:09 2007
@@ -1548,10 +1548,7 @@
static int adsi_exec(struct ast_channel *chan, void *data)
{
- int res=0;
- struct ast_module_user *u;
-
- u = ast_module_user_add(chan);
+ int res = 0;
if (ast_strlen_zero(data))
data = "asterisk.adsi";
@@ -1564,8 +1561,6 @@
ast_verbose(VERBOSE_PREFIX_3 "ADSI Available on CPE. Attempting Upload.\n");
res = adsi_prog(chan, data);
}
-
- ast_module_user_remove(u);
return res;
}
Modified: team/group/CDRfix5/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_alarmreceiver.c?view=diff&rev=76172&r1=76171&r2=76172
==============================================================================
--- team/group/CDRfix5/apps/app_alarmreceiver.c (original)
+++ team/group/CDRfix5/apps/app_alarmreceiver.c Fri Jul 20 15:03:09 2007
@@ -306,8 +306,8 @@
static int write_metadata( FILE *logfile, char *signalling_type, struct ast_channel *chan)
{
int res = 0;
- time_t t;
- struct tm now;
+ struct timeval t;
+ struct ast_tm now;
char *cl,*cn;
char workstring[80];
char timestamp[80];
@@ -324,12 +324,12 @@
/* Get the current time */
- time(&t);
+ t = ast_tvnow();
ast_localtime(&t, &now, NULL);
/* Format the time */
- strftime(timestamp, sizeof(timestamp), time_stamp_format, &now);
+ ast_strftime(timestamp, sizeof(timestamp), time_stamp_format, &now);
res = fprintf(logfile, "\n\n[metadata]\n\n");
@@ -628,14 +628,11 @@
static int alarmreceiver_exec(struct ast_channel *chan, void *data)
{
int res = 0;
- struct ast_module_user *u;
event_node_t *elp, *efree;
char signalling_type[64] = "";
event_node_t *event_head = NULL;
- u = ast_module_user_add(chan);
-
/* Set write and read formats to ULAW */
if(option_verbose >= 4)
@@ -643,13 +640,11 @@
if (ast_set_write_format(chan,AST_FORMAT_ULAW)){
ast_log(LOG_WARNING, "AlarmReceiver: Unable to set write format to Mu-law on %s\n",chan->name);
- ast_module_user_remove(u);
return -1;
}
if (ast_set_read_format(chan,AST_FORMAT_ULAW)){
ast_log(LOG_WARNING, "AlarmReceiver: Unable to set read format to Mu-law on %s\n",chan->name);
- ast_module_user_remove(u);
return -1;
}
@@ -664,13 +659,8 @@
ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Answering channel\n");
if (chan->_state != AST_STATE_UP) {
-
- res = ast_answer(chan);
-
- if (res) {
- ast_module_user_remove(u);
+ if ((res = ast_answer(chan)))
return -1;
- }
}
/* Wait for the connection to settle post-answer */
@@ -721,9 +711,6 @@
elp = elp->next;
ast_free(efree);
}
-
-
- ast_module_user_remove(u);
return 0;
}
Modified: team/group/CDRfix5/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_amd.c?view=diff&rev=76172&r1=76171&r2=76172
==============================================================================
--- team/group/CDRfix5/apps/app_amd.c (original)
+++ team/group/CDRfix5/apps/app_amd.c Fri Jul 20 15:03:09 2007
@@ -318,11 +318,7 @@
static int amd_exec(struct ast_channel *chan, void *data)
{
- struct ast_module_user *u = NULL;
-
- u = ast_module_user_add(chan);
isAnsweringMachine(chan, data);
- ast_module_user_remove(u);
return 0;
}
Modified: team/group/CDRfix5/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_authenticate.c?view=diff&rev=76172&r1=76171&r2=76172
==============================================================================
--- team/group/CDRfix5/apps/app_authenticate.c (original)
+++ team/group/CDRfix5/apps/app_authenticate.c Fri Jul 20 15:03:09 2007
@@ -90,7 +90,6 @@
{
int res=0;
int retries;
- struct ast_module_user *u;
char passwd[256];
char *prompt;
int maxdigits;
@@ -107,15 +106,10 @@
ast_log(LOG_WARNING, "Authenticate requires an argument(password)\n");
return -1;
}
-
- u = ast_module_user_add(chan);
if (chan->_state != AST_STATE_UP) {
- res = ast_answer(chan);
- if (res) {
- ast_module_user_remove(u);
+ if ((res = ast_answer(chan)))
return -1;
- }
}
argcopy = ast_strdupa(data);
@@ -217,7 +211,7 @@
res = ast_waitstream(chan, "");
res = -1;
}
- ast_module_user_remove(u);
+
return res;
}
Modified: team/group/CDRfix5/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_cdr.c?view=diff&rev=76172&r1=76171&r2=76172
==============================================================================
--- team/group/CDRfix5/apps/app_cdr.c (original)
+++ team/group/CDRfix5/apps/app_cdr.c Fri Jul 20 15:03:09 2007
@@ -46,15 +46,8 @@
static int nocdr_exec(struct ast_channel *chan, void *data)
{
- struct ast_module_user *u;
-
- u = ast_module_user_add(chan);
-
- if (chan->cdr) {
+ if (chan->cdr)
ast_set_flag(chan->cdr, AST_CDR_FLAG_POST_DISABLED);
- }
-
- ast_module_user_remove(u);
return 0;
}
Modified: team/group/CDRfix5/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_chanisavail.c?view=diff&rev=76172&r1=76171&r2=76172
==============================================================================
--- team/group/CDRfix5/apps/app_chanisavail.c (original)
+++ team/group/CDRfix5/apps/app_chanisavail.c Fri Jul 20 15:03:09 2007
@@ -69,7 +69,6 @@
{
int res=-1, inuse=-1, option_state=0, string_compare=0;
int status;
- struct ast_module_user *u;
char *info, tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur;
struct ast_channel *tempchan;
AST_DECLARE_APP_ARGS(args,
@@ -81,8 +80,6 @@
ast_log(LOG_WARNING, "ChanIsAvail requires an argument (Zap/1&Zap/2)\n");
return -1;
}
-
- u = ast_module_user_add(chan);
info = ast_strdupa(data);
@@ -108,7 +105,6 @@
number = strchr(tech, '/');
if (!number) {
ast_log(LOG_WARNING, "ChanIsAvail argument takes format ([technology]/[device])\n");
- ast_module_user_remove(u);
return -1;
}
*number = '\0';
@@ -151,7 +147,6 @@
pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", "");
}
- ast_module_user_remove(u);
return 0;
}
Modified: team/group/CDRfix5/apps/app_channelredirect.c
[... 11843 lines stripped ...]
More information about the asterisk-commits
mailing list