Commit Graph

1308 Commits

Author SHA1 Message Date
Luigi Rizzo
250ad2ad7e fix indentation of a large block after changes in previous commit
(basically whitespace only).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45161 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 06:55:14 +00:00
Luigi Rizzo
9146e44403 simplify string parsing routines using ast_skip_*() functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-16 06:30:51 +00:00
Luigi Rizzo
895eb4fd73 don't forget to close a descriptor on a malloc failure.
On passing, small rearrangement of the code to reduce indentation.

There is a bit more cleanup planned for this file, so a merge to 1.4
will be done when it is all done.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-15 20:54:15 +00:00
Luigi Rizzo
9a3cef21ac typo: serer -> server
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-15 20:37:42 +00:00
Kevin P. Fleming
dc3ddc165b Merged revisions 45125 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45125 | kpfleming | 2006-10-13 18:02:48 -0500 (Fri, 13 Oct 2006) | 7 lines

------------------------------------------------------------------------
r45119 | kpfleming | 2006-10-13 17:57:42 -0500 (Fri, 13 Oct 2006) | 2 lines

don't drop the entire permit/deny list when an attempt is made to add an invalid entry (BE-92)

------------------------------------------------------------------------

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45126 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 23:03:36 +00:00
Joshua Colp
4cf4255267 Merged revisions 45031 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45031 | file | 2006-10-13 11:53:22 -0400 (Fri, 13 Oct 2006) | 10 lines

Merged revisions 45030 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45030 | file | 2006-10-13 11:49:53 -0400 (Fri, 13 Oct 2006) | 2 lines

Pass the right value to usleep for sleeping, and always add the background refresh item back into the scheduler if enabled since it is deleted during reload. (issue #8142 reported by p_lindheimer)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 15:56:17 +00:00
Kevin P. Fleming
0638096e5c Merged revisions 45027 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45027 | kpfleming | 2006-10-13 10:41:14 -0500 (Fri, 13 Oct 2006) | 2 lines

use a configure script test for PMTU discovery control instead of just assuming it's available on Linux

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 15:47:42 +00:00
Kevin P. Fleming
035aeb82e4 Merged revisions 44956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44956 | kpfleming | 2006-10-12 13:38:51 -0500 (Thu, 12 Oct 2006) | 10 lines

Merged revisions 44955 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44955 | kpfleming | 2006-10-12 13:31:26 -0500 (Thu, 12 Oct 2006) | 2 lines

ensure that IAX2 and SIP sockets allow UDP fragmentation when running on Linux (thanks to Brian Candler on the asterisk-dev list for the tip)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 18:43:52 +00:00
Russell Bryant
43f1054d07 Merged revisions 44945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44945 | russell | 2006-10-12 12:56:32 -0400 (Thu, 12 Oct 2006) | 2 lines

fix a silly typo in a comment that I saw while reading the commit list

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 16:57:36 +00:00
Nadi Sarrar
0752be2ec0 Merged revisions 44921 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44921 | nadi | 2006-10-12 14:55:25 +0200 (Do, 12 Okt 2006) | 2 lines

append_event must be called while holding the session lock

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 13:04:03 +00:00
Jason Parker
7173b2cf2e Merged revisions 44888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44888 | qwell | 2006-10-11 11:57:06 -0500 (Wed, 11 Oct 2006) | 3 lines

These are already set by the parent Makefile..
There is no need to have this here (it doesn't actually work anyways).

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 16:57:59 +00:00
Paul Cadach
500353e095 Extend CALLERID() function for "pres" and "ton" values
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 14:45:49 +00:00
Joshua Colp
62e6417b21 Merged revisions 44628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44628 | file | 2006-10-06 17:08:54 -0400 (Fri, 06 Oct 2006) | 2 lines

Remove the seqno check for RFC2833, the handler is smart enough to not need it.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 21:10:42 +00:00
Luigi Rizzo
684d1f1698 basically fix indentation of a large function after previous
simplifications. On passing, use a single exit point.

(once done with the cleanup i will merge the changes into 1.4,
if applicable)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 21:04:43 +00:00
Luigi Rizzo
35cada23f0 s cannot be null here, so remove the useless test and error-handling block.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44617 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 20:34:11 +00:00
Luigi Rizzo
acd1073909 simplify logic in preparation to reduce indentation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 20:16:13 +00:00
Joshua Colp
85625f3505 Merged revisions 44605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44605 | file | 2006-10-06 14:46:28 -0400 (Fri, 06 Oct 2006) | 2 lines

When the sequence number rolls over then reset the recorded sequence number for DTMF (issue #8106 reported by bungalow)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 18:47:49 +00:00
Joshua Colp
1ddda62208 Merged revisions 44581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44581 | file | 2006-10-06 12:53:48 -0400 (Fri, 06 Oct 2006) | 10 lines

Merged revisions 44580 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44580 | file | 2006-10-06 12:52:14 -0400 (Fri, 06 Oct 2006) | 2 lines

Even more frames to treat as though the remote side disappeared (issue #8097 reported by eldadran)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 16:56:05 +00:00
Luigi Rizzo
3f641c6048 make sure sockets are blocking when they should be blocking.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44568 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 15:59:57 +00:00
Joshua Colp
3dd0ce45fd Merged revisions 44502 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44502 | file | 2006-10-05 15:57:16 -0400 (Thu, 05 Oct 2006) | 10 lines

Merged revisions 44501 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44501 | file | 2006-10-05 15:55:41 -0400 (Thu, 05 Oct 2006) | 2 lines

Treat busy control frames as hangup in the file streaming core (issue #8097 reported by eldadran)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-05 19:58:50 +00:00
Kevin P. Fleming
8f1fc1ca08 Merged revisions 44476 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44476 | kpfleming | 2006-10-05 11:10:01 -0500 (Thu, 05 Oct 2006) | 3 lines

don't segfault when an argument without a close parenthesis is found
stop parsing as soon as that situation occurs

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44477 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-05 16:11:09 +00:00
Steve Murphy
3d323f5345 As per ToDo list, I have made it so that Wait(), WaitExten(), Congestion(), Busy(), Read(), WaitForRing(), will now either actually handle a floating point argument as advertised, or has been upgraded to accept a floating point [timeout] arg.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-05 01:40:06 +00:00
Kevin P. Fleming
c28461197b Merged revisions 44390 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44390 | kpfleming | 2006-10-04 16:04:21 -0500 (Wed, 04 Oct 2006) | 2 lines

make LOW_MEMORY builds actually work

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 21:10:36 +00:00
Kevin P. Fleming
3c876af5cf Merged revisions 44378 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44378 | kpfleming | 2006-10-04 14:47:22 -0500 (Wed, 04 Oct 2006) | 4 lines

update thread creation code a bit
reduce standard thread stack size slightly to allow the pthreads library to allocate the stack+data and not overflow a power-of-2 allocation in the kernel and waste memory/address space
add a new stack size for 'background' threads (those that don't handle PBX calls) when LOW_MEMORY is defined

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 19:51:38 +00:00
Kevin P. Fleming
41eb95e055 Merged revisions 44322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines

ensure that local include files are always used
avoid a duplicate function name (term_init())

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 00:26:21 +00:00
Joshua Colp
b5f2589e33 Add Masquerade manager event which trips when a masquerade happens (issue #7840 reported by moy)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-03 17:10:16 +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
e5203bb283 Add option to logger to rename log files with timestamp (issue #8020 reported by jmls)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 17:54:21 +00:00
Joshua Colp
21b3254437 Merged revisions 44169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r44169 | file | 2006-10-02 13:25:13 -0400 (Mon, 02 Oct 2006) | 10 lines

Merged revisions 44168 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r44168 | file | 2006-10-02 13:22:27 -0400 (Mon, 02 Oct 2006) | 2 lines

Shrink when current_ioc is unused. It is set to -1 when unused, not 0. (issue #7941 reported by eclubb)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 17:26:34 +00:00
Kevin P. Fleming
bda306fa96 clean up formatting and conformance to code guidelines
revert Mark's change that caused a memory leak (cap_set_proc() does not free the capability structure so we always need to call cap_free())


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 16:00:11 +00:00
Mark Spencer
461f6f8b23 Uhm yah, not sure who committed this into trunk... Anyway, I think this
is what was intended...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 02:19:04 +00:00
Paul Cadach
3cea4702a3 Merged revisions 44090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44090 | pcadach | 2006-10-01 01:20:38 +0600 (Вск, 01 Окт 2006) | 1 line

Allow one-way RTP streams (device->Asterisk)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-30 19:23:59 +00:00
Luigi Rizzo
8d6d166b14 merge compile fixes from 44080:
- with AST_DEVMODE, building codecs/lpc10 fails because of lots
  of warnings, and the configure step in editline fails as well.
  Fix this by removing the -Werror in these steps.

- on FreeBSD (but probably on other platforms as well), the final   
  link of asterisk fails because AST_LIBS was not exported to the
  subdirs Makefiles. Add a proper fix in the top-level Makefile
  (a possible alternative way is to add "export AST_LIBS" near
  the beginning of the file).
  With this fix, i believe that some of the platform-specific
  conditionals in main/Makefile are redundant (because they should
  be already dealt with in the top level Makefile) but i don't
  have a platform to check.




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-30 16:37:21 +00:00
Kevin P. Fleming
e92c34cc38 Merged revisions 44055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44055 | kpfleming | 2006-09-29 17:47:40 -0500 (Fri, 29 Sep 2006) | 2 lines

fix a few build system bugs, and convert Makefiles to be compatible with GNU make 3.80

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 22:48:43 +00:00
Jason Parker
3ca6a02f89 Merged revisions 44053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44053 | qwell | 2006-09-29 15:35:09 -0700 (Fri, 29 Sep 2006) | 3 lines

Fix a bug with the removal of 'atleast' argument to 'core verbose' and 'core debug'.
Add that argument back in.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 22:36:29 +00:00
Kevin P. Fleming
89050169c8 Merged revisions 43996-43997,44008,44011-44012 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43996 | kpfleming | 2006-09-29 11:47:05 -0500 (Fri, 29 Sep 2006) | 2 lines

another cross-compile fix

........
r43997 | kpfleming | 2006-09-29 11:52:27 -0500 (Fri, 29 Sep 2006) | 2 lines

support --without-curl in configure script

........
r44008 | kpfleming | 2006-09-29 13:25:49 -0500 (Fri, 29 Sep 2006) | 2 lines

don't abuse CFLAGS and LDFLAGS for build of Asterisk components, because they are also then used for non-Asterisk components (like menuselect); use our own variables instead

........
r44011 | kpfleming | 2006-09-29 13:40:17 -0500 (Fri, 29 Sep 2006) | 2 lines

missed one conversion to ASTCFLAGS

........
r44012 | kpfleming | 2006-09-29 13:49:07 -0500 (Fri, 29 Sep 2006) | 2 lines

yet another place where we were not using the correct CFLAGS by default

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 18:54:21 +00:00
Kevin P. Fleming
9892363a64 Merged revisions 43978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43978 | kpfleming | 2006-09-29 08:45:40 -0500 (Fri, 29 Sep 2006) | 2 lines

proper fix for ast_group_t change

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-29 13:46:33 +00:00
Joshua Colp
0dbe81383f Cache the application pointer so we don't have to needlessly search for it over and over. This should yield a suitable performance increase.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43954 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 22:49:55 +00:00
Joshua Colp
29d27bfe0d Merged revisions 43933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43933 | file | 2006-09-28 14:05:43 -0400 (Thu, 28 Sep 2006) | 2 lines

Put in missing \ns on the end of ast_logs (issue #7936 reported by wojtekka)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 18:09:01 +00:00
Joshua Colp
550a4dab79 Merged revisions 43913 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43913 | file | 2006-09-28 13:14:07 -0400 (Thu, 28 Sep 2006) | 2 lines

Warning be gone!

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43914 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 17:15:38 +00:00
Kevin P. Fleming
8677abe99b Merged revisions 43898 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43898 | kpfleming | 2006-09-28 11:38:25 -0500 (Thu, 28 Sep 2006) | 10 lines

Merged revisions 43895 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43895 | kpfleming | 2006-09-28 11:32:44 -0500 (Thu, 28 Sep 2006) | 2 lines

eliminate compiler warning introduced by recent changes

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 16:43:40 +00:00
Paul Cadach
47a0e0807c Merged revisions 43635,43843-43844,43846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43635 | pcadach | 2006-09-26 03:26:12 +0600 (Втр, 26 Сен 2006) | 1 line

Fix ASN1 description of non-standard Cisco extensions
........
r43843 | pcadach | 2006-09-28 12:01:37 +0600 (Чтв, 28 Сен 2006) | 1 line

Don't treat unknown control frames as voice
........
r43844 | pcadach | 2006-09-28 12:02:45 +0600 (Чтв, 28 Сен 2006) | 1 line

Don't warn on HOLD/UNHOLD control frames
........
r43846 | pcadach | 2006-09-28 16:51:21 +0600 (Чтв, 28 Сен 2006) | 1 line

Do not open transmit channel until TCS is received
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 11:12:58 +00:00
Joshua Colp
4116cfc387 Add ability to set high ToS bits as non-root on Linux using libcap (issue #7047 reported by maddison)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 21:48:01 +00:00
Jason Parker
47abf96957 Add BACKGROUNDSTATUS to Background()
Issue #7835, original patch by bcnit - redone by me.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 20:03:23 +00:00
Jason Parker
5a45352f3a Merged revisions 43803 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43803 | qwell | 2006-09-27 12:44:02 -0700 (Wed, 27 Sep 2006) | 4 lines

Fix an issue with PLAYBACKSTATUS not being set under certain circumstances.
Fix a minor issue, to make it use the filenames that were parsed, instead of the entire argument string.
Fix Background() to return -1 like Playback(), if no args are specified.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 19:45:24 +00:00
Joshua Colp
6df7c274d8 Merged revisions 43798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43798 | file | 2006-09-27 15:10:59 -0400 (Wed, 27 Sep 2006) | 2 lines

Compensate for out of order packets better if RFC2833 compensation is turned on.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 19:12:40 +00:00
Russell Bryant
d2c57c5f4f Merged revisions 43779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43779 | russell | 2006-09-27 12:55:49 -0400 (Wed, 27 Sep 2006) | 50 lines

Merged revisions 43778 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43778 | russell | 2006-09-27 12:54:30 -0400 (Wed, 27 Sep 2006) | 42 lines

Fix a problem that occurred if a user entered a digit that matched a bridge
feature that was configured using multiple digits, and the digit that was
pressed timed out in the feature digit timeout period.  For example, if blind
transfer is configured as '##', and a user presses just '#'.  In this situation,
the call would lock up and no longer pass any frames.
(issue #7977 reported by festr, and issue #7982 reported by michaels and
 valuable input provided by mneuhauser and kuj.  Fixed by me, with testing help
 and peer review from Joshua Colp).

There are a couple of issues involved in this fix:

1) When ast_generic_bridge determines that there has been a timeout, it returned
   AST_BRIDGE_RETRY.  Then, when ast_channel_bridge gets this result, it calls
   ast_generic_bridge over again with the same timestamp for the next event.
   This results in an endless loop of nothing until the call is terminated.
   This is resolved by simply changing ast_generic_bridge to return 
   AST_BRIDGE_COMPLETE when it sees a timeout.

2) I also changed ast_channel_bridge such that if in the process of calculating
   the time until the next event, it knows a timeout has already occured, to
   immediately return AST_BRIDGE_COMPLETE instead of attempting to bridge the
   channels anyway.

3) In the process of testing the previous two changes, I ran into a problem in
   res_features where ast_channel_bridge would return because it determined
   that there was a timeout.  However, ast_bridge_call in res_features would
   then determine by its own calculation that there was still 1 ms before the
   timeout really occurs.  It would then proceed, and since the bridge broke
   out and did *not* return a frame, it interpreted this as the call was over
   and hung up the channels.

   The reason for this was because ast_bridge_call in res_features and
   ast_channel_bridge in channel.c were using different times for their
   calculations.  channel.c uses the start_time on the bridge config, which
   is the time that the feature digit was recieved.  However, res_features
   had another time, 'start', which was set right before calling 
   ast_channel_bridge.  'start' will always be slightly after start_time in the
   bridge config, and sometimes enough to round up to one ms.

   This is fixed by making ast_bridge_call use the same time as 
   ast_channel_bridge for the timeout calculation.

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 16:57:44 +00:00
Russell Bryant
09536f91bf Merged revisions 43710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43710 | russell | 2006-09-26 16:56:42 -0400 (Tue, 26 Sep 2006) | 17 lines

(This was actually BE-65)

Merged revisions 43708 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43708 | russell | 2006-09-26 16:49:21 -0400 (Tue, 26 Sep 2006) | 7 lines

Back in revision 4798, this message was changed from using ast_cli() to directly
calling write().  During this change, checking if this was a remote console was
removed.  This caused this message about using "exit" or "quit" to exit an
Asterisk console to come up in times where it did not make sense.  This change
restores the check to see if this is a remote console before printing the
message.  (fixes BE-4)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43715 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-26 21:01:02 +00:00
Joshua Colp
98873d34bd Merged revisions 43707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43707 | file | 2006-09-26 16:47:26 -0400 (Tue, 26 Sep 2006) | 10 lines

Merged revisions 43705 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43705 | file | 2006-09-26 16:38:06 -0400 (Tue, 26 Sep 2006) | 2 lines

Use proper type to represent the group variable (issue #8025 reported by makoto)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-26 20:51:36 +00:00