Russell Bryant
8ca3d51634
Remove an XXX command suggesting that this truncation should not be conditional,
...
and also add a more verbose comment explaining why it is only needed in the
case of appending to the string for any curious readers that come along in the
future.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48103 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 05:08:19 +00:00
Joshua Colp
62157d2839
Merged revisions 48101 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48101 | file | 2006-11-28 23:26:53 -0500 (Tue, 28 Nov 2006) | 2 lines
Don't crash if the mailstream was not created.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48102 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 04:28:21 +00:00
Joshua Colp
878885db7f
Use the proper version of extra sounds. (issue #8441 reported by jtodd)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 03:12:16 +00:00
Russell Bryant
c16c606cff
Add a comment to note near some code that performs a very expensive operation
...
that occurs for every incoming media frame.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48099 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 23:13:37 +00:00
Russell Bryant
0a280a1abc
resolve a couple of compiler warnings
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 23:04:36 +00:00
Jason Parker
ac9100bfee
Merged revisions 48095 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48095 | qwell | 2006-11-28 12:26:53 -0600 (Tue, 28 Nov 2006) | 2 lines
Export several more variables in top level Makefile. Inspired by issue 8438.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48096 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 18:28:07 +00:00
Luigi Rizzo
0b798e298d
don't use outputstr in the struct mansession, it's just
...
an extra allocation on a path where we have way too many already.
Unfortunately the AMI-over-HTTP requires multiple copies,
because we need to generate a header, then the raw output to
an intermediate buffer, then convert it to html/xml, and
finally copy everything into a malloc'ed buffer because
that's what the generic_http_callback interface expects.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 17:08:19 +00:00
Joshua Colp
e021f5fbb9
Merged revisions 48088 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48088 | file | 2006-11-28 11:57:16 -0500 (Tue, 28 Nov 2006) | 10 lines
Merged revisions 48087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48087 | file | 2006-11-28 11:56:01 -0500 (Tue, 28 Nov 2006) | 2 lines
According to the research I have done we never needed to include compiler.h in the first place so let's not! (issue #8430 reported by edguy3)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 16:59:20 +00:00
Luigi Rizzo
3dbc33ed4f
initialize the dynamic string in a sane way.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 15:53:12 +00:00
Luigi Rizzo
5e7aebf9ac
some simplifications to
...
ast_dynamic_str_thread_build_va_couldnt_we_choose_a_shorter_name()
I am unsure whether the truncation of the string in case of a failed
attempt should be done unconditionally. See the XXX mark.
Russel, ideas ?
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 14:07:09 +00:00
Luigi Rizzo
29985ff8c3
do not return 500 Internal error if the AMI command provides
...
no output.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 13:08:56 +00:00
Luigi Rizzo
77ae04d7c1
mosty comment and documentation cleanup on waitevent.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48082 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 12:05:25 +00:00
Luigi Rizzo
0153bdd72c
Move the code to purge stale sessions to a function,
...
to simplify the body of the main loop of the accepting thread.
Rename purge_unused() to purge_events() so one knows what the
function does.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 11:20:39 +00:00
Luigi Rizzo
5ce08d37ca
Various simplifications of the code:
...
+ use a wrapper around ast_carefulwrite(), used in two places,
to make life easier when we decide to use a different interface
to the socket.
+ put an ast_verbose() message on astman_append on a case that
should never happen now that we use a temporary file for
AMI-over-HTTP sessions
+ document and slightly simplify process_events() by removing
unnecessary parentheses.
+ in get_input(), use ast_wait_for_input() instead of poll().
We may want to move to a completely non-blocking
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48080 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 10:23:25 +00:00
Luigi Rizzo
1c570d9ba0
More informative message on invalid commands.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 09:43:44 +00:00
Luigi Rizzo
a8e9428317
another normalization of AMI vs HTTP identification.
...
Should really define a macro IS_AMI(s) so it is clear what
we want to do.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 09:39:16 +00:00
Luigi Rizzo
d1dcb0de2a
always use managerid to determine whether this is an AMI or HTTP session,
...
and document it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48077 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 09:27:37 +00:00
Luigi Rizzo
da80478d94
In the previous commit i forgot to set the poll_timeout to -1,
...
causing the http threads to do busy waiting around the socket...
Fix the mistake, sorry for the inconvenience!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48074 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-28 00:02:42 +00:00
Luigi Rizzo
7a6914a126
document the support for running a server on TCP/TLS and
...
opening an SSL socket.
We are almost ready to make this code available to other modules.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 21:25:55 +00:00
Luigi Rizzo
2e7fd7cbdb
add a new http.conf option, sslbindaddr.
...
Because https is more secure than http, it usually
makes sense to keep this service more open than the
one on the unencrypted port.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 20:21:40 +00:00
Luigi Rizzo
3637b60b19
in the helper thread, separate the FILE * creation from the actual
...
function doing work on the socket. This is another generalization
to provide a generic mechanism to open TCP/TLS socket with a thread
managing the accpet and children threads managing the individual
sessions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 19:19:48 +00:00
Luigi Rizzo
a381d3552e
staticize a global variable and remove an unused field structure.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 18:51:10 +00:00
Joshua Colp
8017bc6e6f
Merged revisions 48054 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48054 | file | 2006-11-27 13:06:50 -0500 (Mon, 27 Nov 2006) | 10 lines
Merged revisions 48053 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48053 | file | 2006-11-27 13:03:57 -0500 (Mon, 27 Nov 2006) | 2 lines
Use the proper function to get the new message count instead of always using the filesystem. (issue #8421 reported by slimey)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 18:10:59 +00:00
Tilghman Lesher
35b63c6b4c
Merged revisions 48049 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48049 | tilghman | 2006-11-27 11:20:37 -0600 (Mon, 27 Nov 2006) | 10 lines
Merged revisions 48045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48045 | tilghman | 2006-11-27 11:15:54 -0600 (Mon, 27 Nov 2006) | 2 lines
Random MOH wasn't really random (bug 8381)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 17:31:56 +00:00
Russell Bryant
9844b7e1b5
Blocked revisions 48046 via svnmerge
...
........
r48046 | russell | 2006-11-27 12:17:40 -0500 (Mon, 27 Nov 2006) | 2 lines
Remove a couple of unused variables (issue #8380 , casper)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 17:19:47 +00:00
Joshua Colp
4e333a782c
More fixes for referencing a structure after it has been freed. (issue #8425 reported by arkadia)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 15:48:57 +00:00
Joshua Colp
237c8be66c
Merged revisions 48038 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48038 | file | 2006-11-27 10:32:19 -0500 (Mon, 27 Nov 2006) | 10 lines
Merged revisions 48037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48037 | file | 2006-11-27 10:30:37 -0500 (Mon, 27 Nov 2006) | 2 lines
Do not reference the freed outgoing structure in the debug message. (issue #8425 reported by arkadia)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 15:33:56 +00:00
Luigi Rizzo
1b372d1b0f
remove an extra comma in an initializer
...
Detected by: AST_DEVMODE=yes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48034 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 14:47:15 +00:00
Olle Johansson
b9d57e8e3a
Doxygen updates
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 06:59:20 +00:00
Olle Johansson
42fb134171
Change error message (imported from 1.4)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-27 06:44:40 +00:00
Russell Bryant
a3adf3e754
- Add some comments on thread storage with a brief explanation of what it is
...
as well as what the motivation is for using it.
- Add a comment by the declaration of ast_inet_ntoa() noting that this function
is not reentrant, and the result of a previous call to the function is no
longer valid after calling it again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48019 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-26 06:55:33 +00:00
Steve Murphy
17eba0de3d
Merged revisions 48017 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48017 | murf | 2006-11-25 17:26:16 -0700 (Sat, 25 Nov 2006) | 1 line
might as well also document the raw values of the flag vars
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-26 00:31:13 +00:00
Steve Murphy
8ccbe1dc56
Merged revisions 48015 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48015 | murf | 2006-11-25 17:01:34 -0700 (Sat, 25 Nov 2006) | 1 line
A little bit of func_cdr documentation upgrade-- no bug# involved, although 8221 may have inspired it.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-26 00:15:42 +00:00
Matthew Fredrickson
2102534748
Little fix so we use the right message
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48014 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 21:50:42 +00:00
Matthew Fredrickson
94ec7877b5
Make compiler happier
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48013 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 21:46:58 +00:00
Matthew Fredrickson
8b8187c6f8
bug fix
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 21:35:23 +00:00
Matthew Fredrickson
1ded1fd55a
Make sure we don't send a group reset on a group larger than 32 CICs
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 21:32:33 +00:00
Matthew Fredrickson
cb06f87d11
Add ss7 show linkset command
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 20:54:38 +00:00
Matthew Fredrickson
4dfd954ac3
Updates to show linkset command
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48009 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 20:30:04 +00:00
Luigi Rizzo
2657279cb5
generalize a bit the functions used to create an tcp socket
...
and then run a service on it.
The code in manager.c does essentially the same things,
so we will be able to reuse the code in here (probably
moving it to netsock.c or another appropriate library file).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 17:37:04 +00:00
Olle Johansson
e46e42ceec
Changing ERROR to lesser level. Imported from 1.2/1.4
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48004 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 09:48:30 +00:00
Olle Johansson
7991366506
- Adding comment on suspicious memory allocation. Seems like it's never freed, but I don't
...
have a clear understanding of the frame allocation/deallocation, so I just mark this
for investigation. (Reported by Ed Guy). We're trying to see if a free() hurts...
- Doxygen comments on p2p rtp bridge stuff. I am a bit worried about shortcutting
rtcp this way, but will need feedback from rtcp gurus. This should work for
video calls too, and possibly UDPTL.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 09:45:57 +00:00
Luigi Rizzo
d7b26b6bf8
set pointers to NULL after freeing memory to avoid multiple free()
...
probably 1.4/1.2 issue as well if someone can look into that.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48001 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-25 09:02:42 +00:00
Steve Murphy
7406c1b242
removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly created branches
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-24 18:17:25 +00:00
Steve Murphy
6d270eacf4
This fix inspired by a patch supplied in bug 8189, which points out problems with the PLC code
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-24 17:40:49 +00:00
Olle Johansson
3fd07f51f2
Doxygen update
...
- Document cause codes
- Document a bit more on channel variables - global, predefined and local
- Fix some doxygen in channel.h. Adding one comment for two definitions does not
work. They won't be copied to each.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-24 14:00:19 +00:00
Olle Johansson
a4cc4d03c9
Remove unused memory allocation
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47960 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-23 11:04:25 +00:00
Olle Johansson
370c83d5f3
Document new configuration option.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-23 10:46:09 +00:00
Joshua Colp
b50fc7a502
Merged revisions 47944 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47944 | file | 2006-11-22 16:47:43 -0500 (Wed, 22 Nov 2006) | 2 lines
Video will never reach Packet2Packet bridging and can do more harm then good.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-22 21:49:11 +00:00
Joshua Colp
25daa31706
Clarify a bit more.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-22 17:47:14 +00:00