Luigi Rizzo
97ac6793c7
+ move [almost] all instances of WWW-Authenticate/Proxy-Authenticate
...
and friends in a function, auth_headers(), which is used to
simplify the interface of do_{proxy|register}_auth().
+ use PROXY_AUTH = 407, WWW_AUTH = 401 as values for enum sip_auth_type;
No functional change, only code cleanup.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-12 15:12:54 +00:00
Luigi Rizzo
59e61ae4a0
reduce indentation of two large blocks
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 23:36:25 +00:00
Luigi Rizzo
6d6e60be79
operator != also works between booleans...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44900 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 23:26:44 +00:00
Russell Bryant
9e2abab8fa
Revert Luigi's accidental commit of his local changes when debugging some SIP
...
authentication issues. This was committed in revision 44844, where the commit
message was just "small formatting cleanup", so I am pretty sure he didn't mean
to commit this part.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44876 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 13:38:37 +00:00
Luigi Rizzo
328e1c9d1c
remove duplicate prototypes. Have not checked if there are more.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 13:21:33 +00:00
Luigi Rizzo
ed683ccc2a
simplify and comment handle_response_peerpoke()
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44874 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-11 13:12:31 +00:00
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
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
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
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
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
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
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
Luigi Rizzo
ccca5843fd
Two things:
...
1. slightly rearrange/simplify the parsing of the argument in sip_register.
This brings in a patch that has been in Mantis (5834) for ages,
and is the larger part of the commit;
2. implement the "contact" option for peers, similar to the one in users.conf:
If you put a "contact" option with a non-empty argument (e.g. contact=123)
in a peer section, asterisk will register with the provider as if you had a
register= username:secret@host/contact
line in the general section.
The latter is a very small is a new feature so i am not putting it
in the 1.4 branch, although the "contact" option in user.conf is
already in the 1.4 branch and so it wouldn't be too strange to
merge it.
Note that the implementation of "contact" is much simpler than
the one in 5834, and limited to a few lines in build_peer().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 15:41:12 +00:00
Olle Johansson
cb127f4baa
Remove deprecated "incominglimit" config option
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-06 09:01:09 +00:00
Joshua Colp
0b26b56316
Merged revisions 44486 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44486 | file | 2006-10-05 14:01:51 -0400 (Thu, 05 Oct 2006) | 2 lines
One more T.38 fix! Don't leave a reinvite hanging by a thread if the other side is already setup with T.38
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-05 18:03:34 +00:00
Joshua Colp
9924c3e2e9
Merged revisions 44450 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44450 | file | 2006-10-04 22:40:40 -0400 (Wed, 04 Oct 2006) | 2 lines
Don't totally bail out if T.38 was negotiated
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-05 02:43:07 +00:00
Kevin P. Fleming
975ef9de9d
Merged revisions 44433 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44433 | kpfleming | 2006-10-04 20:30:05 -0500 (Wed, 04 Oct 2006) | 10 lines
Merged revisions 44432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44432 | kpfleming | 2006-10-04 20:27:57 -0500 (Wed, 04 Oct 2006) | 2 lines
fix Polycom presence notification again
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-05 01:30:44 +00:00
Kevin P. Fleming
50bcacbdbd
Merged revisions 44393 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44393 | kpfleming | 2006-10-04 16:17:30 -0500 (Wed, 04 Oct 2006) | 11 lines
Merged revisions 44392 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44392 | kpfleming | 2006-10-04 16:15:29 -0500 (Wed, 04 Oct 2006) | 3 lines
remove workaround for old Polycom firmware SUBSCRIBE requests
add workaround for new Polycom firmware SUBSCRIBE requests (bug is known to exist in 2.0.1 firmware)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-04 21:20:55 +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
Joshua Colp
6727e8f599
Merged revisions 44284 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44284 | file | 2006-10-03 14:35:55 -0400 (Tue, 03 Oct 2006) | 2 lines
Use VideoSupport instead so it is considered a valid XML attribute name. (issue #8075 reported by renemendoza)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44285 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-03 18:37:06 +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
fadd9e7831
Merged revisions 44215 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44215 | file | 2006-10-02 16:11:02 -0400 (Mon, 02 Oct 2006) | 10 lines
Merged revisions 44213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44213 | file | 2006-10-02 16:07:59 -0400 (Mon, 02 Oct 2006) | 2 lines
Change the fd on the I/O context in case it changed during the reload, which is indeed possible. (issue #7943 reported by eclubb)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 20:13:26 +00:00
Mark Spencer
847fe77eb9
Don't use channel when you don't mean a channel
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44147 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-02 02:38:52 +00:00
Paul Cadach
d2087e6a09
Merged revisions 44078 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44078 | pcadach | 2006-09-30 22:12:23 +0600 (Сбт, 30 Сен 2006) | 6 lines
Fix issue #7928 correctly. Next is a comment of previous fix:
Issue #7928 - Don't send both 404 and 503. Fix by phsultan with
a small fix by me, myself or I. Thanks, Philippe!
(This was caused by my changes to the transaction handling)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-30 16:15:53 +00:00
Paul Cadach
031cd452d9
Merged revisions 44068 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44068 | pcadach | 2006-09-30 10:37:39 +0600 (Сбт, 30 Сен 2006) | 14 lines
Found some buggy SIP clients (phones Planet VIP-153T firmware
1.0, Linksys PAP2 firmware 3.1.9(LSc)) which sends ACK not on OK
message only (when remote party answers) but on RINGING message
too, so when we send 200 OK message, we get unidentified ACK
message (because INVITE acknowledged on RINGING message already),
so 200 OK retransmits within its retransmission interval then
call gets dropped.
If someone else knows how to provide workaround for such cases,
please, fix it in correct way.
Thanks to ssh from #asteriskru for provide access to his box to
study and fix this case.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-30 04:41:04 +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
8785d7229f
Add jitterbuffer information to sip list settings (issue #7945 reported by sergee)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43912 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-28 17:07:37 +00:00
Joshua Colp
fcad797dfd
Merged revisions 43774 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43774 | file | 2006-09-27 12:23:12 -0400 (Wed, 27 Sep 2006) | 2 lines
Make rfc2833compensate a global option.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 16:25:45 +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