Luigi Rizzo [Fri, 21 Apr 2006 09:54:23 +0000 (09:54 +0000)]
Replace three replicas of the same code with a function.
Consider NULL and "" as equivalent in cid strings.
On passing, also remove an extra data copy.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21786
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Thu, 20 Apr 2006 17:39:44 +0000 (17:39 +0000)]
comment that for callerid field, NULL and "" should be considered
equivalent (the reason is, when passing these strings through a
statically allocated buffer, we have no way to tell between NULL and ""
so we would be unable to preserve the difference, if any).
No code changes yet.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21743
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 19 Apr 2006 23:49:36 +0000 (23:49 +0000)]
Clarify result of sipsock_read
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21707
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 19 Apr 2006 22:32:07 +0000 (22:32 +0000)]
add the malloc attribute to the memory allocation wrappers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21681
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 19 Apr 2006 21:11:31 +0000 (21:11 +0000)]
Merged revisions 21638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r21638 | kpfleming | 2006-04-19 16:10:41 -0500 (Wed, 19 Apr 2006) | 2 lines
support system-specific scripts in safe_asterisk, before starting Asterisk proper
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21639
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 19 Apr 2006 18:56:38 +0000 (18:56 +0000)]
Merged revisions 21597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r21597 | tilghman | 2006-04-19 13:43:17 -0500 (Wed, 19 Apr 2006) | 2 lines
Bug 6553 - plug memory leaks when ODBC connection is down
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21600
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 19 Apr 2006 18:50:51 +0000 (18:50 +0000)]
Oops, wasn't revised the way I thought it was
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21599
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 19 Apr 2006 18:44:58 +0000 (18:44 +0000)]
Blocked revisions 21597 via svnmerge
........
r21597 | tilghman | 2006-04-19 13:43:17 -0500 (Wed, 19 Apr 2006) | 2 lines
Bug 6553 - plug memory leaks when ODBC connection is down
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21598
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 18:15:20 +0000 (18:15 +0000)]
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
Luigi Rizzo [Wed, 19 Apr 2006 18:07:19 +0000 (18:07 +0000)]
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
Luigi Rizzo [Wed, 19 Apr 2006 18:00:32 +0000 (18:00 +0000)]
fix indentation of a large block
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21572
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 17:58:07 +0000 (17:58 +0000)]
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
Luigi Rizzo [Wed, 19 Apr 2006 17:29:15 +0000 (17:29 +0000)]
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
Luigi Rizzo [Wed, 19 Apr 2006 16:54:04 +0000 (16:54 +0000)]
more localization and variable removal
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21538
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 16:36:15 +0000 (16:36 +0000)]
more localization of variables
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21537
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 16:19:52 +0000 (16:19 +0000)]
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
Luigi Rizzo [Wed, 19 Apr 2006 16:10:11 +0000 (16:10 +0000)]
localize some variables
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21535
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 15:15:03 +0000 (15:15 +0000)]
extract a common condition.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21508
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 14:53:18 +0000 (14:53 +0000)]
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
Luigi Rizzo [Wed, 19 Apr 2006 14:50:17 +0000 (14:50 +0000)]
more simplifications - use a local variable c instead of o->chan,
use S_OR as appropriate.
Still need to fix the indentation of some blocks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21480
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 14:14:40 +0000 (14:14 +0000)]
more simplifications
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21479
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 14:02:49 +0000 (14:02 +0000)]
start cleaning up this code so we can split the 900 lines function
into manageable chunks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21468
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 13:59:34 +0000 (13:59 +0000)]
support 'languageprefix' in asterisk.conf to modify the algorithm
to build pathnames for language-specific files (see file.c for
a description)
Default, of course, to the standard behaviour.
We don't have an asterisk.conf.sample to put an example of use!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21451
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 10:27:31 +0000 (10:27 +0000)]
add experimental code for new-style "say" application.
The rules for spelling out numbers and dates are in the config
file "say.conf", which can be edited to implement national
or even local language rules.
The new code can be enabled through the cli command
'say load new'
while the old code can be restored with
'say load old'
Eventually, this code should go to a better place,
but for the time being we keep here as it provides
very similar functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21421
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 10:21:58 +0000 (10:21 +0000)]
add example syntax for new-style number and date spelling
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21420
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 09:31:41 +0000 (09:31 +0000)]
one more client for find_context_locked(),
plus a few minor fixes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21393
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 09:18:30 +0000 (09:18 +0000)]
use a function, set_ext_pri(), to assign extension and priority.
On passing, fix a bug in __ast_pbx_run() where the wrong priority
was used in a call to ast_exists_extension() (see comment in the code).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21392
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 08:52:15 +0000 (08:52 +0000)]
replace repeated code to walk contexts with a function,
find_context_locked()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21365
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 07:23:22 +0000 (07:23 +0000)]
move to a different file (channel.c for the time being) the
wrappers around the basic 'say' functions, and redeclare these
wrappers as ordinary functions rather than function pointers.
This way, alternative implementations of the 'say' functions
will only have to implement the basic functions and not the
wrappers.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21338
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 19 Apr 2006 06:58:20 +0000 (06:58 +0000)]
- use ast_calloc instead of ast_malloc
- use ast_channel_lock/unlock in a few places
- comment some dubious pieces of code
- use memset to zero a buffer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21311
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 19 Apr 2006 00:45:37 +0000 (00:45 +0000)]
Add reference to RFC for mailbox notification
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21277
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 19 Apr 2006 00:04:03 +0000 (00:04 +0000)]
Cosmetic fixes to code...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21262
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 18 Apr 2006 23:50:59 +0000 (23:50 +0000)]
fix obvious breakage
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21239
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 18 Apr 2006 23:25:22 +0000 (23:25 +0000)]
doh! don't double-increment the bracket count for embedded references
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21236
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 18 Apr 2006 23:24:02 +0000 (23:24 +0000)]
don't ignore left-curly-braces when searching for the end of a variable/function reference; match them up with right-curly-braces so we choose the proper brace to end the reference (will still fail to parse properly if the reference contains unbalanced braces)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21235
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 18 Apr 2006 21:39:20 +0000 (21:39 +0000)]
correct array index calculation (thanks mtaht3!)
update header file comments to reflect new usage of structure field
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21207
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 18 Apr 2006 18:16:32 +0000 (18:16 +0000)]
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
Olle Johansson [Tue, 18 Apr 2006 15:09:01 +0000 (15:09 +0000)]
- call parking improvements (part of the siptransfer branch)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21157
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 18 Apr 2006 14:50:30 +0000 (14:50 +0000)]
Implement somewhat improved support for 481 Call leg does not exist responses...
- There are some questions on what to do here, but it is a first step.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21131
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 18 Apr 2006 14:43:32 +0000 (14:43 +0000)]
Do not depend on having an end sound for stopping the bridge when time runs out. (issue #6979 reported by ppyy)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21130
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 18 Apr 2006 14:41:57 +0000 (14:41 +0000)]
Clean up handle_response_peerpoke
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21129
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 18 Apr 2006 14:37:54 +0000 (14:37 +0000)]
Change sip show channels to include refer status
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21128
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 18 Apr 2006 14:35:15 +0000 (14:35 +0000)]
- Deallocate refer structure at sip_destroy time
- Implement new sip_transfer() function
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21127
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 18 Apr 2006 14:23:14 +0000 (14:23 +0000)]
simplify logic in iax2_bridge()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21126
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 18 Apr 2006 13:37:07 +0000 (13:37 +0000)]
simplify logic in various functions, remove unnecessary variables
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21099
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 18 Apr 2006 13:17:44 +0000 (13:17 +0000)]
remove a line that was added by mistake
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21098
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 18 Apr 2006 13:05:48 +0000 (13:05 +0000)]
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
Olle Johansson [Tue, 18 Apr 2006 07:03:36 +0000 (07:03 +0000)]
It's critical that we get an ACK on a 200 OK to an INVITE. If we do not get the ACK,
tear down the call. (Discovered at SIPit18)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21061
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 18 Apr 2006 07:00:27 +0000 (07:00 +0000)]
use XMIT_RELIABLE ...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21043
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 18 Apr 2006 06:40:01 +0000 (06:40 +0000)]
- Move subscribeuri away from refer-to, since refer-to is moving away from sip_pvt
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21039
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 18 Apr 2006 06:29:30 +0000 (06:29 +0000)]
Merged revisions 21037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r21037 | tilghman | 2006-04-18 01:26:04 -0500 (Tue, 18 Apr 2006) | 2 lines
Bug 6984 - off by one error in Random()
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21038
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 17 Apr 2006 17:17:41 +0000 (17:17 +0000)]
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
Kevin P. Fleming [Mon, 17 Apr 2006 16:43:55 +0000 (16:43 +0000)]
actually return the number steps... not the number of steps minus 1
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20964
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Mon, 17 Apr 2006 16:42:21 +0000 (16:42 +0000)]
more module loader related fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20963
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Mon, 17 Apr 2006 16:42:03 +0000 (16:42 +0000)]
add an API so that the number of steps required for a translation path can be acquired
don't transcode via SLINEAR when the option is enabled but there is a direct path from the source to the destination
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20962
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 14:22:16 +0000 (14:22 +0000)]
Set timeout timers to Timer A and F in rfc 3261, section 17
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20932
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 14:07:50 +0000 (14:07 +0000)]
Change transmit_invite(). SIP Transfers are now broken officially, while
waiting for the rest of the patches... This is the dev branch, after all.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20931
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 14:00:44 +0000 (14:00 +0000)]
- Add supported header
- Send cause codes as well
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20908
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 13:52:53 +0000 (13:52 +0000)]
Add more history on masqs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20903
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 13:47:30 +0000 (13:47 +0000)]
- Implementing the new SIP transfer data structure
- Changing SIP call to support sending INVITEs as part of call transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20902
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 13:22:31 +0000 (13:22 +0000)]
- Documentation update
- Formatting change
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20901
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 13:08:24 +0000 (13:08 +0000)]
Documentation update
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20900
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 09:21:56 +0000 (09:21 +0000)]
Remove ignore from handle_respons_refer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20872
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 08:15:38 +0000 (08:15 +0000)]
Clean up handle_response_invite
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20844
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 05:32:22 +0000 (05:32 +0000)]
- Drop too bad SIP requests in order to avoid some UDP misuse (hello Edwin)
- Clean up initialization of initatial request initialization
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20816
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 17 Apr 2006 04:31:21 +0000 (04:31 +0000)]
- 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
North Antara [Mon, 17 Apr 2006 01:17:03 +0000 (01:17 +0000)]
whitespace and spelling (recieve instead of receive) fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20759
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 23:05:42 +0000 (23:05 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 22:46:00 +0000 (22:46 +0000)]
more usages of stream_and_wait
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20707
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 22:22:53 +0000 (22:22 +0000)]
more usages of function 'finishup()'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20705
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 22:02:30 +0000 (22:02 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 21:57:02 +0000 (21:57 +0000)]
simplify a couple of functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20679
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 21:41:06 +0000 (21:41 +0000)]
more replaceemnt of dup code with functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20678
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 20:32:14 +0000 (20:32 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 20:09:01 +0000 (20:09 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 19:56:08 +0000 (19:56 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 19:41:12 +0000 (19:41 +0000)]
s/pu->chan/chan in a few places;
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20626
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 19:26:57 +0000 (19:26 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 19:12:51 +0000 (19:12 +0000)]
properly reindent a large block.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20624
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 19:05:19 +0000 (19:05 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 18:49:46 +0000 (18:49 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 18:37:01 +0000 (18:37 +0000)]
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
Luigi Rizzo [Sun, 16 Apr 2006 18:10:10 +0000 (18:10 +0000)]
minor formatting fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20596
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 17:59:37 +0000 (17:59 +0000)]
move some duplicated code outside an if/then/else block
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20570
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 17:41:05 +0000 (17:41 +0000)]
make sure there is [almost] only a single exit point for a very long
function so the flow is easier to follow.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20569
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 16:58:56 +0000 (16:58 +0000)]
simplify the ast_channel walking routines.
(the previous version was mine, but this way it is definitely
more readable).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20543
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 16:04:24 +0000 (16:04 +0000)]
move common conditions to the outside block.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20540
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 15:51:53 +0000 (15:51 +0000)]
simplify logic in ast_generic_bridge()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20514
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 15:27:58 +0000 (15:27 +0000)]
move common code in one place
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20513
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 15:22:13 +0000 (15:22 +0000)]
avoid returning in the middle of a switch() in ast_answer()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20512
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 15:13:39 +0000 (15:13 +0000)]
simplify function __ast_request_and_dial() as follows:
- handle immediately failures in ast_request();
This removes the need for checking 'chan' multiple times afterwards.
- handle immediately failures in ast_call(), by moving the one-line
case at the top of the 'if' statement;
- use ast_strlen_zero in several places instead of expanding it inline;
- make outstate always a valid pointer;
On passing mark an unclear statement and replace a magic number
with sizeof(tmp).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20511
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 14:14:16 +0000 (14:14 +0000)]
properly reindent a block
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20484
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 14:03:43 +0000 (14:03 +0000)]
add a missing ast_channel_unlock() evidenced by previous commits.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20477
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 14:00:17 +0000 (14:00 +0000)]
remove an extra lock.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20456
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 13:58:43 +0000 (13:58 +0000)]
- replace some nested 'if' with '&&'
- bring the short case at the top of an 'if' statement
(also fix misformatting)
- replace several 'if' with the '?' operator;
- invert the condition on an 'if' to reduce the nesting depth
(reindentation to be done later).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20454
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 13:27:58 +0000 (13:27 +0000)]
Localize some variables documenting their usage.
Comment a possible problem with locking.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20453
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 16 Apr 2006 12:57:15 +0000 (12:57 +0000)]
- Fixes to ast_channel_lock functions
- New get_sip_pvt_byid function (not really used correctly yet...)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20424
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 08:01:10 +0000 (08:01 +0000)]
localize some variables, add some comments.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20396
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 16 Apr 2006 07:53:25 +0000 (07:53 +0000)]
implement ast_waitfordigit() and ast_readstring() in terms
of their '_full()' version, so we can remove the replicated
implementation and, especially, the risk that they get out of sync.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20389
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 15 Apr 2006 23:37:29 +0000 (23:37 +0000)]
Move a bit more stuff over to the datadir (issue #6967 reported by tzafrir patch by north)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20358
65c4cc65-6c06-0410-ace0-
fbb531ad65f3