Luigi Rizzo
312fd57758
fix indentation of a function after previous commit
...
(whitespace-only change)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 12:24:57 +00:00
Luigi Rizzo
2eeaeaa7a7
handle_response_peerpoke() does not need to return anything.
...
(Reindentation in the next commit.)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 09:17:05 +00:00
Luigi Rizzo
510b9f04c0
small formatting cleanup
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:56:09 +00:00
Christian Richter
7ff86b686f
Merged revisions 44563 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44563 | crichter | 2006-10-06 14:53:41 +0200 (Fr, 06 Okt 2006) | 9 lines
Merged revisions 44460 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44460 | crichter | 2006-10-05 12:02:38 +0200 (Do, 05 Okt 2006) | 1 line
fixed segfault which happens during hold/transfer action
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44843 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:45:40 +00:00
Christian Richter
8c3ab3122a
Merged revisions 44562 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44562 | crichter | 2006-10-06 14:52:01 +0200 (Fr, 06 Okt 2006) | 9 lines
Merged revisions 44335 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44335 | crichter | 2006-10-04 17:26:59 +0200 (Mi, 04 Okt 2006) | 1 line
if INFORMATION Message come with keypad instead of called party number, we just use the keypad as called party number.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:39:50 +00:00
Christian Richter
e09ad744af
Merged revisions 44561 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44561 | crichter | 2006-10-06 14:50:25 +0200 (Fr, 06 Okt 2006) | 9 lines
Merged revisions 44334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44334 | crichter | 2006-10-04 17:13:58 +0200 (Mi, 04 Okt 2006) | 1 line
added the option 'reject_cause' to make it possible to set the RELEASE_COMPLETE - cause on the 3. incoming PMP channel, which is automatically rejected because chan_misdn does not support that kind of callwaiting. Therefore chan_misdn supports now 3 incoming channels on a PMP BRI Port. misdn_lib_get_free_bc now gets the info if the requested channel is incoming or outgoing to make the 3. channel possible
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:34:03 +00:00
Christian Richter
05c4624d9b
Merged revisions 44559 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44559 | crichter | 2006-10-06 12:44:34 +0200 (Fr, 06 Okt 2006) | 9 lines
Merged revisions 44149 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44149 | crichter | 2006-10-02 15:28:14 +0200 (Mo, 02 Okt 2006) | 1 line
fixed the hold/retrieve/transfer issues, removed a useless bc field, added setting of frame.delivery fields, some minor code cleanups
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 08:23:16 +00:00
Tilghman Lesher
b0b4ad4973
More whitespace fixes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44831 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 20:52:50 +00:00
Joshua Colp
832014a91b
Merged revisions 44819 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44819 | file | 2006-10-10 13:21:44 -0400 (Tue, 10 Oct 2006) | 2 lines
Move some stuff around so that a NOTIFY dialog won't hang around until the end of the world under certain circumstances
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 17:23:14 +00:00
Tilghman Lesher
9ca7c56c74
Merged revisions 44808 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44808 | tilghman | 2006-10-10 11:42:19 -0500 (Tue, 10 Oct 2006) | 2 lines
Lost of a bit of logic when this was simplified between 1.2 and 1.4 (Bug 8117)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 16:46:01 +00:00
Joshua Colp
1eedc8af43
Merged revisions 44806 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44806 | file | 2006-10-10 12:30:00 -0400 (Tue, 10 Oct 2006) | 2 lines
Bail out if we have no refer structure and we get a refer response
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 16:31:05 +00:00
Joshua Colp
fadc6c4ed7
Merged revisions 44788 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44788 | file | 2006-10-10 11:23:14 -0400 (Tue, 10 Oct 2006) | 2 lines
Only set DTMF information if an RTP structure exists
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 15:25:05 +00:00
Christian Richter
2a8764f4ba
Merged revisions 44786 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44786 | crichter | 2006-10-10 15:50:26 +0200 (Di, 10 Okt 2006) | 9 lines
Merged revisions 44785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44785 | crichter | 2006-10-10 15:34:33 +0200 (Di, 10 Okt 2006) | 1 line
(re)added support of dynamical enabling hdlc on bchannels
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44787 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 14:54:58 +00:00
Luigi Rizzo
06fab1382b
clarify the use of the standard SIP port number, 5060,
...
and rename the old DEFAULT_SIP_PORT as STANDARD_SIP_PORT
to make it clear that this is not something we can change,
unlike other defaults.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 08:08:35 +00:00
Luigi Rizzo
15fcc45c4e
improve formatting of SIP packets when dumped to the verbose
...
output stream, so it is easier to find them in the log.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-10 07:40:27 +00:00
Joshua Colp
f54fc75796
Timeout values are in seconds (issue #7122 reported by jmls)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 18:23:21 +00:00
Jason Parker
a35c0989dd
Merged revisions 44764 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44764 | qwell | 2006-10-09 11:12:35 -0500 (Mon, 09 Oct 2006) | 4 lines
Fix a problem where phones that go "missing" never got unregistered.
Issue #8067 , reported by pj, patch by Anthony LaMantia (with minor whitespace modifications)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 16:15:16 +00:00
Joshua Colp
5f503b7669
Blocked revisions 44760 via svnmerge
...
........
r44760 | file | 2006-10-09 11:46:53 -0400 (Mon, 09 Oct 2006) | 2 lines
iaxs[callno] may go away if we try to avoid the deadlock
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 15:52:29 +00:00
Joshua Colp
7b3665596f
Merged revisions 44759 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44759 | file | 2006-10-09 11:41:28 -0400 (Mon, 09 Oct 2006) | 2 lines
Properly avoid a collision with iax2_hangup (issue #8115 reported by vazir)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 15:49:45 +00:00
Olle Johansson
d766095219
Being pedantic... "media" is easier to understand than "data" in the function name... :-)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 11:20:02 +00:00
Luigi Rizzo
853f7ed660
slightly restructure sipsock_read() removing a "goto"
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 09:04:30 +00:00
Luigi Rizzo
69af2cea2f
use S_OR in one place
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44751 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-09 08:33:52 +00:00
Luigi Rizzo
ad63b4c7c1
update_call_counter(): indentation fixes and small simplifications
...
at the top of the function.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-08 23:26:10 +00:00
Luigi Rizzo
06ef2c1907
localize some variables and reduce nesting depth
...
(indentation will be fixed by a separate commit).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-08 23:04:12 +00:00
Luigi Rizzo
dd2121b075
small simplification to initreqprep()
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-08 22:45:01 +00:00
Luigi Rizzo
36e4f62e7c
Simplify function parse_request() using a single loop instead
...
of two very similar ones.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-08 22:20:35 +00:00
Luigi Rizzo
b90f91c3b4
do not dereference p if we know it is NULL.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-08 14:10:26 +00:00
Olle Johansson
1b64c41369
Fix some debug output for setsockopt for TOS
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44731 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 20:42:27 +00:00
Olle Johansson
259f0d76b6
- move definition of global_autoframing to the same place as other globals
...
- set initial value at load/reload
- Add questionmarks for someone to fill in for doxygen
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 18:57:11 +00:00
Olle Johansson
12ef70f0c0
Add/change doxygen and comments
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 16:32:31 +00:00
Olle Johansson
77c69dc4ef
Recommend using "sip reload" since it's much easier to learn and
...
remember.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 16:26:11 +00:00
Olle Johansson
9cc9c38250
Explain usage of DEFAULT_SIP_PORT
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 16:03:36 +00:00
Olle Johansson
64aae4a887
Do *NOT* use DEFAULT_SIP_PORT in these comparisions, since users may change
...
that, but the protocol clearly states that if we DO NOT mention a port it
is 5060. DEFAULT_SIP_PORT is whatever we default to listen to.
I believe it's the third time I revert a patch like this.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 15:38:18 +00:00
Paul Cadach
1ed8fb571f
Merged revisions 44684 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44684 | pcadach | 2006-10-07 20:39:34 +0600 (Сбт, 07 Окт 2006) | 1 line
Propagate caller's transfer capability too
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 14:48:32 +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
Luigi Rizzo
901a66c401
slightly restructure the code that computes the channel's name
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 12:50:42 +00:00
Luigi Rizzo
a1a5824869
put repeated code to set nat mode in a function.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 12:20:16 +00:00
Luigi Rizzo
bc1e5f77af
put common code in a function to avoid repetitions.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 11:28:38 +00:00
Luigi Rizzo
b37dc86c74
remove hardwired usage of 5060, use DEFAULT_SIP_PORT instead
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 11:11:39 +00:00
Luigi Rizzo
e691246b6e
improve and document function get_in_brackets(), introducing
...
a helper function find_closing_quote() of more general use.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 09:36:09 +00:00
Luigi Rizzo
6466c2ebf9
when possible, use ast_set2_flags instead of ast_set/ast_clr .
...
Also mark XXX some dubious places.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-07 08:56:59 +00:00
Kevin P. Fleming
eda9434455
Merged revisions 44631 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44631 | kpfleming | 2006-10-06 16:28:03 -0500 (Fri, 06 Oct 2006) | 2 lines
ensure that mutex locks inside list heads are initialized properly on platforms that require constructor initialization (issue #8029 , patch from timrobbins)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 21:29:14 +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
Tilghman Lesher
13ece8cc39
Massive cleanup of the rpt code, updating to current coding guidelines
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 17:27:30 +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
b19b4b9764
document a bit the use of templates.
...
They are highly convenient for writing configuration files, especially
if you have many similar entries, or want to switch quickly between
different configurations without having to comment/uncomment large
sections of the files.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 16:43:36 +00:00