Olle Johansson
e3b099c12a
Formatting fix
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48188 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 20:49:06 +00:00
Jason Parker
97614cb6b4
Merged revisions 48186 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48186 | qwell | 2006-12-01 14:25:51 -0600 (Fri, 01 Dec 2006) | 10 lines
Merged revisions 48183 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48183 | qwell | 2006-12-01 14:19:10 -0600 (Fri, 01 Dec 2006) | 2 lines
Fix a small typo - issue 8848, reported by pabelanger
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 20:26:44 +00:00
Tilghman Lesher
1b2aebad4a
Merged revisions 48179 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48179 | tilghman | 2006-12-01 13:38:59 -0600 (Fri, 01 Dec 2006) | 2 lines
Double-unlock error (reported by blitzrage on IRC)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 19:41:02 +00:00
Olle Johansson
4ce5b7c080
- Remove T.38 early media, since T.38 requires two way communication (imported from 1.4)
...
- Small fixes to limitonpeer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 18:16:16 +00:00
Olle Johansson
ae14123361
Tiny doxygen improvement
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-01 17:33:56 +00:00
Joshua Colp
869101028b
Merged revisions 48168 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48168 | file | 2006-11-30 16:18:24 -0500 (Thu, 30 Nov 2006) | 2 lines
Do not do a partial bridge for Google Talk since we need to handle STUN. (issue #8448 reported by phsultan)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 21:22:01 +00:00
Olle Johansson
813f8d26fe
Issue #8319 (imported from 1.2, 1.4) - Increment nonce-count properly (noriyuki)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 20:55:43 +00:00
Olle Johansson
446a06679a
Documentation updates
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 20:34:23 +00:00
Joshua Colp
1f2f5919b5
Blocked revisions 48162 via svnmerge
...
................
r48162 | file | 2006-11-30 15:28:19 -0500 (Thu, 30 Nov 2006) | 9 lines
Blocked revisions 48161 via svnmerge
........
r48161 | file | 2006-11-30 15:27:29 -0500 (Thu, 30 Nov 2006) | 2 lines
Don't write AST_FRAME_NULL or AST_FRAME_IAX frames out to the channel driver. (issue #8390 reported by hselasky)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 20:29:11 +00:00
Joshua Colp
a77935b674
Merged revisions 48158 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48158 | file | 2006-11-30 15:07:55 -0500 (Thu, 30 Nov 2006) | 10 lines
Merged revisions 48157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48157 | file | 2006-11-30 15:06:43 -0500 (Thu, 30 Nov 2006) | 2 lines
Only print out debug message if bridged channel is not NULL. (issue #8412 reported by jubilex)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 20:09:46 +00:00
Joshua Colp
d72171b6e4
Merged revisions 48155 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48155 | file | 2006-11-30 14:05:14 -0500 (Thu, 30 Nov 2006) | 10 lines
Merged revisions 48154 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48154 | file | 2006-11-30 14:04:11 -0500 (Thu, 30 Nov 2006) | 2 lines
Do not listen for DTMF on the bridge that comes into existence when ParkedCall is executed. This means native bridging can now occur for this. (issue #8406 reported by kebl0155)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48156 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 19:06:22 +00:00
Joshua Colp
f6f735f505
Merged revisions 48152 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48152 | file | 2006-11-30 13:47:40 -0500 (Thu, 30 Nov 2006) | 10 lines
Merged revisions 48151 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48151 | file | 2006-11-30 13:42:45 -0500 (Thu, 30 Nov 2006) | 2 lines
Print certain CDR messages out at the NOTICE level versus WARNING since they can occur when used with the CDR applications and are perfectly fine. (issue #8367 reported by dartvader)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 18:49:59 +00:00
Olle Johansson
8f3abf5f30
Small update
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48150 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 18:25:51 +00:00
Olle Johansson
7e4d482071
Doxygen updates
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 18:22:10 +00:00
Joshua Colp
7b11c89373
Blocked revisions 48147 via svnmerge
...
................
r48147 | file | 2006-11-30 13:19:55 -0500 (Thu, 30 Nov 2006) | 9 lines
Blocked revisions 48146 via svnmerge
........
r48146 | file | 2006-11-30 13:17:54 -0500 (Thu, 30 Nov 2006) | 2 lines
Remember the pointer to the allocated block of memory so that we can free it and not cause a memory leak. (issue #8449 reported by arkadia)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 18:20:57 +00:00
Joshua Colp
c946e3b3fb
Merged revisions 48143 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48143 | file | 2006-11-30 12:57:35 -0500 (Thu, 30 Nov 2006) | 10 lines
Merged revisions 48142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48142 | file | 2006-11-30 12:55:23 -0500 (Thu, 30 Nov 2006) | 2 lines
Document 'port' for SIP peers, came up because of the current mailing list thread. (issue #8450 reported by blitzrage)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 17:58:53 +00:00
Olle Johansson
fddd385eb1
Adding some generic docs on extension and device states - watchers and providers
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48139 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 17:15:54 +00:00
Olle Johansson
298512203c
Add information on status events
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 14:32:52 +00:00
Olle Johansson
389ed67b41
Merging patch from 1.2/1.4. I think this was originally spotted by
...
Luigi, but hit me in the back today.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 09:23:25 +00:00
Joshua Colp
bf9a5e1dee
I am pretty sure that oej only meant to change the variable name in the source, not the configuration option name so let's turn it back to srvlookup instead of global_srvlookup. (issue #8442 reported by jtodd)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-30 03:29:42 +00:00
Joshua Colp
1cc4009bc6
Merged revisions 48115 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48115 | file | 2006-11-29 16:05:17 -0500 (Wed, 29 Nov 2006) | 2 lines
Use MAILTMPLEN instead of sizeof in mm_login. (issue #8420 reported by slimey)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 21:07:14 +00:00
Olle Johansson
7e46275b51
Clarify some settings for status reports in subscriptions, queues and manager
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 20:57:48 +00:00
Olle Johansson
e5145bebe4
Explain RTP timeouts
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 19:47:45 +00:00
Olle Johansson
2bee4aba4d
Change logging for p2p rtp bridge mode
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48111 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 19:44:06 +00:00
Russell Bryant
f51cf94a62
- Fix a few spelling mistakes.
...
- Add some more documentation for the ast_dynamic_str_............() function
to document the behavior of the function in the case of a partial write.
Also, document the return value and note that the function should never need
to be called directly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 17:59:13 +00:00
Russell Bryant
eaf98f31e8
Go ahead and make this write unconditional. Making it conditional is more work
...
in both the append and non-append modes. Also, always truncating the partial
write makes the behavior of the function more consistent, where in any type of
write, no partial result is left in the buffer.
Thanks for the feedback, luigi
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 17:37:31 +00:00
Joshua Colp
d44b349211
Merged revisions 48107 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48107 | file | 2006-11-29 11:50:33 -0500 (Wed, 29 Nov 2006) | 10 lines
Merged revisions 48106 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48106 | file | 2006-11-29 11:47:10 -0500 (Wed, 29 Nov 2006) | 2 lines
If the frame was duplicated before writing out then we need to free it. (issue #8429 reported by edguy3)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-11-29 16:53:27 +00:00
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