[svn-commits] nadi: branch group/trunk-cm-csel-hash r47412 - in
/team/group/trunk-cm-csel-h...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Fri Nov 10 01:54:54 MST 2006
Author: nadi
Date: Fri Nov 10 02:54:53 2006
New Revision: 47412
URL: http://svn.digium.com/view/asterisk?view=rev&rev=47412
Log:
Merged revisions 47170,47175,47177-47182,47184-47187,47189,47193-47194,47197-47198,47200-47207,47209-47210,47213,47229-47230,47232,47240,47242,47251-47252,47257-47259,47269,47278,47280,47285,47288,47290,47295,47300,47304-47306,47313-47318,47321,47325,47328,47330,47332,47335,47337,47339,47341,47343,47349-47351,47353,47367,47371,47374,47376,47378,47382,47392,47399,47404,47406,47408,47410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r47170 | rizzo | 2006-11-03 23:01:34 +0100 (Fr, 03 Nov 2006) | 3 lines
remove redundant checks
................
r47175 | rizzo | 2006-11-03 23:36:17 +0100 (Fr, 03 Nov 2006) | 3 lines
change HANDLE_CAUSE into a function.
................
r47177 | rizzo | 2006-11-04 00:24:21 +0100 (Sa, 04 Nov 2006) | 3 lines
another small set of simplifications
................
r47178 | murf | 2006-11-04 00:27:58 +0100 (Sa, 04 Nov 2006) | 1 line
This fix introduced via bug 8233
................
r47179 | rizzo | 2006-11-04 01:01:40 +0100 (Sa, 04 Nov 2006) | 9 lines
move a large block into a separate function.
Mark with XXX a possible bug in previous code which used
the wrong source in case of a forwarded call.
the function do_forward() needs to be split further, as the initial
part is replicated in another places (with some minor differences, most likely
forgotten when updating after the copy).
................
r47180 | rizzo | 2006-11-04 01:50:18 +0100 (Sa, 04 Nov 2006) | 8 lines
move another block into a function.
On passing, avoid two null-pointer string dereference
while printing messages (which are
sometimes not fatal in some platforms, but still wrong).
These two lines at least should be merged to 1.4 once i am
done with all the changes here.
................
r47181 | rizzo | 2006-11-04 01:56:02 +0100 (Sa, 04 Nov 2006) | 3 lines
complete previous commit.
................
r47182 | rizzo | 2006-11-04 02:16:20 +0100 (Sa, 04 Nov 2006) | 4 lines
fix indentation of a block, and do minor simplifications at the end of
another one.
................
r47184 | rizzo | 2006-11-04 02:20:38 +0100 (Sa, 04 Nov 2006) | 4 lines
document the "debug" parameter, and the change
manager list -> manager show
................
r47185 | rizzo | 2006-11-04 02:32:31 +0100 (Sa, 04 Nov 2006) | 3 lines
remove a useless cast
................
r47186 | rizzo | 2006-11-04 02:34:59 +0100 (Sa, 04 Nov 2006) | 3 lines
remove many unnecessary casts
................
r47187 | rizzo | 2006-11-04 02:40:49 +0100 (Sa, 04 Nov 2006) | 3 lines
useless cast removal...
................
r47189 | rizzo | 2006-11-04 12:00:49 +0100 (Sa, 04 Nov 2006) | 8 lines
move out another large block to a large function, and document
some possibly missing parts in the privacy screening code.
Now that it is more streamlined it is easier to see differences
in handling the various cases.
Have not tested the code in depth.
................
r47193 | russell | 2006-11-04 18:40:42 +0100 (Sa, 04 Nov 2006) | 11 lines
Merged revisions 47192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47192 | russell | 2006-11-04 12:38:24 -0500 (Sat, 04 Nov 2006) | 3 lines
fix the "atleast" option to the "core set verbose" and "core set debug"
CLI commands
........
................
r47194 | oej | 2006-11-04 18:45:47 +0100 (Sa, 04 Nov 2006) | 3 lines
Reverting rev 47093 until we have an agreement on how to
implement this, if at all.
................
r47197 | russell | 2006-11-04 19:11:18 +0100 (Sa, 04 Nov 2006) | 10 lines
Merged revisions 47195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47195 | russell | 2006-11-04 12:59:39 -0500 (Sat, 04 Nov 2006) | 2 lines
Really fix the "core set debug" and "core set verbose" CLI commands.
........
................
r47198 | russell | 2006-11-04 19:12:31 +0100 (Sa, 04 Nov 2006) | 10 lines
Merged revisions 47196 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47196 | russell | 2006-11-04 13:10:22 -0500 (Sat, 04 Nov 2006) | 2 lines
Fix another bug in "core set debug" ...
........
................
r47200 | oej | 2006-11-04 19:40:51 +0100 (Sa, 04 Nov 2006) | 2 lines
Importing patch for Invite/replaces from 1.4
................
r47201 | oej | 2006-11-04 20:13:30 +0100 (Sa, 04 Nov 2006) | 8 lines
Adding new config option "limitpeersonly" to only apply call limits
to the peer side of a type=friend.
This is for trying to support BJ in his quest to solve some issues
with the queue system and type=friend objects.
BJ: Please test!
................
r47202 | oej | 2006-11-04 20:20:30 +0100 (Sa, 04 Nov 2006) | 2 lines
Simplify previous patch
................
r47203 | oej | 2006-11-04 22:17:40 +0100 (Sa, 04 Nov 2006) | 2 lines
Make srvlookup global_srvlookup to follow the rest of the code
................
r47204 | russell | 2006-11-04 22:44:48 +0100 (Sa, 04 Nov 2006) | 3 lines
Do some minor cleanup to the section of code that sets the EID by getting the
mac address for an ethernet interface
................
r47205 | oej | 2006-11-04 22:48:02 +0100 (Sa, 04 Nov 2006) | 2 lines
Move IP address selection for media out of add_sdp
................
r47206 | russell | 2006-11-04 22:54:37 +0100 (Sa, 04 Nov 2006) | 2 lines
simplify a couple of loops
................
r47207 | russell | 2006-11-04 23:08:35 +0100 (Sa, 04 Nov 2006) | 2 lines
use the AST_MODULE_LOAD_* return codes from load_module()
................
r47209 | oej | 2006-11-04 23:16:57 +0100 (Sa, 04 Nov 2006) | 4 lines
Don't lock dialoglist if monitor runs __sip_destroy.
Hmmm. I did not change pbx_dundi and yet it doesn't compile ;-)
................
r47210 | russell | 2006-11-04 23:41:12 +0100 (Sa, 04 Nov 2006) | 3 lines
List ss7 with the rest of the valid signalling types. Group SS7 options
together and comment them out by default.
................
r47213 | russell | 2006-11-05 02:04:29 +0100 (So, 05 Nov 2006) | 2 lines
Make pbx_dundi compile again. Sorry. :(
................
r47229 | file | 2006-11-06 18:05:04 +0100 (Mo, 06 Nov 2006) | 2 lines
Add support for manager hooks, so you could fire off manager events over IRC if you were crazy enough. (issue #5161 reported by anthm with mods by moi)
................
r47230 | kpfleming | 2006-11-06 18:27:28 +0100 (Mo, 06 Nov 2006) | 2 lines
minor change to test live syncing
................
r47232 | russell | 2006-11-06 19:05:11 +0100 (Mo, 06 Nov 2006) | 2 lines
check for failure after call to calloc() (issue #8295)
................
r47240 | russell | 2006-11-07 02:28:08 +0100 (Di, 07 Nov 2006) | 21 lines
Merged revisions 47239 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47239 | russell | 2006-11-06 20:25:10 -0500 (Mon, 06 Nov 2006) | 13 lines
Merged revisions 47238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47238 | russell | 2006-11-06 20:22:58 -0500 (Mon, 06 Nov 2006) | 5 lines
If random order is enabled for files mode music on hold, set a random initial
position, instead of always starting at the first file, and doing the random
operation only when switching to the next file.
(bug reported by John Lange on the asterisk-dev mailing list)
........
................
................
r47242 | rizzo | 2006-11-07 09:34:26 +0100 (Di, 07 Nov 2006) | 4 lines
explain why ast_carefulwrite is written the way it is,
and also that it doesn't really work as claimed.
................
r47251 | oej | 2006-11-07 14:16:05 +0100 (Di, 07 Nov 2006) | 2 lines
Stealing Tilghman's explanation from the -dev list and producing documentation...
................
r47252 | oej | 2006-11-07 14:26:31 +0100 (Di, 07 Nov 2006) | 2 lines
issue #8265 - don't reply to ACK. Imported from 1.2, 1.4
................
r47257 | kpfleming | 2006-11-07 15:17:53 +0100 (Di, 07 Nov 2006) | 2 lines
use editable URL for menuselect, and switch to trunk
................
r47258 | kpfleming | 2006-11-07 15:24:19 +0100 (Di, 07 Nov 2006) | 2 lines
remove properties that shouldn't be merged to this branch
................
r47259 | kpfleming | 2006-11-07 15:25:00 +0100 (Di, 07 Nov 2006) | 2 lines
remove another broken property merge
................
r47269 | oej | 2006-11-07 18:33:24 +0100 (Di, 07 Nov 2006) | 2 lines
Break -> continue to make stuff work... Thanks, Luigi!
................
r47278 | mogorman | 2006-11-07 19:50:58 +0100 (Di, 07 Nov 2006) | 5 lines
rge overhaul to voicemail imap support. Allows support for more imap servers,
also a better implementation of several parts of the original work.
patch provided by 8033 with major upgrades. minor differences from 1.4 patch do to
changes in app_voicemail
................
r47280 | kpfleming | 2006-11-07 19:56:56 +0100 (Di, 07 Nov 2006) | 10 lines
Merged revisions 47279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47279 | kpfleming | 2006-11-07 12:56:21 -0600 (Tue, 07 Nov 2006) | 2 lines
clean up sample config, and make native file playback the more obvious default choice
........
................
r47285 | file | 2006-11-07 21:12:30 +0100 (Di, 07 Nov 2006) | 10 lines
Merged revisions 47284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47284 | file | 2006-11-07 15:08:52 -0500 (Tue, 07 Nov 2006) | 2 lines
Make MOH work as it did before in chan_local, without this then it can go funky when transfers and MOH are involved. (issue #7671 reported by jmls)
........
................
r47288 | file | 2006-11-07 21:16:02 +0100 (Di, 07 Nov 2006) | 10 lines
Merged revisions 47287 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47287 | file | 2006-11-07 15:14:58 -0500 (Tue, 07 Nov 2006) | 2 lines
This is not the commit you are looking for...
........
................
r47290 | murf | 2006-11-07 22:47:49 +0100 (Di, 07 Nov 2006) | 1 line
A fair number of changes for the sake of bug 7506
................
r47295 | rizzo | 2006-11-07 23:26:48 +0100 (Di, 07 Nov 2006) | 4 lines
%ld and time_t don't match, so cast the argument to long
to ease portability problems
................
r47300 | rizzo | 2006-11-08 00:14:04 +0100 (Mi, 08 Nov 2006) | 5 lines
fix "core show profile" parsing.
Needs to go in 1.4 too, but ENOTIME now
................
r47304 | russell | 2006-11-08 04:12:31 +0100 (Mi, 08 Nov 2006) | 3 lines
remove aclocal.m4 from the tree since it is just an intermediate file created
while generating the configure script.
................
r47305 | russell | 2006-11-08 04:13:46 +0100 (Mi, 08 Nov 2006) | 2 lines
add a comment about where AC_PROG_LD comes from
................
r47306 | rizzo | 2006-11-08 08:21:45 +0100 (Mi, 08 Nov 2006) | 8 lines
fix compilation.
Overall i think the previous change to ast_channel_alloc()
to close bug 7506 should have been done by defining
an ast_set_callerid_noevent() function that does the
setting without generating the event.
Lot less code duplication, and easier to handle.
................
r47313 | oej | 2006-11-08 09:01:44 +0100 (Mi, 08 Nov 2006) | 2 lines
Destroy dialog properly at unload (rizzo)
................
r47314 | rizzo | 2006-11-08 14:43:06 +0100 (Mi, 08 Nov 2006) | 4 lines
silence compiler about uninitialized variables.
The compiler is wrong, but it has the last word.
................
r47315 | rizzo | 2006-11-08 14:44:27 +0100 (Mi, 08 Nov 2006) | 7 lines
merge rev.47224 from team/rizzo/astobj2:
hide dialoglist lock/unlocking in wrapper functions.
Approved By: oej
................
r47316 | rizzo | 2006-11-08 14:49:25 +0100 (Mi, 08 Nov 2006) | 15 lines
merge from team/rizzo/astobj2, rev 47243, 47244, 47245:
Replace ASTOBJ_UNREF(peer, sip_destroy_peer) with unref_peer(peer);
This places the name of the destructor in one place only (where it
should be), eliminates the chance of errors in case you specify the wrong
destructor, and also lets the compiler do type checking on the argument,
again helping with keeping the code clean.
Same for users.
remove two duplicate definitions.
Approved By: oej
................
r47317 | rizzo | 2006-11-08 14:53:01 +0100 (Mi, 08 Nov 2006) | 8 lines
merge from team/rizzo/astobj2 rev.47246
Same as for peers and users, replace ASTOBJ_UNREF(r, sip_registry_destroy)
with unref_registry(r);
Approved By: oej
................
r47318 | rizzo | 2006-11-08 14:59:32 +0100 (Mi, 08 Nov 2006) | 8 lines
merge from team/rizzo/astobj2 rev.47271
avoid doing p > 0 when p is a pointer;
move a lock closer to the place where it is needed
Approved By: oej
................
r47321 | kpfleming | 2006-11-08 16:28:39 +0100 (Mi, 08 Nov 2006) | 2 lines
coding guidelines, coding guidelines, coding guidelines
................
r47325 | russell | 2006-11-08 17:29:41 +0100 (Mi, 08 Nov 2006) | 10 lines
Blocked revisions 47323 via svnmerge
........
r47323 | russell | 2006-11-08 11:08:50 -0500 (Wed, 08 Nov 2006) | 3 lines
Remove aclocal.m4 from the tree since it is just an intermediate file created
while generating the configure script.
........
................
r47328 | russell | 2006-11-08 17:36:45 +0100 (Mi, 08 Nov 2006) | 12 lines
Merged revisions 47327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47327 | russell | 2006-11-08 11:31:59 -0500 (Wed, 08 Nov 2006) | 4 lines
Copy the macros from libtool.m4 to our own acinclude.m4 such that libtool is
no longer required to be installed to be able to generate the configure
script.
........
................
r47330 | russell | 2006-11-08 17:59:04 +0100 (Mi, 08 Nov 2006) | 9 lines
Blocked revisions 47329 via svnmerge
........
r47329 | russell | 2006-11-08 11:55:35 -0500 (Wed, 08 Nov 2006) | 2 lines
Make this module build again
........
................
r47332 | russell | 2006-11-08 18:06:33 +0100 (Mi, 08 Nov 2006) | 13 lines
Merged revisions 47331 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47331 | russell | 2006-11-08 12:03:09 -0500 (Wed, 08 Nov 2006) | 5 lines
I occasionally get email from users that are trying to figure out what this
does, or due to some misunderstanding as to what it is supposed to do, can't
get it to work. So, I have added some text here to hopefully explain what
this application does and does not do.
........
................
r47335 | file | 2006-11-08 19:26:52 +0100 (Mi, 08 Nov 2006) | 2 lines
Display CID matching information when using dialplan show. (issue #8279 reported by caio1982)
................
r47337 | kpfleming | 2006-11-08 19:28:53 +0100 (Mi, 08 Nov 2006) | 10 lines
Merged revisions 47333 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47333 | kpfleming | 2006-11-08 12:07:16 -0600 (Wed, 08 Nov 2006) | 2 lines
add simple fix for SDP to report proper sample rate for G.722 media sessions
........
................
r47339 | kpfleming | 2006-11-08 22:59:51 +0100 (Mi, 08 Nov 2006) | 2 lines
restore display of G.722 codec
................
r47341 | oej | 2006-11-08 23:35:22 +0100 (Mi, 08 Nov 2006) | 4 lines
- Add Max-Forwards higher in the packet, following recommendations
- Fix documentation for sip_pvt_lock/unlock - doxygen does not inherit like zapata.conf !!!
- Change doc for a sip_pvt setting
................
r47343 | murf | 2006-11-08 23:52:01 +0100 (Mi, 08 Nov 2006) | 1 line
committed in behalf of bug 8190
................
r47349 | murf | 2006-11-09 00:17:27 +0100 (Do, 09 Nov 2006) | 1 line
This mod via bug 7531
................
r47350 | murf | 2006-11-09 01:40:14 +0100 (Do, 09 Nov 2006) | 1 line
Blocking 47348 from automerging into trunk
................
r47351 | murf | 2006-11-09 01:46:24 +0100 (Do, 09 Nov 2006) | 1 line
Blocking 47344 from automerging into trunk
................
r47353 | russell | 2006-11-09 07:35:05 +0100 (Do, 09 Nov 2006) | 11 lines
Merged revisions 47352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47352 | russell | 2006-11-09 01:31:37 -0500 (Thu, 09 Nov 2006) | 3 lines
fix "core show version" to reflect the new number of arguments for this
CLI command (issue #8316, kshumard)
........
................
r47367 | russell | 2006-11-09 16:51:15 +0100 (Do, 09 Nov 2006) | 11 lines
Merged revisions 47366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47366 | russell | 2006-11-09 10:49:39 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix another CLI command, "core show uptime" ...
(issue #8323, reported by johnlange, fixed by myself)
........
................
r47371 | russell | 2006-11-09 17:15:49 +0100 (Do, 09 Nov 2006) | 10 lines
Blocked revisions 47369 via svnmerge
........
r47369 | russell | 2006-11-09 11:04:38 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix argument parsing for the "core show profile" CLI command
(fixed by rizzo in his branch, team/rizzo/astobj2)
........
................
r47374 | russell | 2006-11-09 17:20:43 +0100 (Do, 09 Nov 2006) | 11 lines
Merged revisions 47372 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47372 | russell | 2006-11-09 11:18:33 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix "core debug channel <whatever>". I guess someone needs to go through and
audit every CLI command that changed number of arguments ...
........
................
r47376 | russell | 2006-11-09 17:26:47 +0100 (Do, 09 Nov 2006) | 11 lines
Merged revisions 47375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47375 | russell | 2006-11-09 11:24:02 -0500 (Thu, 09 Nov 2006) | 3 lines
Fix "core show channel". Also, fix tab completion for both "core show channel"
and "core show channels".
........
................
r47378 | russell | 2006-11-09 17:30:06 +0100 (Do, 09 Nov 2006) | 10 lines
Merged revisions 47377 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47377 | russell | 2006-11-09 11:28:15 -0500 (Thu, 09 Nov 2006) | 2 lines
fix tab completion for "core debug channel" and "core no debug channel"
........
................
r47382 | file | 2006-11-09 18:08:29 +0100 (Do, 09 Nov 2006) | 18 lines
Merged revisions 47380 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47380 | file | 2006-11-09 11:53:25 -0500 (Thu, 09 Nov 2006) | 10 lines
Merged revisions 47379 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47379 | file | 2006-11-09 11:48:05 -0500 (Thu, 09 Nov 2006) | 2 lines
Don't include compiler.h on kernels 2.6.18 and higher as, well, it's apparently going to be removed. This should make all you FC6 fans happy as your Asterisk will now build without any mods.
........
................
................
r47392 | russell | 2006-11-09 22:32:27 +0100 (Do, 09 Nov 2006) | 15 lines
Merged revisions 47391 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47391 | russell | 2006-11-09 16:26:27 -0500 (Thu, 09 Nov 2006) | 7 lines
Work around an issue that caused menuselect to display a bogus description for
app_voicemail and chan_zap. These modules use some preprocessor directives to
determine what it will report to Asterisk as its description. However, the way
we extract this information from the source files for menuselect is not smart
enough to figure this out.
(issue #8326, #8328)
........
................
r47399 | file | 2006-11-09 23:34:00 +0100 (Do, 09 Nov 2006) | 10 lines
Merged revisions 47398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47398 | file | 2006-11-09 17:32:30 -0500 (Thu, 09 Nov 2006) | 2 lines
Do conversion in a more easier to read and working way for \r, \n, and \t. (issue #8324 reported by johnlange)
........
................
r47404 | file | 2006-11-10 04:34:13 +0100 (Fr, 10 Nov 2006) | 2 lines
This should already be called while locked.
................
r47406 | file | 2006-11-10 04:45:59 +0100 (Fr, 10 Nov 2006) | 10 lines
Merged revisions 47405 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47405 | file | 2006-11-09 22:44:36 -0500 (Thu, 09 Nov 2006) | 2 lines
Fix building of chan_h323 by completeing some structure definitions. (issue #8327 reported by Mithraen)
........
................
r47408 | russell | 2006-11-10 04:59:48 +0100 (Fr, 10 Nov 2006) | 4 lines
Add the ability to specify multiple prompts to the Read() dialplan application,
similar to Background() and Playback().
(issue #7897, jsmith, with some modifications)
................
r47410 | russell | 2006-11-10 05:30:23 +0100 (Fr, 10 Nov 2006) | 3 lines
Various little bits of code cleanup to reduce nesting, remove useless casts,
and to remove a duplicated error message after a memory allocation error
................
Removed:
team/group/trunk-cm-csel-hash/aclocal.m4
Modified:
team/group/trunk-cm-csel-hash/ (props changed)
team/group/trunk-cm-csel-hash/CHANGES
team/group/trunk-cm-csel-hash/UPGRADE.txt
team/group/trunk-cm-csel-hash/acinclude.m4
team/group/trunk-cm-csel-hash/apps/app_dial.c
team/group/trunk-cm-csel-hash/apps/app_queue.c
team/group/trunk-cm-csel-hash/apps/app_read.c
team/group/trunk-cm-csel-hash/apps/app_voicemail.c
team/group/trunk-cm-csel-hash/build_tools/prep_moduledeps
team/group/trunk-cm-csel-hash/channels/chan_agent.c
team/group/trunk-cm-csel-hash/channels/chan_alsa.c
team/group/trunk-cm-csel-hash/channels/chan_features.c
team/group/trunk-cm-csel-hash/channels/chan_gtalk.c
team/group/trunk-cm-csel-hash/channels/chan_h323.c
team/group/trunk-cm-csel-hash/channels/chan_iax2.c
team/group/trunk-cm-csel-hash/channels/chan_jingle.c
team/group/trunk-cm-csel-hash/channels/chan_local.c
team/group/trunk-cm-csel-hash/channels/chan_mgcp.c
team/group/trunk-cm-csel-hash/channels/chan_misdn.c
team/group/trunk-cm-csel-hash/channels/chan_nbs.c
team/group/trunk-cm-csel-hash/channels/chan_oss.c
team/group/trunk-cm-csel-hash/channels/chan_phone.c
team/group/trunk-cm-csel-hash/channels/chan_sip.c
team/group/trunk-cm-csel-hash/channels/chan_skinny.c
team/group/trunk-cm-csel-hash/channels/chan_vpb.cc
team/group/trunk-cm-csel-hash/channels/chan_zap.c
team/group/trunk-cm-csel-hash/configs/manager.conf.sample
team/group/trunk-cm-csel-hash/configs/musiconhold.conf.sample
team/group/trunk-cm-csel-hash/configs/sip.conf.sample
team/group/trunk-cm-csel-hash/configs/zapata.conf.sample
team/group/trunk-cm-csel-hash/configure
team/group/trunk-cm-csel-hash/configure.ac
team/group/trunk-cm-csel-hash/include/asterisk/app.h
team/group/trunk-cm-csel-hash/include/asterisk/channel.h
team/group/trunk-cm-csel-hash/include/asterisk/frame.h
team/group/trunk-cm-csel-hash/include/asterisk/manager.h
team/group/trunk-cm-csel-hash/include/asterisk/stringfields.h
team/group/trunk-cm-csel-hash/main/app.c
team/group/trunk-cm-csel-hash/main/asterisk.c
team/group/trunk-cm-csel-hash/main/channel.c
team/group/trunk-cm-csel-hash/main/cli.c
team/group/trunk-cm-csel-hash/main/frame.c
team/group/trunk-cm-csel-hash/main/logger.c
team/group/trunk-cm-csel-hash/main/manager.c
team/group/trunk-cm-csel-hash/main/pbx.c
team/group/trunk-cm-csel-hash/main/utils.c
team/group/trunk-cm-csel-hash/pbx/pbx_dundi.c
team/group/trunk-cm-csel-hash/res/res_agi.c
team/group/trunk-cm-csel-hash/res/res_features.c
team/group/trunk-cm-csel-hash/res/res_musiconhold.c
team/group/trunk-cm-csel-hash/utils/astman.c
team/group/trunk-cm-csel-hash/utils/check_expr.c
team/group/trunk-cm-csel-hash/utils/streamplayer.c
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Fri Nov 10 02:54:53 2006
@@ -1,1 +1,1 @@
-menuselect http://svn.digium.com/svn/menuselect/branches/1.0
+menuselect https://origsvn.digium.com/svn/menuselect/branches/1.0
Propchange: team/group/trunk-cm-csel-hash/
('svnmerge-blocked' removed)
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Nov 10 02:54:53 2006
@@ -1,1 +1,1 @@
-/trunk:1-47161
+/trunk:1-47411
Modified: team/group/trunk-cm-csel-hash/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/CHANGES?view=diff&rev=47412&r1=47411&r2=47412
==============================================================================
--- team/group/trunk-cm-csel-hash/CHANGES (original)
+++ team/group/trunk-cm-csel-hash/CHANGES Fri Nov 10 02:54:53 2006
@@ -58,3 +58,4 @@
* Added QUEUE_VARIABLES function to set queue variables added setqueuevar and
setqueueentryvar options for each queue, see queues.conf.sample for details.
* Brazilian Portuguese (pt-BR) in VM, and say.c was added via patch from cfassoni.
+ * CID matching information is now shown when doing 'dialplan show'.
Modified: team/group/trunk-cm-csel-hash/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/UPGRADE.txt?view=diff&rev=47412&r1=47411&r2=47412
==============================================================================
--- team/group/trunk-cm-csel-hash/UPGRADE.txt (original)
+++ team/group/trunk-cm-csel-hash/UPGRADE.txt Fri Nov 10 02:54:53 2006
@@ -3,6 +3,6 @@
Manager:
-* The CallerID fields across manager events have now been made more
+* The CallerID fields across Manager events have now been made more
consistent. CallerID Number will be sent as CallerIDNum and CallerID
Name will be sent as CallerIDName wherever used.
Modified: team/group/trunk-cm-csel-hash/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/acinclude.m4?view=diff&rev=47412&r1=47411&r2=47412
==============================================================================
--- team/group/trunk-cm-csel-hash/acinclude.m4 (original)
+++ team/group/trunk-cm-csel-hash/acinclude.m4 Fri Nov 10 02:54:53 2006
@@ -567,3 +567,119 @@
[ac_cv_func_fork_works=no],
[ac_cv_func_fork_works=cross])])]
)# _AST_FUNC_FORK
+
+# AST_PROG_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([AST_PROG_LD],
+[AC_ARG_WITH([gnu-ld],
+ [AC_HELP_STRING([--with-gnu-ld],
+ [assume the C compiler uses GNU ld @<:@default=no@:>@])],
+ [test "$withval" = no || with_gnu_ld=yes],
+ [with_gnu_ld=no])
+AC_REQUIRE([AC_PROG_SED])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ AC_MSG_CHECKING([for ld used by $CC])
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [[\\/]]* | ?:[[\\/]]*)
+ re_direlt='/[[^/]][[^/]]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ AC_MSG_CHECKING([for GNU ld])
+else
+ AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$lt_save_ifs"
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break
+ ;;
+ *)
+ test "$with_gnu_ld" != yes && break
+ ;;
+ esac
+ fi
+ done
+ IFS="$lt_save_ifs"
+else
+ lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+ AC_MSG_RESULT($LD)
+else
+ AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AST_PROG_LD_GNU
+])# AST_PROG_LD
+
+
+# AST_PROG_LD_GNU
+# --------------
+AC_DEFUN([AST_PROG_LD_GNU],
+[AC_REQUIRE([AST_PROG_EGREP])dnl
+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+*)
+ lt_cv_prog_gnu_ld=no
+ ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# AST_PROG_LD_GNU
+
+# AST_PROG_EGREP
+# -------------
+m4_ifndef([AST_PROG_EGREP], [AC_DEFUN([AST_PROG_EGREP],
+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
+ [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+ then ac_cv_prog_egrep='grep -E'
+ else ac_cv_prog_egrep='egrep'
+ fi])
+ EGREP=$ac_cv_prog_egrep
+ AC_SUBST([EGREP])
+])]) # AST_PROG_EGREP
+
+
Modified: team/group/trunk-cm-csel-hash/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_dial.c?view=diff&rev=47412&r1=47411&r2=47412
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_dial.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_dial.c Fri Nov 10 02:54:53 2006
@@ -318,30 +318,47 @@
#define AST_MAX_WATCHERS 256
-#define HANDLE_CAUSE(cause, chan) do { \
- switch(cause) { \
- case AST_CAUSE_BUSY: \
- if (chan->cdr) \
- ast_cdr_busy(chan->cdr); \
- numbusy++; \
- break; \
- case AST_CAUSE_CONGESTION: \
- if (chan->cdr) \
- ast_cdr_failed(chan->cdr); \
- numcongestion++; \
- break; \
- case AST_CAUSE_UNREGISTERED: \
- if (chan->cdr) \
- ast_cdr_failed(chan->cdr); \
- numnochan++; \
- break; \
- case AST_CAUSE_NORMAL_CLEARING: \
- break; \
- default: \
- numnochan++; \
- break; \
- } \
-} while (0)
+/*
+ * argument to handle_cause() and other functions.
+ */
+struct cause_args {
+ struct ast_channel *chan;
+ int busy;
+ int congestion;
+ int nochan;
+};
+
+static void handle_cause(int cause, struct cause_args *num)
+{
+ struct ast_cdr *cdr = num->chan->cdr;
+
+ switch(cause) {
+ case AST_CAUSE_BUSY:
+ if (cdr)
+ ast_cdr_busy(cdr);
+ num->busy++;
+ break;
+
+ case AST_CAUSE_CONGESTION:
+ if (cdr)
+ ast_cdr_failed(cdr);
+ num->congestion++;
+ break;
+
+ case AST_CAUSE_UNREGISTERED:
+ if (cdr)
+ ast_cdr_failed(cdr);
+ num->nochan++;
+ break;
+
+ case AST_CAUSE_NORMAL_CLEARING:
+ break;
+
+ default:
+ num->nochan++;
+ break;
+ }
+}
/* free the buffer if allocated, and set the pointer to the second arg */
#define S_REPLACE(s, new_val) \
@@ -402,12 +419,113 @@
src->name, dialstatus);
}
-static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_localuser *outgoing, int *to, struct ast_flags *peerflags, int *sentringing, char *status, size_t statussize, int busystart, int nochanstart, int congestionstart, int priority_jump, int *result)
+/* helper function for wait_for_answer() */
+static void do_forward(struct dial_localuser *o,
+ struct cause_args *num, struct ast_flags *peerflags, int single)
{
- int numbusy = busystart;
- int numcongestion = congestionstart;
- int numnochan = nochanstart;
- int prestart = busystart + congestionstart + nochanstart;
+ char tmpchan[256];
+ struct ast_channel *c = o->chan; /* the winner */
+ struct ast_channel *in = num->chan; /* the input channel */
+ char *stuff;
+ char *tech;
+ int cause;
+
+ ast_copy_string(tmpchan, c->call_forward, sizeof(tmpchan));
+ if ((stuff = strchr(tmpchan, '/'))) {
+ *stuff++ = '\0';
+ tech = tmpchan;
+ } else {
+ const char *forward_context = pbx_builtin_getvar_helper(c, "FORWARD_CONTEXT");
+ snprintf(tmpchan, sizeof(tmpchan), "%s@%s", c->call_forward, forward_context ? forward_context : c->context);
+ stuff = tmpchan;
+ tech = "Local";
+ }
+ /* Before processing channel, go ahead and check for forwarding */
+ o->forwards++;
+ if (o->forwards < AST_MAX_FORWARDS) {
+ if (option_verbose > 2)
+ ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
+ /* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */
+ if (ast_test_flag(peerflags, OPT_IGNORE_FORWARDING)) {
+ if (option_verbose > 2)
+ ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
+ c = o->chan = NULL;
+ cause = AST_CAUSE_BUSY;
+ } else {
+ /* Setup parameters */
+ c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
+ if (!c)
+ ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
+ else
+ ast_channel_inherit_variables(in, o->chan);
+ }
+ } else {
+ if (option_verbose > 2)
+ ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", c->name);
+ cause = AST_CAUSE_CONGESTION;
+ c = o->chan = NULL;
+ }
+ if (!c) {
+ ast_clear_flag(o, DIAL_STILLGOING);
+ handle_cause(cause, num);
+ } else {
+ char *new_cid_num, *new_cid_name;
+ struct ast_channel *src;
+
+ ast_rtp_make_compatible(c, in, single);
+ if (ast_test_flag(o, OPT_FORCECLID)) {
+ new_cid_num = ast_strdup(S_OR(in->macroexten, in->exten));
+ new_cid_name = NULL; /* XXX no name ? */
+ src = c; /* XXX possible bug in previous code, which used 'winner' ? it may have changed */
+ } else {
+ new_cid_num = ast_strdup(in->cid.cid_num);
+ new_cid_name = ast_strdup(in->cid.cid_name);
+ src = in;
+ }
+ ast_string_field_set(c, accountcode, src->accountcode);
+ c->cdrflags = src->cdrflags;
+ S_REPLACE(c->cid.cid_num, new_cid_num);
+ S_REPLACE(c->cid.cid_name, new_cid_name);
+
+ if (in->cid.cid_ani) { /* XXX or maybe unconditional ? */
+ S_REPLACE(c->cid.cid_ani, ast_strdup(in->cid.cid_ani));
+ }
+ S_REPLACE(c->cid.cid_rdnis, ast_strdup(S_OR(in->macroexten, in->exten)));
+ if (ast_call(c, tmpchan, 0)) {
+ ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
+ ast_clear_flag(o, DIAL_STILLGOING);
+ ast_hangup(c);
+ c = o->chan = NULL;
+ num->nochan++;
+ } else {
+ senddialevent(in, c);
+ /* After calling, set callerid to extension */
+ if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) {
+ char cidname[AST_MAX_EXTENSION];
+ ast_set_callerid(c, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL);
+ }
+ }
+ }
+ /* Hangup the original channel now, in case we needed it */
+ ast_hangup(c);
+}
+
+/* argument used for some functions. */
+struct privacy_args {
+ int sentringing;
+ int privdb_val;
+ char privcid[256];
+ char privintro[1024];
+ char status[256];
+};
+
+static struct ast_channel *wait_for_answer(struct ast_channel *in,
+ struct dial_localuser *outgoing, int *to, struct ast_flags *peerflags,
+ struct privacy_args *pa,
+ const struct cause_args *num_in, int priority_jump, int *result)
+{
+ struct cause_args num = *num_in;
+ int prestart = num.busy + num.congestion + num.nochan;
int orig = *to;
struct ast_channel *peer = NULL;
/* single is set if only one destination is enabled */
@@ -436,20 +554,20 @@
numlines++;
}
if (pos == 1) { /* only the input channel is available */
- if (numlines == (numbusy + numcongestion + numnochan)) {
+ if (numlines == (num.busy + num.congestion + num.nochan)) {
if (option_verbose > 2)
- ast_verbose( VERBOSE_PREFIX_2 "Everyone is busy/congested at this time (%d:%d/%d/%d)\n", numlines, numbusy, numcongestion, numnochan);
- if (numbusy)
- strcpy(status, "BUSY");
- else if (numcongestion)
- strcpy(status, "CONGESTION");
- else if (numnochan)
- strcpy(status, "CHANUNAVAIL");
+ ast_verbose( VERBOSE_PREFIX_2 "Everyone is busy/congested at this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
+ if (num.busy)
+ strcpy(pa->status, "BUSY");
+ else if (num.congestion)
+ strcpy(pa->status, "CONGESTION");
+ else if (num.nochan)
+ strcpy(pa->status, "CHANUNAVAIL");
if (ast_opt_priority_jumping || priority_jump)
ast_goto_if_exists(in, in->context, in->exten, in->priority + 101);
} else {
if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "No one is available to answer at this time (%d:%d/%d/%d)\n", numlines, numbusy, numcongestion, numnochan);
+ ast_verbose(VERBOSE_PREFIX_3 "No one is available to answer at this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
}
*to = 0;
return NULL;
@@ -479,91 +597,9 @@
}
if (c != winner)
continue;
+ /* here, o->chan == c == winner */
if (!ast_strlen_zero(c->call_forward)) {
- char tmpchan[256];
- char *stuff;
- char *tech;
- int cause;
-
- ast_copy_string(tmpchan, c->call_forward, sizeof(tmpchan));
- if ((stuff = strchr(tmpchan, '/'))) {
- *stuff++ = '\0';
- tech = tmpchan;
- } else {
- const char *forward_context = pbx_builtin_getvar_helper(c, "FORWARD_CONTEXT");
- snprintf(tmpchan, sizeof(tmpchan), "%s@%s", c->call_forward, forward_context ? forward_context : c->context);
- stuff = tmpchan;
- tech = "Local";
- }
- /* Before processing channel, go ahead and check for forwarding */
- o->forwards++;
- if (o->forwards < AST_MAX_FORWARDS) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
- /* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */
- if (ast_test_flag(peerflags, OPT_IGNORE_FORWARDING)) {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
- c = o->chan = NULL;
- cause = AST_CAUSE_BUSY;
- } else {
- /* Setup parameters */
- c = o->chan = ast_request(tech, in->nativeformats, stuff, &cause);
- if (!c)
- ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
- else
- ast_channel_inherit_variables(in, o->chan);
- }
- } else {
- if (option_verbose > 2)
- ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", c->name);
- cause = AST_CAUSE_CONGESTION;
- c = o->chan = NULL;
- }
- if (!c) {
- ast_clear_flag(o, DIAL_STILLGOING);
- HANDLE_CAUSE(cause, in);
- } else {
- ast_rtp_make_compatible(c, in, single);
- if (c->cid.cid_num)
- free(c->cid.cid_num);
- c->cid.cid_num = NULL;
- if (c->cid.cid_name)
- free(c->cid.cid_name);
- c->cid.cid_name = NULL;
-
- if (ast_test_flag(o, OPT_FORCECLID)) {
- c->cid.cid_num = ast_strdup(S_OR(in->macroexten, in->exten));
[... 10469 lines stripped ...]
More information about the svn-commits
mailing list