Luigi Rizzo [Tue, 17 Oct 2006 17:51:34 +0000 (17:51 +0000)]
Improve the XML formatting of responses coming from web interface.
Normal responses are sequences of lines of the form "Name: value",
with \r\n as line terminators and an empty line as a response
terminator.
Generi CLI commands, however, do not have such a clean formatting,
and the existing code failed to generate valid XML for them.
Obviously we can only use heuristics here, and we do the following:
- accept either \r or \n as a line terminator, trimming trailing whitespace;
- if a line does not have a ":" in it, assume that from this point on
we have unformatted data, and use "Opaque-data:" as a name;
- if a line does have a ":" in it, the Name field is not always
a legal identifier, so replace non-alphanum characters with underscores;
All the above is to be refined as we improve the formatting of
responses from the CLI.
And, all the above ought to go as a comment in the code rather than
just in a commit message...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45334
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 17 Oct 2006 17:51:34 +0000 (17:51 +0000)]
Update of docs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45333
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 17 Oct 2006 17:47:09 +0000 (17:47 +0000)]
- Remove unneeded code that won't be reached now that we kill responses
to unkonwn dialogs earlier in the process.
- move debug message.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45331
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 17 Oct 2006 17:41:59 +0000 (17:41 +0000)]
open a temporary file to receive the output from cli commands
invoked through the http interface.
It is not terribly efficient but better than no output at all.
Todo: use a configurable /tmp directory instead of a hardwired one.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45330
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 17 Oct 2006 17:22:52 +0000 (17:22 +0000)]
Merged revisions 45327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45327 | kpfleming | 2006-10-17 12:22:25 -0500 (Tue, 17 Oct 2006) | 10 lines
Merged revisions 45326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45326 | kpfleming | 2006-10-17 12:22:01 -0500 (Tue, 17 Oct 2006) | 2 lines
provide licensing language for IAXy firmware file
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45328
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Tue, 17 Oct 2006 17:19:31 +0000 (17:19 +0000)]
document xml_copy_escape() and add an extra function, namely
replace non-alphanum chars with underscore.
This is useful when building field names in xml formatting.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45325
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 17 Oct 2006 16:27:01 +0000 (16:27 +0000)]
...block this one too... Only applies to 1.4 since the fix for trunk was different.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45316
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 17 Oct 2006 16:25:03 +0000 (16:25 +0000)]
Block patch from 1.4 that does not apply here.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45315
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 17 Oct 2006 06:47:02 +0000 (06:47 +0000)]
Get rid of the ignore variable that was only partially replaced
by the flag.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45295
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 16 Oct 2006 20:26:56 +0000 (20:26 +0000)]
In the course of a data this has been turned into an option to ignore replies, then ignore responses and finally I'm just getting rid of the option altogether and making it the default no matter what. C'est la vie!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45286
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 16 Oct 2006 20:10:05 +0000 (20:10 +0000)]
Woof.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45282
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 16 Oct 2006 20:08:23 +0000 (20:08 +0000)]
Merged revisions 45280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45280 | file | 2006-10-16 16:06:18 -0400 (Mon, 16 Oct 2006) | 10 lines
Merged revisions 45265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45265 | file | 2006-10-16 15:59:54 -0400 (Mon, 16 Oct 2006) | 2 lines
Use responses rather then replies even though they mean the same thing.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45281
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 16 Oct 2006 19:43:33 +0000 (19:43 +0000)]
Merged revisions 45262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45262 | file | 2006-10-16 15:37:34 -0400 (Mon, 16 Oct 2006) | 10 lines
Merged revisions 45260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45260 | file | 2006-10-16 15:28:18 -0400 (Mon, 16 Oct 2006) | 2 lines
Add 'ignoreoodreplies' option which will not create a pvt structure on a SIP response but instead basically drop it.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45263
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 16 Oct 2006 17:25:41 +0000 (17:25 +0000)]
Blocked revisions 45246 via svnmerge
........
r45246 | file | 2006-10-16 13:24:35 -0400 (Mon, 16 Oct 2006) | 2 lines
Backport of new directed pickup (BE-85).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45247
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 16 Oct 2006 16:26:23 +0000 (16:26 +0000)]
It's new directed pickup! This now features a more sane way of finding the channel to pick up (I snuck it into the tree on Friday... bet you didn't know I'd actually use it eh?). PICKUPMARK now also works in a different way, you should prefix it with _ when setting it so it gets inherited onto the channel(s) created in app_dial as directed pickup will now look for it on the target channel, not the originating channel. (BE-85)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45234
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 16 Oct 2006 14:03:48 +0000 (14:03 +0000)]
Update
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45224
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 16 Oct 2006 14:00:53 +0000 (14:00 +0000)]
+ comment some unclear fields of struct mansession;
+ let some commands (Challenge, Login) be processed even if
already authenticated, as it doesn't harm and prevents some
incorrect error messages
+ remove custom code for Logoff - the existing handler was ok.
Some indentation fixes may be necessary
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45219
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 16 Oct 2006 13:20:21 +0000 (13:20 +0000)]
When adding new functions, please add a forward declaration.
I *know* it is not required, but it makes navigation easier and will help
when splitting up this large source code file.
Thank you!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45209
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 16 Oct 2006 13:03:02 +0000 (13:03 +0000)]
Importing rev 45196 from 1.4 - don't kill dialog for a bad response
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45204
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 16 Oct 2006 12:28:18 +0000 (12:28 +0000)]
A B2BUA should *not* issue proxy auth.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45194
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 16 Oct 2006 11:29:22 +0000 (11:29 +0000)]
+ comment some unclear requirements for master_eventq
+ remove the need for an snprintf in astman_get_header()
+ fix comment for manager list eventq
+ localize one variable and minor code simplifications.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45185
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 16 Oct 2006 09:33:00 +0000 (09:33 +0000)]
protect access to first_action with actionlock.
Mark with XXX one place (during command execution) where
navigation should be protected with actionlock, but is not
because it would block requests for a long time.
To solve this properly we need to put reference counts in
the struct manager_action.
A suboptimal fix is to copy the record on a search and then
unlock the list while we work on the copy.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45177
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 16 Oct 2006 08:38:35 +0000 (08:38 +0000)]
comment some functions, and more small code simplifications
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45169
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 16 Oct 2006 06:55:14 +0000 (06:55 +0000)]
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
Luigi Rizzo [Mon, 16 Oct 2006 06:30:51 +0000 (06:30 +0000)]
simplify string parsing routines using ast_skip_*() functions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45160
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 15 Oct 2006 20:54:15 +0000 (20:54 +0000)]
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
Luigi Rizzo [Sun, 15 Oct 2006 20:37:42 +0000 (20:37 +0000)]
typo: serer -> server
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45151
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 14 Oct 2006 04:36:21 +0000 (04:36 +0000)]
update the doc string for both AEL and extensions.conf users.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45142
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Fri, 13 Oct 2006 23:03:36 +0000 (23:03 +0000)]
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
Joshua Colp [Fri, 13 Oct 2006 21:20:18 +0000 (21:20 +0000)]
Inherit the context and extension until the channel is answered
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45109
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 21:07:06 +0000 (21:07 +0000)]
Merged revisions 45106 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45106 | file | 2006-10-13 17:06:09 -0400 (Fri, 13 Oct 2006) | 2 lines
Clear the quiet flag too since we are restarting a recognition again (reported on -dev by Stephan Edelman)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45107
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 21:03:05 +0000 (21:03 +0000)]
Merged revisions 45104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45104 | file | 2006-10-13 17:01:13 -0400 (Fri, 13 Oct 2006) | 2 lines
Check return value from engine in case of failure (ie: out of licenses) (reported on -dev mailing list)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45105
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Christian Richter [Fri, 13 Oct 2006 19:24:02 +0000 (19:24 +0000)]
Merged revisions 45088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45088 | crichter | 2006-10-13 21:19:46 +0200 (Fr, 13 Okt 2006) | 1 line
avoiding warning, fixing potential bug
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45089
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 18:45:44 +0000 (18:45 +0000)]
Merged revisions 45079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45079 | file | 2006-10-13 14:42:49 -0400 (Fri, 13 Oct 2006) | 2 lines
And file said... let the compiler warnings STOP!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45080
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Fri, 13 Oct 2006 18:08:33 +0000 (18:08 +0000)]
Correction for bug 8128 in trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45078
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 17:06:19 +0000 (17:06 +0000)]
Merged revisions 45066 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45066 | file | 2006-10-13 13:05:02 -0400 (Fri, 13 Oct 2006) | 10 lines
Merged revisions 45060 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45060 | file | 2006-10-13 13:01:22 -0400 (Fri, 13 Oct 2006) | 2 lines
Turn on volume adjustment if it needs to be on (issue #8136 reported by mnicholson)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45067
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 16:22:17 +0000 (16:22 +0000)]
Merged revisions 45051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45051 | file | 2006-10-13 12:20:58 -0400 (Fri, 13 Oct 2006) | 2 lines
Move say.conf existence check to do_say function since it is called from multiple places (issue #8144 reported by kshumard)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45052
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Fri, 13 Oct 2006 16:20:26 +0000 (16:20 +0000)]
Merged revisions 45049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45049 | kpfleming | 2006-10-13 11:19:35 -0500 (Fri, 13 Oct 2006) | 10 lines
Merged revisions 45048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45048 | kpfleming | 2006-10-13 11:18:08 -0500 (Fri, 13 Oct 2006) | 2 lines
when sending a call to a peer, use the proper socket if we have multiple bindings (reported on asterisk-dev)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45050
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 16:02:27 +0000 (16:02 +0000)]
Merged revisions 45040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r45040 | file | 2006-10-13 12:01:17 -0400 (Fri, 13 Oct 2006) | 2 lines
Complete merging in RPID screen changes (issue #8101 reported by hristo, patch by oej in revision 44757)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45047
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 13 Oct 2006 15:56:17 +0000 (15:56 +0000)]
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
Kevin P. Fleming [Fri, 13 Oct 2006 15:47:42 +0000 (15:47 +0000)]
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
Christian Richter [Fri, 13 Oct 2006 15:42:09 +0000 (15:42 +0000)]
Merged revisions 45026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45026 | crichter | 2006-10-13 16:45:39 +0200 (Fr, 13 Okt 2006) | 9 lines
Merged revisions 45020 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45020 | crichter | 2006-10-13 15:11:13 +0200 (Fr, 13 Okt 2006) | 1 line
fixed some echocandisable issues when bridged. this caused a kernel panic sometimes..also some minor formatting fixes
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45028
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Fri, 13 Oct 2006 11:18:01 +0000 (11:18 +0000)]
Try to avoid the use of 'z' modifier in cases where it is not
necessary - rather, cast the argument to int.
In this case, the string is in a UDP packet and as such
limited to 64k so its length can be safely represented in an int
without truncation (besides, this is just a debugging message!)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45010
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Fri, 13 Oct 2006 11:11:19 +0000 (11:11 +0000)]
arguments to auth_headers() needed to be swapped here.
To avoid the same mistake in the future (due to slightly
confusing variable names), add a comment.
On passing, remove a redundant initialization.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45009
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Christian Richter [Fri, 13 Oct 2006 08:23:41 +0000 (08:23 +0000)]
Merged revisions 44994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r44994 | crichter | 2006-10-13 09:52:41 +0200 (Fr, 13 Okt 2006) | 9 lines
Merged revisions 44993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r44993 | crichter | 2006-10-13 09:40:07 +0200 (Fr, 13 Okt 2006) | 1 line
fixed issue, that the hangupcause got a wrong isdn cause at RELEASE_COMPLETE
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45000
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Thu, 12 Oct 2006 20:41:37 +0000 (20:41 +0000)]
Merged revisions 44982 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
........
r44982 | mogorman | 2006-10-12 15:34:49 -0500 (Thu, 12 Oct 2006) | 2 lines
fix for bug 7764.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44983
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 12 Oct 2006 19:16:16 +0000 (19:16 +0000)]
eliminate compiler warning
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44973
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 12 Oct 2006 19:15:25 +0000 (19:15 +0000)]
Merged revisions 44971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44971 | kpfleming | 2006-10-12 14:14:24 -0500 (Thu, 12 Oct 2006) | 2 lines
we can only send one 'a=ptime' attribute per media session, not one for each format
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44972
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 12 Oct 2006 18:43:52 +0000 (18:43 +0000)]
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
Russell Bryant [Thu, 12 Oct 2006 16:57:36 +0000 (16:57 +0000)]
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
Russell Bryant [Thu, 12 Oct 2006 16:51:31 +0000 (16:51 +0000)]
put flags in an enum and remove a couple of unused defines
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44944
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 12 Oct 2006 16:11:32 +0000 (16:11 +0000)]
Merged revisions 44942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44942 | file | 2006-10-12 12:08:50 -0400 (Thu, 12 Oct 2006) | 2 lines
Pass off AUDIO_LIBS so muted can link on OSX (issue #8135 reported by ssokol)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44943
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Thu, 12 Oct 2006 15:12:54 +0000 (15:12 +0000)]
+ 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
Nadi Sarrar [Thu, 12 Oct 2006 13:04:03 +0000 (13:04 +0000)]
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
Russell Bryant [Thu, 12 Oct 2006 10:26:54 +0000 (10:26 +0000)]
Merged revisions 44911 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44911 | russell | 2006-10-12 06:24:36 -0400 (Thu, 12 Oct 2006) | 2 lines
change some debug output to use LOG_DEBUG instead of verbose output
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44912
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 11 Oct 2006 23:36:25 +0000 (23:36 +0000)]
reduce indentation of two large blocks
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44901
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 11 Oct 2006 23:26:44 +0000 (23:26 +0000)]
operator != also works between booleans...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44900
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Wed, 11 Oct 2006 16:57:59 +0000 (16:57 +0000)]
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
Russell Bryant [Wed, 11 Oct 2006 13:45:40 +0000 (13:45 +0000)]
Remove doc/linkedlists.txt as it is no longer needed. The top of the file reads:
As of 2004-12-23, this documentation is no longer maintained. The doxygen documentation
generated from linkedlists.h should be referred to in its place, as it is more complete
and better maintained.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44877
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 11 Oct 2006 13:38:37 +0000 (13:38 +0000)]
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
Luigi Rizzo [Wed, 11 Oct 2006 13:21:33 +0000 (13:21 +0000)]
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
Luigi Rizzo [Wed, 11 Oct 2006 13:12:31 +0000 (13:12 +0000)]
simplify and comment handle_response_peerpoke()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44874
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Wed, 11 Oct 2006 12:24:57 +0000 (12:24 +0000)]
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
Luigi Rizzo [Wed, 11 Oct 2006 09:17:05 +0000 (09:17 +0000)]
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
Luigi Rizzo [Wed, 11 Oct 2006 08:56:09 +0000 (08:56 +0000)]
small formatting cleanup
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44844
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Christian Richter [Wed, 11 Oct 2006 08:45:40 +0000 (08:45 +0000)]
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
Christian Richter [Wed, 11 Oct 2006 08:39:50 +0000 (08:39 +0000)]
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
Christian Richter [Wed, 11 Oct 2006 08:34:03 +0000 (08:34 +0000)]
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
Christian Richter [Wed, 11 Oct 2006 08:23:16 +0000 (08:23 +0000)]
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
Tilghman Lesher [Tue, 10 Oct 2006 20:52:50 +0000 (20:52 +0000)]
More whitespace fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44831
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 10 Oct 2006 17:23:14 +0000 (17:23 +0000)]
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
Tilghman Lesher [Tue, 10 Oct 2006 16:46:01 +0000 (16:46 +0000)]
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
Joshua Colp [Tue, 10 Oct 2006 16:31:05 +0000 (16:31 +0000)]
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
Joshua Colp [Tue, 10 Oct 2006 15:25:05 +0000 (15:25 +0000)]
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
Christian Richter [Tue, 10 Oct 2006 14:54:58 +0000 (14:54 +0000)]
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
Luigi Rizzo [Tue, 10 Oct 2006 08:08:35 +0000 (08:08 +0000)]
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
Luigi Rizzo [Tue, 10 Oct 2006 07:40:27 +0000 (07:40 +0000)]
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
Joshua Colp [Mon, 9 Oct 2006 18:23:21 +0000 (18:23 +0000)]
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
Jason Parker [Mon, 9 Oct 2006 16:15:16 +0000 (16:15 +0000)]
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
Joshua Colp [Mon, 9 Oct 2006 15:52:29 +0000 (15:52 +0000)]
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
Joshua Colp [Mon, 9 Oct 2006 15:49:45 +0000 (15:49 +0000)]
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
Olle Johansson [Mon, 9 Oct 2006 11:20:02 +0000 (11:20 +0000)]
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
Luigi Rizzo [Mon, 9 Oct 2006 09:04:30 +0000 (09:04 +0000)]
slightly restructure sipsock_read() removing a "goto"
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44752
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 9 Oct 2006 08:33:52 +0000 (08:33 +0000)]
use S_OR in one place
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44751
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 8 Oct 2006 23:26:10 +0000 (23:26 +0000)]
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
Luigi Rizzo [Sun, 8 Oct 2006 23:04:12 +0000 (23:04 +0000)]
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
Luigi Rizzo [Sun, 8 Oct 2006 22:45:01 +0000 (22:45 +0000)]
small simplification to initreqprep()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44748
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sun, 8 Oct 2006 22:20:35 +0000 (22:20 +0000)]
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
Luigi Rizzo [Sun, 8 Oct 2006 14:10:26 +0000 (14:10 +0000)]
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
Olle Johansson [Sat, 7 Oct 2006 20:42:27 +0000 (20:42 +0000)]
Fix some debug output for setsockopt for TOS
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44731
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sat, 7 Oct 2006 18:57:11 +0000 (18:57 +0000)]
- 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
Olle Johansson [Sat, 7 Oct 2006 16:32:31 +0000 (16:32 +0000)]
Add/change doxygen and comments
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44708
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sat, 7 Oct 2006 16:26:11 +0000 (16:26 +0000)]
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
Olle Johansson [Sat, 7 Oct 2006 16:03:36 +0000 (16:03 +0000)]
Explain usage of DEFAULT_SIP_PORT
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44706
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sat, 7 Oct 2006 15:38:18 +0000 (15:38 +0000)]
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
Paul Cadach [Sat, 7 Oct 2006 14:48:32 +0000 (14:48 +0000)]
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
Paul Cadach [Sat, 7 Oct 2006 14:45:49 +0000 (14:45 +0000)]
Extend CALLERID() function for "pres" and "ton" values
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44685
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Sat, 7 Oct 2006 12:50:42 +0000 (12:50 +0000)]
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
Luigi Rizzo [Sat, 7 Oct 2006 12:20:16 +0000 (12:20 +0000)]
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
Luigi Rizzo [Sat, 7 Oct 2006 11:28:38 +0000 (11:28 +0000)]
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