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
7ecc442d77
more NULL "" equivalence in cid fields.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-21 11:02:28 +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
Russell Bryant
501ac5189c
update res_odbc to support pooled connections
...
(from tilghman's developer branch, res_odbc_rewrite)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-18 18:16:32 +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
Tilghman Lesher
5bcdea5102
Merged revisions 20966 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r20966 | tilghman | 2006-04-17 12:00:16 -0500 (Mon, 17 Apr 2006) | 2 lines
Bug 6544 - when we remove a music class, the thread servicing it should die
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21002 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-17 17:17:41 +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
Joshua Colp
4657dc770c
We are shaking up trunk tonight! allow data dir to be specified (issue #6967 reported by tzafrir)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20330 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-15 22:53:53 +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
62712ea668
constification and code simplifications
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20165 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-14 22:02:19 +00:00
Luigi Rizzo
6d574f36ca
partial fix of the module API to use the new method.
...
Still not complete as we need to take care of the usecount stuff.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-14 19:35:37 +00:00
Luigi Rizzo
8d98d44e82
fix another svn merge bug
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-14 18:45:08 +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
Joshua Colp
5e43f18529
Updates to speech recognition API and dialplan utilities. Moved to using dialplan functions, and some other misc things.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-13 00:18:52 +00:00
Luigi Rizzo
7507309732
normalize code in preparation to module changes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19189 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-11 10:01:00 +00:00
Joshua Colp
e4811a8248
Presenting a revised data stores and oh my, a generic speech recognition API! I wonder what we can do with this now...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 23:29:50 +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
Russell Bryant
f7c5aee2ad
remove a couple more unnecessary "out of memory" error messages
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 02:19:58 +00:00
Russell Bryant
7878538953
use ast_*alloc and don't create duplicated error messages.
...
... as stated in the coding guidelines.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 02:15:47 +00:00
Russell Bryant
9a5c7c75a3
Instead of using strncpy, use ast_copy_string. Also, in the case of copying a
...
constant string into a buffer that we know is big enough, don't use a length
limited copy at all, use strcpy.
... as stated in the coding guidelines.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18721 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 02:05:59 +00:00
Russell Bryant
d13bc3fc83
run the module through indent to fix the formatting issues that violate the
...
coding guidelines
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 02:01:39 +00:00
Russell Bryant
d203e9c6c0
add back braces that were removed in a recent commit that leave a bunch of
...
nested statements in a block without branches, which is a violation of the
coding guidelines.
As a matter of fact, this module violates the coding guidelines in multiple
ways that including formatting and code issues. In my opinion, this module
should not have been merged into the trunk in this form.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-10 01:51:47 +00:00
Olle Johansson
70f18e5f31
Issue 6917 - some cleanups for res_config_pgsql.c (mithraen)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-09 18:57:25 +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
Russell Bryant
af2609dfbe
fix bug in smdi config parsing (issue #6908 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18493 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-08 19:16:38 +00:00
Olle Johansson
7089dc1341
Issue #6899 - remove OSP support code from chan_sip.c and app_dial.c
...
- implement all functions through internal APIs in res_osp.c and app_osplookup.c
(homesick)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-07 19:11:22 +00:00
Luigi Rizzo
c3249e2cb4
normalize repeated instances of code as follows:
...
- if (res >= 0)
- return RESULT_SUCCESS;
- else
- return RESULT_FAILURE;
+ return (res >= 0) ? RESULT_SUCCESS : RESULT_FAILURE;
(we should probably create a macro for this,
#define RET(r) ((r) >= 0) ? RESULT_SUCCESS : RESULT_FAILURE)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17899 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-06 16:17:04 +00:00
Luigi Rizzo
e5d48fd45f
use the new module interface for this module, but make it
...
of type MOD_0 as it exports symbols so it should be loaded as RTLD_GLOBAL.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17860 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-06 15:10:29 +00:00
Olle Johansson
d75fed39ca
Issue #6893 - Compiler warnings for PostgreSQL ARA driver
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-06 06:55:38 +00:00
Joshua Colp
1001cc0656
Unbreak res/Makefile (issue #6891 as reported by casper)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-05 18:37:29 +00:00
Olle Johansson
ef6b50b706
Issue #5637 - Realtime driver for PostgreSQL (mguesdon)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-05 17:46:09 +00:00
Tilghman Lesher
756c7cbb12
Bug 6873 - Finish moving from the non-threadsafe (and poor randomness) rand() to threadsafe ast_random()
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-05 17:44:44 +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
Joshua Colp
bf7f1ec0f8
Merged revisions 16534 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16534 | file | 2006-03-30 13:55:28 -0400 (Thu, 30 Mar 2006) | 2 lines
Do not exceed the array size for maximum allowed moh files. (issue #6842 )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-30 17:58:16 +00:00