kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 03:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,340 Commits 150 Branches 1,597 Tags
ada839f3eea0fbc12c47f693dc3f8bc4bafac0ee
Commit Graph

373 Commits

Author SHA1 Message Date
Luigi Rizzo
bbba4e5a20 better fix for the previous bug. 
In general this code needs a deep revision, because the body of
do_forward() deletes/overwrites the output channel without freeing
the resouce in some cases, and without notifying the caller.

Also, on FreeBSD with MALLOC_OPTIONS set i am seeing various panics
(duplicate freee etc.)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47881 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-21 11:53:06 +00:00
Luigi Rizzo
64a9c28c3b do not ast_hangup() on a NULL channel. 
In the original code this would happen in the case of
	o->forwards >=  AST_MAX_FORWARDS

Likely an 1.2/1.4 isse as well - please someone have a look,
while I am hunting a few more similar panics now.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47880 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-21 11:07:30 +00:00
Joshua Colp
af51be05a6 Merged revisions 47850 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47850 | file | 2006-11-20 10:51:37 -0500 (Mon, 20 Nov 2006) | 2 lines

Use a separate variable in the channel structure to store the context that the channel was dialed from. (issue #8382 reported by jiddings)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-20 15:55:58 +00:00
Jason Parker
938c4bdc29 Merged revisions 47782 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47782 | qwell | 2006-11-16 17:19:46 -0600 (Thu, 16 Nov 2006) | 2 lines

Fix a couple of typos.  Initially pointed out by mrobinson.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-16 23:20:52 +00:00
Joshua Colp
a8ef79fa6f Make local copy of arguments to parse. (issue #8362 reported by homesick) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-14 20:09:10 +00:00
Luigi Rizzo
8b3fe4556c 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.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47189 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-04 11:00:49 +00:00
Luigi Rizzo
a55ca0d6ec fix indentation of a block, and do minor simplifications at the end of 
another one.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47182 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-04 01:16:20 +00:00
Luigi Rizzo
0f58d97707 complete previous commit. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-04 00:56:02 +00:00
Luigi Rizzo
01ec7d63d9 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.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-04 00:50:18 +00:00
Luigi Rizzo
1385b6f047 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).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47179 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-04 00:01:40 +00:00
Luigi Rizzo
ab4f699065 another small set of simplifications 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-03 23:24:21 +00:00
Luigi Rizzo
acf5e87b0f change HANDLE_CAUSE into a function. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-03 22:36:17 +00:00
Luigi Rizzo
c3a6bbddb8 remove redundant checks 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47170 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-03 22:01:34 +00:00
Luigi Rizzo
534da0ecfd start integrating the simplifications proposed in bug 0005860, 
as usual a bit at a time to ease locating new bugs or fixes
worth merging into other branches.

In this commit, introduce a macro, S_REPLACE, that replaces
a string possibly freeing the previous value.
In one of these places (see the comment marked XXX) the previous
code might leak memory - if so, this ought to be merged in 1.4

The macro might be worth putting in one of the global headers
(e.g. include/asterisk/strings.h) as the construct is used
in a million places in the asterisk code.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-03 21:51:16 +00:00
Steve Murphy
6d81c47801 These changes submitted by moy via bug 6992, to add a Dial 'End' event to asterisk. I include some changes to astman to cover other events that have been added. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-30 23:11:55 +00:00
Joshua Colp
1e3c5bc5ba Inherit the context and extension until the channel is answered 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-13 21:20:18 +00:00
Matt O'Gorman
ae8cc3e18b bug #8076 check option_debug before printing to debug channel. 
patch provided in bugnote, with minor changes.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44253 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-03 15:53:07 +00:00
Joshua Colp
3e4a081e1c Make callerid fields in Manager events more consistent. CallerIDNum for number and CallerIDName for name. (issue #7976 reported by suhler) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-10-02 20:35:16 +00:00
Joshua Colp
1c764935f2 SS7 marked the start of an open season for trunk again but here's something minor - abstract early bridging into the technology so that we don't always assume they use RTP and try it. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-21 19:27:26 +00:00
Matt O'Gorman
d0a1a0033d similar patch for verbose vs debug with minor changes 
bug 2617


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-19 16:23:45 +00:00
Steve Murphy
7c9b6e1d29 These small app documentation changes to app_dial and app_read will hopefully avert any more 7544 type bug reports\! 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-06 17:14:50 +00:00
Kevin P. Fleming
0a27d8bfe5 merge new_loader_completion branch, including (at least): 
- restructured build tree and makefiles to eliminate recursion problems
  - support for embedded modules
  - support for static builds
  - simpler cross-compilation support
  - simpler module/loader interface (no exported symbols)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-21 02:11:39 +00:00
Russell Bryant
774bba093b Merged revisions 38928 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38928 | russell | 2006-08-05 02:37:59 -0400 (Sat, 05 Aug 2006) | 3 lines

make sure the priv-callerintros directory exists before trying to create a file
there (issue #7659, patch by hads, with some modifications by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@38929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-05 06:39:43 +00:00
Kevin P. Fleming
6d0742fc16 merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-19 20:44:39 +00:00
Mark Spencer
4c90cf59b7 Support hold/unhold in Zap, update IAX2 parser to know about modern commands, forward hold/unhold in dial, add hold device state 
and implement holding in the SLA.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-08 02:24:07 +00:00
BJ Weschke
2e8a142c85 Don't ast_request a channel structure twice when a call is being forwarded. (#7362 - twlison / vechers confirming fix) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-16 12:18:18 +00:00
Joshua Colp
a23af6559c Merged revisions 33294 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33294 | file | 2006-06-09 15:08:00 -0300 (Fri, 09 Jun 2006) | 2 lines

Handle hangup during recording of screened name (issue #7304 reported by kulldominique)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-09 18:12:46 +00:00
Olle Johansson
9f5aa13142 Rename ast_rtp_early_media to ast_rtp_early_bridge to avoid confusion. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-09 09:47:44 +00:00
Kevin P. Fleming
472c1ca282 simplify autoconfig include mechanism (make tholo happy he can use lint again :-) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-06-07 18:54:56 +00:00
Kevin P. Fleming
7f3cc8b886 cleanups for commit from issue #5657... set a cause code for a rejected forward request, and actually set tmp->chan to NULL when we reject the forward request 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-31 16:11:55 +00:00
BJ Weschke
871f08ec07 Add an option to app_dial, 'i', to instruct the application ignore any requests from peers to forward calls elsewhere. #5657 (johnlange w/some minor mods) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-31 15:52:32 +00:00
Joshua Colp
91f9966be3 Merge branch for bug 6264 (Privacy option 2 returns dial-status ANSWER / option_priority_jumping not respected) (reported by jkoopmann and branch by murf) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-24 20:00:10 +00:00
BJ Weschke
5235890be4 This is part 2/2 of the patches for #7090. Adds one-step call parking to /trunk via builtin functions and 'k' 'K' application options added to app_dial. This also resolves #6340. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-22 16:43:43 +00:00
Joshua Colp
d2da48b156 Inherit channel variables when call forwarding through chan_local (issue #7095 reported by raarts) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@27595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-16 23:39:29 +00:00
Russell Bryant
04ecb29d03 remove almost all of the checks of the result from ast_strdupa() or alloca(). 
As it turns out, all of these checks were useless, because alloca will never
return NULL.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-10 13:22:15 +00:00
Mark Spencer
9953f4f40e Make SIP early media work more efficiently without so many reinvites 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-09 11:44:50 +00:00
BJ Weschke
bdf2a05aa5 Merged revisions 24567 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r24567 | bweschke | 2006-05-03 15:58:10 -0500 (Wed, 03 May 2006) | 3 lines

 Correct application documentation to make users aware that certain options cannot be used in conjunction with others. #6666 (chotaire) 


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24604 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-03 21:11:23 +00:00
Jim Dixon
a83297d85f Added "Operator Services" connection mode for Zap channels, and the 'O' option 
in app_dial to support the use of this mode.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22128 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-22 11:30:06 +00:00
Luigi Rizzo
965ff42bed more NULL "" equivalence in CID fields. 
Mark a potentially missing item in managerevent



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-21 10:41:13 +00:00
Luigi Rizzo
b9f3e4e0f3 move a replicated block of code in the one place where it belongs. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 18:15:20 +00:00
Luigi Rizzo
bd01d66909 merge two nested 'if' which are really a single block. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 18:07:19 +00:00
Luigi Rizzo
9476cb356e fix indentation of a large block 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 18:00:32 +00:00
Luigi Rizzo
501c9e181c start sorting out the duplicated code in the privacy handler 
for future removal



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21568 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 17:58:07 +00:00
Luigi Rizzo
b3343aecdf merge two nested 'if' which are really a single block. 
(indentation still to be fixed)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 17:29:15 +00:00
Luigi Rizzo
73f2d344fb more localization and variable removal 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 16:54:04 +00:00
Luigi Rizzo
c9f669e56d more localization of variables 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 16:36:15 +00:00
Luigi Rizzo
c6a8784e95 localize one more variable; 
use ast_strdup as it can handle the NULL argument well.
mark a dubious piece of code with XXX



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 16:19:52 +00:00
Luigi Rizzo
0f4a1bc9ac localize some variables 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 16:10:11 +00:00
Luigi Rizzo
2bdcaa4849 extract a common condition. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21508 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 15:15:03 +00:00
Luigi Rizzo
25eb0525d9 fix indentation of some large blocks after previous changes 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-19 14:53:18 +00:00