Commit Graph

182 Commits

Author SHA1 Message Date
Luigi Rizzo
7e0d402e88 move wait_and_stream to ast_wait_and_stream() because equivalent
code is replicated in way too many places not to have a global
function for that.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-21 20:28:32 +00:00
Luigi Rizzo
23c6d5eff8 comment a possible memory leak
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-21 16:18:12 +00:00
Luigi Rizzo
6553aa3a36 merge some common code into a function
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-21 16:04:25 +00:00
Luigi Rizzo
4cef4ef720 more NULL / "" equivalence for CID fields.
Mark an inconsistency in empty string handling.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-21 10:47:07 +00:00
Luigi Rizzo
51743a4aea simplify the flow of builtin_atxfer().
There is still a lot of similarity with builtin_blindtransfer()
which should be removed by definining functions for the common
pieces of code (eg in the first part).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21097 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-18 13:05:48 +00:00
Olle Johansson
39b530f4d6 - Doxygen formatting
Please place a Doxygen todo marker before things that needs to be checked up later
  by someone - it's like /*! \todo We really need to implement this in C++ */

- option_debug checking before logging to DEBUG channel


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-17 04:31:21 +00:00
Luigi Rizzo
b7e36b50cc preparation for reduction of the nesting of a large function
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 23:05:42 +00:00
Luigi Rizzo
7cb4a9df38 more usages of stream_and_wait
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 22:46:00 +00:00
Luigi Rizzo
db107f93e1 more usages of function 'finishup()'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 22:22:53 +00:00
Luigi Rizzo
2c7b77814c one more instance of stream_and_wait, and remove an extra
'error = 1' line put in by miustake



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 22:02:30 +00:00
Luigi Rizzo
6e6315099c more replaceemnt of dup code with functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 21:41:06 +00:00
Luigi Rizzo
ed8f2e43f6 localize several variables, and simplify the last part of park_exec()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 20:32:14 +00:00
Luigi Rizzo
3e20f8d75d more formatting cleanup including removal of a useless check
for f == NULL



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 20:09:01 +00:00
Luigi Rizzo
09a1511672 rename a variable same as used in a very similar function,
to reduce code differences.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 19:56:08 +00:00
Luigi Rizzo
4ca8c0fc8d s/pu->chan/chan in a few places;
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 19:41:12 +00:00
Luigi Rizzo
36ea51ecd7 put some common code into functions (still more instances to be replaced)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 19:26:57 +00:00
Luigi Rizzo
70109abc39 properly reindent a large block.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 19:12:51 +00:00
Luigi Rizzo
e304a986fd more readability fixes - localize some variables and invert
a condition in an 'if' statement to reduce the nesting depth.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 19:05:19 +00:00
Luigi Rizzo
d29f8a677e introduce a function to set context, extension and priority
replacing some common blocks of code (there are still a few
instances where it can be used)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 18:49:46 +00:00
Luigi Rizzo
81ed862e67 minor readability fixes in preparation for more work on this file:
- replace nested 'if' with '&&'
- fix indentation
- annotate the end brace of some huge block
- remove useless parentheses



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20597 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-16 18:37:01 +00:00
Luigi Rizzo
e42087f5e3 - normalize for() loops to navigate through variables,
removing replicated var = var->next;
- remove a potential infinite loop and document the problem
- remove useless checks and document why
- mark XXX a possible bug (to be investigated)
- use ast_strlen_zero() instead of expanding it inline
- fix indentation in one place   
- replace a nested 'if' with '&&'



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-15 00:05:08 +00:00
Luigi Rizzo
d043954dc1 - remove some unnecessary casts and braces;
- add braces around a nested 'if'
- use S_OR and '?' to remove some duplicated function calls;
- replace nested 'if' with &&
- move out a common term in a sequence of 'if'
- add a comment on a potentially dangerous string manipulation



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-14 23:20:29 +00:00
Luigi Rizzo
e43bc6634d This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h,
modules are now expected to return all of their methods and flags
into a structure 'mod_data', and are normally loaded with RTLD_NOW
| RTLD_LOCAL, so symbols are resolved immediately and conflicts
should be less likely.  Only in a small number of cases (res_*,
typically) modules are loaded RTLD_GLOBAL, so they can export
symbols.
 
The core of the change is only the two files loader.c and
include/asterisk/module.h, all the rest is simply adaptation of the
existing modules to the new API, a rather mechanical (but believe
me, time and finger-consuming!) process whose detail you can figure
out by svn diff'ing any single module.

Expect some minor compilation issue after this change, please
report it on mantis http://bugs.digium.com/view.php?id=6968
so we collect all the feedback in one place.

I am just sorry that this change missed SVN version number 20000!



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-14 14:08:19 +00:00
BJ Weschke
70e407c5be Merged revisions 18866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r18866 | bweschke | 2006-04-10 12:29:51 -0500 (Mon, 10 Apr 2006) | 2 lines

 Don't say that we can pass an 'exten' argument in the documentation of Park() when we really cannot. #6902 (opsys)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 17:32:29 +00:00
Kevin P. Fleming
699f55071b a few cleanups from the last commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-08 22:16:34 +00:00
Kevin P. Fleming
f10f427d49 since the module API is changing, it's a good time to const-ify the description() and key() return values
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18552 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-08 22:01:19 +00:00
Luigi Rizzo
6c232811c0 as discussed with Mark a few weeks ago, the 'newstack' argument
in pbx_exec is always 1 so it can be removed.

This change also takes away ast_exec_extension(), and lets all
switch functions (exists, canmatch, exec, matchmore) all use the same
prototype, which makes the code a bit cleaner.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-30 21:29:39 +00:00
Olle Johansson
dfc9952986 Set default value of adsipark (import from 1.2)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-30 01:35:56 +00:00
Mark Spencer
9164eac21a Add micro-http server and abstract manager interface, make snmp not die
on reload.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-25 23:50:09 +00:00
Joshua Colp
539f8a6502 Merged revisions 14523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r14523 | file | 2006-03-23 17:51:50 -0400 (Thu, 23 Mar 2006) | 2 lines

Issue #6764 - Return BUSY signal when other party is busy at Attended Transfer (Reported by mnachev)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@14525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-23 22:00:11 +00:00
Russell Bryant
d56674b341 Merged revisions 13961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r13961 | russell | 2006-03-21 13:21:47 -0500 (Tue, 21 Mar 2006) | 3 lines

fix crash when using the ParkAndAnnounce application.  When using this application,
there will be no peer channel to play the parking announcement to. (issue #6756)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@13962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-21 18:22:38 +00:00
Olle Johansson
b4a0e2a8bb - Formatting fix in musiconhold
- One extra doxygen comment in res_features


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-14 07:09:57 +00:00
Tilghman Lesher
34f64d0891 Bug 6304 - Add Park command to the manager interface
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-06 23:12:48 +00:00
Kevin P. Fleming
6204abdae2 merge rizzo's patch to make compiler warnings stop the build, and fix a bunch of warnings found
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-22 22:53:49 +00:00
Russell Bryant
a0d438fb6c remove the uses of the deprecated STANDARD_LOCAL_USER
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-15 20:11:56 +00:00
Kevin P. Fleming
a16ae226b6 use string fields for some stuff in ast_channel
const-ify some more APIs
remove 'type' field from ast_channel, in favor of the one in the channel's tech structure
allow string field module users to specify the 'chunk size' for pool allocations
update chan_alsa to be compatible with recent const-ification patches


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@9060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-01 23:05:28 +00:00
Russell Bryant
efae38a82d - conversions to allocation wrappers
- replace malloc/memset with ast_calloc
- replace malloc/ast_copy_string with ast_strdup
(based on patch from issue #6299)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-21 22:09:06 +00:00
Olle Johansson
45c8956e0f Doxygen fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-19 22:09:18 +00:00
Kevin P. Fleming
065a368463 remove some more deprecated (pre-1.2) stuff
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8157 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-17 23:45:05 +00:00
Matthew Fredrickson
540175d9c7 Check to see if arg is NULL before passing (#6094)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8133 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-17 18:20:33 +00:00
Olle Johansson
725155b854 Doxygen update
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-09 09:07:58 +00:00
Matt O'Gorman
353e5f1dc9 added small feature from bug 5682 with one typo fix.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-08 00:25:31 +00:00
Tilghman Lesher
a0ba6e7084 Merged revisions 7823 via svnmerge from
/branches/1.2


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7824 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-05 23:08:55 +00:00
Olle Johansson
80dd03e865 Fix copyright for touched file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-05 09:12:33 +00:00
Olle Johansson
223c0c303a Merged revisions 7795 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7795 | oej | 2006-01-04 22:46:40 +0100 (Wed, 04 Jan 2006) | 2 lines

Issue #5980: Removing extra CR+LF in manager events - needs port to trunk

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-01-04 21:52:35 +00:00
Russell Bryant
a725468381 update doxygen docs to specify authors
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-12-30 21:18:06 +00:00
Russell Bryant
f49974f314 add a header to indicate who the call was parked by to the ParkedCall manager
events generated when parking status is requested.  This header was already
in the events that are generated when the call is first parked. (issue #5883)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-12-21 08:51:44 +00:00
Josh Roberson
97c8d0dbfc Allow retrieval of generated filename from one touch monitor feature.
Adds new variable TOUCH_MONITOR_OUTPUT to both legs on completion.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-12-08 18:18:59 +00:00
Tilghman Lesher
870f98f02d Bug 5858 - Make the chanvars.c functions return a 'const char *'
This should prevent us from unintentionally changing variable
values when they're returned from pbx_builtin_getvar_helper.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-12-03 19:25:33 +00:00
Kevin P. Fleming
2c65582b66 remove extraneous svn:executable properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:24:39 +00:00