[asterisk-commits] murf: branch murf/bug6334 r48337 - in
/team/murf/bug6334: ./ agi/ apps/ chann...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Dec 6 13:19:09 MST 2006
Author: murf
Date: Wed Dec 6 14:19:08 2006
New Revision: 48337
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48337
Log:
Merged revisions 48048,48050,48056,48062,48067,48071,48073-48074,48077-48084,48086,48089-48090,48096,48098-48100,48102-48103,48108-48112,48114,48116,48123,48130,48136,48139,48144,48148-48150,48153,48156,48160,48163-48164,48167,48169,48175,48178,48180,48187-48188,48191,48194,48196,48200,48205-48206,48208,48213,48216-48217,48220,48224,48229,48231,48235,48249,48253,48255,48258-48259,48266,48269,48271,48273,48276-48277,48280,48282-48283 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r48048 | russell | 2006-11-27 10:19:47 -0700 (Mon, 27 Nov 2006) | 9 lines
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)
........
................
r48050 | tilghman | 2006-11-27 10:31:56 -0700 (Mon, 27 Nov 2006) | 18 lines
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)
........
................
................
r48056 | file | 2006-11-27 11:10:59 -0700 (Mon, 27 Nov 2006) | 18 lines
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)
........
................
................
r48062 | rizzo | 2006-11-27 11:51:10 -0700 (Mon, 27 Nov 2006) | 3 lines
staticize a global variable and remove an unused field structure.
................
r48067 | rizzo | 2006-11-27 12:19:48 -0700 (Mon, 27 Nov 2006) | 7 lines
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.
................
r48071 | rizzo | 2006-11-27 13:21:40 -0700 (Mon, 27 Nov 2006) | 6 lines
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.
................
r48073 | rizzo | 2006-11-27 14:25:55 -0700 (Mon, 27 Nov 2006) | 6 lines
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.
................
r48074 | rizzo | 2006-11-27 17:02:42 -0700 (Mon, 27 Nov 2006) | 6 lines
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!
................
r48077 | rizzo | 2006-11-28 02:27:37 -0700 (Tue, 28 Nov 2006) | 4 lines
always use managerid to determine whether this is an AMI or HTTP session,
and document it.
................
r48078 | rizzo | 2006-11-28 02:39:16 -0700 (Tue, 28 Nov 2006) | 5 lines
another normalization of AMI vs HTTP identification.
Should really define a macro IS_AMI(s) so it is clear what
we want to do.
................
r48079 | rizzo | 2006-11-28 02:43:44 -0700 (Tue, 28 Nov 2006) | 3 lines
More informative message on invalid commands.
................
r48080 | rizzo | 2006-11-28 03:23:25 -0700 (Tue, 28 Nov 2006) | 16 lines
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
................
r48081 | rizzo | 2006-11-28 04:20:39 -0700 (Tue, 28 Nov 2006) | 6 lines
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.
................
r48082 | rizzo | 2006-11-28 05:05:25 -0700 (Tue, 28 Nov 2006) | 3 lines
mosty comment and documentation cleanup on waitevent.
................
r48083 | rizzo | 2006-11-28 06:08:56 -0700 (Tue, 28 Nov 2006) | 4 lines
do not return 500 Internal error if the AMI command provides
no output.
................
r48084 | rizzo | 2006-11-28 07:07:09 -0700 (Tue, 28 Nov 2006) | 9 lines
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 ?
................
r48086 | rizzo | 2006-11-28 08:53:12 -0700 (Tue, 28 Nov 2006) | 3 lines
initialize the dynamic string in a sane way.
................
r48089 | file | 2006-11-28 09:59:20 -0700 (Tue, 28 Nov 2006) | 18 lines
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)
........
................
................
r48090 | rizzo | 2006-11-28 10:08:19 -0700 (Tue, 28 Nov 2006) | 10 lines
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.
................
r48096 | qwell | 2006-11-28 11:28:07 -0700 (Tue, 28 Nov 2006) | 10 lines
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.
........
................
r48098 | russell | 2006-11-28 16:04:36 -0700 (Tue, 28 Nov 2006) | 2 lines
resolve a couple of compiler warnings
................
r48099 | russell | 2006-11-28 16:13:37 -0700 (Tue, 28 Nov 2006) | 3 lines
Add a comment to note near some code that performs a very expensive operation
that occurs for every incoming media frame.
................
r48100 | file | 2006-11-28 20:12:16 -0700 (Tue, 28 Nov 2006) | 2 lines
Use the proper version of extra sounds. (issue #8441 reported by jtodd)
................
r48102 | file | 2006-11-28 21:28:21 -0700 (Tue, 28 Nov 2006) | 10 lines
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.
........
................
r48103 | russell | 2006-11-28 22:08:19 -0700 (Tue, 28 Nov 2006) | 5 lines
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.
................
r48108 | file | 2006-11-29 09:53:27 -0700 (Wed, 29 Nov 2006) | 18 lines
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)
........
................
................
r48109 | russell | 2006-11-29 10:37:31 -0700 (Wed, 29 Nov 2006) | 7 lines
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
................
r48110 | russell | 2006-11-29 10:59:13 -0700 (Wed, 29 Nov 2006) | 6 lines
- 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.
................
r48111 | oej | 2006-11-29 12:44:06 -0700 (Wed, 29 Nov 2006) | 2 lines
Change logging for p2p rtp bridge mode
................
r48112 | oej | 2006-11-29 12:47:45 -0700 (Wed, 29 Nov 2006) | 2 lines
Explain RTP timeouts
................
r48114 | oej | 2006-11-29 13:57:48 -0700 (Wed, 29 Nov 2006) | 2 lines
Clarify some settings for status reports in subscriptions, queues and manager
................
r48116 | file | 2006-11-29 14:07:14 -0700 (Wed, 29 Nov 2006) | 10 lines
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)
........
................
r48123 | file | 2006-11-29 20:29:42 -0700 (Wed, 29 Nov 2006) | 2 lines
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)
................
r48130 | oej | 2006-11-30 02:23:25 -0700 (Thu, 30 Nov 2006) | 3 lines
Merging patch from 1.2/1.4. I think this was originally spotted by
Luigi, but hit me in the back today.
................
r48136 | oej | 2006-11-30 07:32:52 -0700 (Thu, 30 Nov 2006) | 2 lines
Add information on status events
................
r48139 | oej | 2006-11-30 10:15:54 -0700 (Thu, 30 Nov 2006) | 2 lines
Adding some generic docs on extension and device states - watchers and providers
................
r48144 | file | 2006-11-30 10:58:53 -0700 (Thu, 30 Nov 2006) | 18 lines
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)
........
................
................
r48148 | file | 2006-11-30 11:20:57 -0700 (Thu, 30 Nov 2006) | 16 lines
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)
........
................
................
r48149 | oej | 2006-11-30 11:22:10 -0700 (Thu, 30 Nov 2006) | 2 lines
Doxygen updates
................
r48150 | oej | 2006-11-30 11:25:51 -0700 (Thu, 30 Nov 2006) | 2 lines
Small update
................
r48153 | file | 2006-11-30 11:49:59 -0700 (Thu, 30 Nov 2006) | 18 lines
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)
........
................
................
r48156 | file | 2006-11-30 12:06:22 -0700 (Thu, 30 Nov 2006) | 18 lines
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)
........
................
................
r48160 | file | 2006-11-30 13:09:46 -0700 (Thu, 30 Nov 2006) | 18 lines
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)
........
................
................
r48163 | file | 2006-11-30 13:29:11 -0700 (Thu, 30 Nov 2006) | 16 lines
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)
........
................
................
r48164 | oej | 2006-11-30 13:34:23 -0700 (Thu, 30 Nov 2006) | 2 lines
Documentation updates
................
r48167 | oej | 2006-11-30 13:55:43 -0700 (Thu, 30 Nov 2006) | 2 lines
Issue #8319 (imported from 1.2, 1.4) - Increment nonce-count properly (noriyuki)
................
r48169 | file | 2006-11-30 14:22:01 -0700 (Thu, 30 Nov 2006) | 10 lines
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)
........
................
r48175 | oej | 2006-12-01 10:33:56 -0700 (Fri, 01 Dec 2006) | 2 lines
Tiny doxygen improvement
................
r48178 | oej | 2006-12-01 11:16:16 -0700 (Fri, 01 Dec 2006) | 3 lines
- Remove T.38 early media, since T.38 requires two way communication (imported from 1.4)
- Small fixes to limitonpeer
................
r48180 | tilghman | 2006-12-01 12:41:02 -0700 (Fri, 01 Dec 2006) | 10 lines
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)
........
................
r48187 | qwell | 2006-12-01 13:26:44 -0700 (Fri, 01 Dec 2006) | 18 lines
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
........
................
................
r48188 | oej | 2006-12-01 13:49:06 -0700 (Fri, 01 Dec 2006) | 2 lines
Formatting fix
................
r48191 | russell | 2006-12-01 16:20:17 -0700 (Fri, 01 Dec 2006) | 20 lines
Merged revisions 48190 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48190 | russell | 2006-12-01 18:16:28 -0500 (Fri, 01 Dec 2006) | 12 lines
FreeBSD 6.1 does not include wget by default. However, it has fetch which will
work just fine for our purposes of downloading the sounds packages. So, check
for both wget and fetch and the configure script and use what was found to
download them. If neither one was found, and sound packages are selected that
must be downloaded, the install process will print out an informative error
message indicating the situation.
Also, fix a couple places where "make" was hard coded into some output messages
by replacing them with the $(MAKE) variable.
(issue #8451, initial patch by pabelanger, with additional modifications by me)
........
................
r48194 | kpfleming | 2006-12-01 16:39:59 -0700 (Fri, 01 Dec 2006) | 18 lines
Merged revisions 48193 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48193 | kpfleming | 2006-12-01 17:37:28 -0600 (Fri, 01 Dec 2006) | 10 lines
Merged revisions 48192 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48192 | kpfleming | 2006-12-01 17:30:59 -0600 (Fri, 01 Dec 2006) | 2 lines
if Dial() is going to send music-on-hold to the calling party, it has to send PROGRESS first to ensure that the reverse audio path has been setup first (BE-106)
........
................
................
r48196 | russell | 2006-12-01 20:53:02 -0700 (Fri, 01 Dec 2006) | 10 lines
Blocked revisions 48195 via svnmerge
........
r48195 | russell | 2006-12-01 22:50:58 -0500 (Fri, 01 Dec 2006) | 3 lines
Backport the comment containing the warning regarding the limitations on the
usage of this function. It is thread safe, but not technically reentrant.
........
................
r48200 | oej | 2006-12-02 05:05:40 -0700 (Sat, 02 Dec 2006) | 9 lines
- Disable RTP timeouts during T.38 transmission
- Encapsulate RTP timers to the RTP structure, so we have one set for video and one for audio
- Document RTP keepalive configuration option
- Cleanup and document the monitor support function to hangup on RTP timeouts
- Add RTP keepalive to SIP show settings
Imported from 1.4 with modifications for trunk.
................
r48205 | oej | 2006-12-02 06:40:13 -0700 (Sat, 02 Dec 2006) | 5 lines
- Code formatting
- remove coef_in.h and coef_out.h that was only included as data definitions in fskmodem.c
If you understand spanish, please help us translate the comments in fskmodem.c. Thanks!
................
r48206 | oej | 2006-12-02 07:07:20 -0700 (Sat, 02 Dec 2006) | 2 lines
Doxygenification
................
r48208 | oej | 2006-12-02 10:40:58 -0700 (Sat, 02 Dec 2006) | 4 lines
Oops.
Something is wrong in the agi directory. Asking for autoconfig.h.
I have it disabled locally, but no reason to commit that change.
................
r48213 | oej | 2006-12-02 12:11:02 -0700 (Sat, 02 Dec 2006) | 2 lines
Invitestate updates
................
r48216 | oej | 2006-12-02 13:30:58 -0700 (Sat, 02 Dec 2006) | 12 lines
Send CANCEL to call with early media (PROGRESS INBAND).
This is imported from branch "invitestate" and "invitestate-1.4"
***
***
*** IF YOU HAVE ISSUES WITH BYEs/CANCELs - PLEASE UPDATE AND TEST AGAIN!
*** Thank you!
***
***
/Olle
................
r48217 | oej | 2006-12-02 13:50:54 -0700 (Sat, 02 Dec 2006) | 3 lines
Removing two .h files means we need to update cleancount to force
make depend again (or ?)
................
r48220 | oej | 2006-12-02 15:03:14 -0700 (Sat, 02 Dec 2006) | 2 lines
Cleaning up handle_response a bit. (Imported from 1.4)
................
r48224 | russell | 2006-12-02 23:35:46 -0700 (Sat, 02 Dec 2006) | 11 lines
Merged revisions 48223 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48223 | russell | 2006-12-03 01:34:14 -0500 (Sun, 03 Dec 2006) | 3 lines
When "fetch" is in use, instead of "wget", --continue is not a valid option.
(issue #8451)
........
................
r48229 | qwell | 2006-12-04 10:44:12 -0700 (Mon, 04 Dec 2006) | 12 lines
Merged revisions 48228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48228 | qwell | 2006-12-04 11:43:24 -0600 (Mon, 04 Dec 2006) | 4 lines
Attempt to document some of the dependencies that are needed for net-snmp
Issue 8499 - initial patch by blitzrage.
........
................
r48231 | qwell | 2006-12-04 10:55:38 -0700 (Mon, 04 Dec 2006) | 12 lines
Merged revisions 48230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48230 | qwell | 2006-12-04 11:54:46 -0600 (Mon, 04 Dec 2006) | 4 lines
Add documentation to voicemail.conf.sample for ODBC storage.
Issue 8499 - patch by blitzrage.
........
................
r48235 | file | 2006-12-04 11:18:07 -0700 (Mon, 04 Dec 2006) | 16 lines
Blocked revisions 48234 via svnmerge
................
r48234 | file | 2006-12-04 13:16:31 -0500 (Mon, 04 Dec 2006) | 9 lines
Blocked revisions 48233 via svnmerge
........
r48233 | file | 2006-12-04 13:14:46 -0500 (Mon, 04 Dec 2006) | 2 lines
If the generic bridge tells us not to retry, and we have a frame to spit out then break the bridge. Props to markit in #asterisk-bugs for bringing this up.
........
................
................
r48249 | qwell | 2006-12-04 14:49:38 -0700 (Mon, 04 Dec 2006) | 10 lines
Merged revisions 48248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48248 | qwell | 2006-12-04 15:48:41 -0600 (Mon, 04 Dec 2006) | 2 lines
Fix an issue which didn't allow unavail/greet/busy/etc messages from being saved into ODBC (and probably IMAP).
........
................
r48253 | tilghman | 2006-12-04 18:39:53 -0700 (Mon, 04 Dec 2006) | 22 lines
Merged revisions 48252 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48252 | tilghman | 2006-12-04 19:34:34 -0600 (Mon, 04 Dec 2006) | 14 lines
Merged revisions 48251 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48251 | tilghman | 2006-12-04 19:26:08 -0600 (Mon, 04 Dec 2006) | 6 lines
If the recording in the database is too large, it will fail to retrieve with
an mmap error. Not too sure why this doesn't happen when we put it in the
database, also, but since that doesn't seem to be broken, I'm not going to fix
it (at least until someone reports it). Solution is to ask for the file in
smaller chunks. (Bug 8385)
........
................
................
r48255 | tilghman | 2006-12-04 18:46:14 -0700 (Mon, 04 Dec 2006) | 10 lines
Merged revisions 48254 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48254 | tilghman | 2006-12-04 19:41:02 -0600 (Mon, 04 Dec 2006) | 2 lines
Oops, forgot to release the odbc handle
........
................
r48258 | oej | 2006-12-05 03:52:53 -0700 (Tue, 05 Dec 2006) | 16 lines
Reserving flags for coming code (currently in the "videocaps" branch)
implementing T.140 support in RTP.
T.140/RFC 4351 is TDD over IP - text telephony for hearing impaired.
It defines a realtime text chat, much like the old "talk" application
in Unix.
T.140 is character by character in real time. It's not
the same as our current MESSAGE format - that is more like IM, but
can be gatewayed to MESSAGE with a text "codec" if needed.
More patches will follow, as soon as we've separated this code from
the video capabilities functions in the videocaps branch.
Code by John Martin, Aupix (disclaimer on file)
................
r48259 | oej | 2006-12-05 04:09:23 -0700 (Tue, 05 Dec 2006) | 2 lines
Well, yes...
................
r48266 | transnexus | 2006-12-05 07:33:21 -0700 (Tue, 05 Dec 2006) | 2 lines
1. Change to remove the compiling warning: "app_osplookup.c:2169: warning: initialization discards qualifiers from pointer target type"
................
r48269 | oej | 2006-12-05 09:48:15 -0700 (Tue, 05 Dec 2006) | 2 lines
Adding docs on t.38
................
r48271 | oej | 2006-12-05 10:34:55 -0700 (Tue, 05 Dec 2006) | 2 lines
Blocking invitestate patch that is already merged to svn trunk.
................
r48273 | oej | 2006-12-05 12:41:26 -0700 (Tue, 05 Dec 2006) | 3 lines
Issue #8506 - translate spanish comments in fskmodem to english (according to bug guidelines)
Thanks merbanan!
................
r48276 | qwell | 2006-12-05 13:15:37 -0700 (Tue, 05 Dec 2006) | 5 lines
Expand on r48273 (from issue 8506), to translate more of the fskmodem stuff to English.
r48273 dealt with the comments and such, this deals with the code itself.
(This couldn't have been easily done if it weren't for 48273 - thanks again for that merbanan)
................
r48277 | oej | 2006-12-05 13:39:13 -0700 (Tue, 05 Dec 2006) | 2 lines
Doxygen updates
................
r48280 | qwell | 2006-12-05 13:44:12 -0700 (Tue, 05 Dec 2006) | 12 lines
Merged revisions 48279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48279 | qwell | 2006-12-05 14:42:52 -0600 (Tue, 05 Dec 2006) | 4 lines
Fix curl version number testing to be much more friendly to non-bash shells.
Issue 8508, patch by me. This *SHOULD* be POSIX compliant now..
........
................
r48282 | file | 2006-12-05 13:46:26 -0700 (Tue, 05 Dec 2006) | 2 lines
Regenerate configure for Qwell's last commit.
................
r48283 | qwell | 2006-12-05 13:52:37 -0700 (Tue, 05 Dec 2006) | 9 lines
Blocked revisions 48281 via svnmerge
........
r48281 | file | 2006-12-05 14:45:28 -0600 (Tue, 05 Dec 2006) | 2 lines
Regenerate configure from Qwell's last commit.
........
................
Removed:
team/murf/bug6334/main/coef_in.h
team/murf/bug6334/main/coef_out.h
Modified:
team/murf/bug6334/ (props changed)
team/murf/bug6334/.cleancount
team/murf/bug6334/Makefile
team/murf/bug6334/agi/eagi-sphinx-test.c
team/murf/bug6334/agi/eagi-test.c
team/murf/bug6334/apps/app_dial.c
team/murf/bug6334/apps/app_osplookup.c
team/murf/bug6334/apps/app_sms.c
team/murf/bug6334/apps/app_voicemail.c
team/murf/bug6334/channels/chan_gtalk.c
team/murf/bug6334/channels/chan_iax2.c
team/murf/bug6334/channels/chan_phone.c
team/murf/bug6334/channels/chan_sip.c
team/murf/bug6334/codecs/codec_zap.c
team/murf/bug6334/configs/extensions.conf.sample
team/murf/bug6334/configs/http.conf.sample
team/murf/bug6334/configs/sip.conf.sample
team/murf/bug6334/configs/voicemail.conf.sample
team/murf/bug6334/configure
team/murf/bug6334/configure.ac
team/murf/bug6334/contrib/asterisk-ng-doxygen
team/murf/bug6334/doc/manager.txt
team/murf/bug6334/doc/snmp.txt
team/murf/bug6334/include/asterisk/channel.h
team/murf/bug6334/include/asterisk/devicestate.h
team/murf/bug6334/include/asterisk/doxyref.h
team/murf/bug6334/include/asterisk/frame.h
team/murf/bug6334/include/asterisk/fskmodem.h
team/murf/bug6334/include/asterisk/pbx.h
team/murf/bug6334/include/asterisk/rtp.h
team/murf/bug6334/include/asterisk/threadstorage.h
team/murf/bug6334/main/callerid.c
team/murf/bug6334/main/cdr.c
team/murf/bug6334/main/channel.c
team/murf/bug6334/main/cli.c
team/murf/bug6334/main/devicestate.c
team/murf/bug6334/main/frame.c
team/murf/bug6334/main/fskmodem.c
team/murf/bug6334/main/http.c
team/murf/bug6334/main/manager.c
team/murf/bug6334/main/pbx.c
team/murf/bug6334/main/rtp.c
team/murf/bug6334/main/tdd.c
team/murf/bug6334/main/utils.c
team/murf/bug6334/makeopts.in
team/murf/bug6334/res/res_features.c
team/murf/bug6334/res/res_musiconhold.c
team/murf/bug6334/sounds/Makefile
Propchange: team/murf/bug6334/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/murf/bug6334/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/murf/bug6334/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 6 14:19:08 2006
@@ -1,1 +1,1 @@
-/trunk:1-48041
+/trunk:1-48290
Modified: team/murf/bug6334/.cleancount
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/.cleancount?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/.cleancount (original)
+++ team/murf/bug6334/.cleancount Wed Dec 6 14:19:08 2006
@@ -1,1 +1,1 @@
-26
+27
Modified: team/murf/bug6334/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/Makefile?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/Makefile (original)
+++ team/murf/bug6334/Makefile Wed Dec 6 14:19:08 2006
@@ -37,6 +37,11 @@
export ASTVARLIBDIR
export ASTDATADIR
export ASTLOGDIR
+export ASTLIBDIR
+export ASTMANDIR
+export ASTHEADERDIR
+export ASTBINDIR
+export ASTSBINDIR
export AGI_DIR
export ASTCONFPATH
export NOISY_BUILD
@@ -52,6 +57,7 @@
export PROC
export SOLINK
export STRIP
+export DOWNLOAD
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -268,14 +274,14 @@
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
- @echo " + make install +"
+ @echo " + $(MAKE) install +"
@echo " +-------------------------------------------+"
_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
- @echo "**** The configure script must be executed before running 'make'."
+ @echo "**** The configure script must be executed before running '$(MAKE)'."
@echo "****"
@exit 1
Modified: team/murf/bug6334/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/agi/eagi-sphinx-test.c?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/agi/eagi-sphinx-test.c (original)
+++ team/murf/bug6334/agi/eagi-sphinx-test.c Wed Dec 6 14:19:08 2006
@@ -4,6 +4,15 @@
* This code is released into public domain
* without any warranty of any kind.
*
+ */
+
+/*! \file
+ * Extended AGI test application
+ *
+ * This code is released into public domain
+ * without any warranty of any kind.
+ *
+ * \ingroup agi
*/
#include <stdio.h>
Modified: team/murf/bug6334/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/agi/eagi-test.c?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/agi/eagi-test.c (original)
+++ team/murf/bug6334/agi/eagi-test.c Wed Dec 6 14:19:08 2006
@@ -17,6 +17,15 @@
#include "asterisk/compat.h"
#define AUDIO_FILENO (STDERR_FILENO + 1)
+
+/*! \file
+ * Extended AGI test application
+ *
+ * This code is released into the public domain
+ * with no warranty of any kind
+ *
+ * \ingroup agi
+ */
static int read_environment(void)
{
Modified: team/murf/bug6334/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_dial.c?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/apps/app_dial.c (original)
+++ team/murf/bug6334/apps/app_dial.c Wed Dec 6 14:19:08 2006
@@ -1430,6 +1430,7 @@
if (ast_test_flag(outgoing, OPT_MUSICBACK)) {
moh = 1;
ast_moh_start(chan, opt_args[OPT_ARG_MUSICBACK], NULL);
+ ast_indicate(chan, AST_CONTROL_PROGRESS);
} else if (ast_test_flag(outgoing, OPT_RINGBACK)) {
ast_indicate(chan, AST_CONTROL_RINGING);
sentringing++;
Modified: team/murf/bug6334/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_osplookup.c?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/apps/app_osplookup.c (original)
+++ team/murf/bug6334/apps/app_osplookup.c Wed Dec 6 14:19:08 2006
@@ -2159,7 +2159,7 @@
" OSPFINISHSTATUS The status of the OSP Finish attempt as a text string, one of\n"
" SUCCESS | FAILED | ERROR \n";
-static const char osp_usage[] =
+static char osp_usage[] =
"Usage: osp show\n"
" Displays information on Open Settlement Protocol support\n";
Modified: team/murf/bug6334/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_sms.c?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/apps/app_sms.c (original)
+++ team/murf/bug6334/apps/app_sms.c Wed Dec 6 14:19:08 2006
@@ -119,59 +119,59 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
-#define SMSLEN 160 /* max SMS length */
+#define SMSLEN 160 /*!< max SMS length */
typedef struct sms_s
{
- unsigned char hangup; /* we are done... */
- unsigned char err; /* set for any errors */
- unsigned char smsc:1; /* we are SMSC */
- unsigned char rx:1; /* this is a received message */
- char queue[30]; /* queue name */
- char oa[20]; /* originating address */
- char da[20]; /* destination address */
- time_t scts; /* time stamp, UTC */
- unsigned char pid; /* protocol ID */
- unsigned char dcs; /* data coding scheme */
- short mr; /* message reference - actually a byte, but usde -1 for not set */
- int udl; /* user data length */
- int udhl; /* user data header length */
- unsigned char srr:1; /* Status Report request */
- unsigned char udhi:1; /* User Data Header required, even if length 0 */
- unsigned char rp:1; /* Reply Path */
- unsigned int vp; /* validity period in minutes, 0 for not set */
- unsigned short ud[SMSLEN]; /* user data (message), UCS-2 coded */
- unsigned char udh[SMSLEN]; /* user data header */
- char cli[20]; /* caller ID */
- unsigned char ophase; /* phase (0-79) for 0 and 1 frequencies (1300Hz and 2100Hz) */
- unsigned char ophasep; /* phase (0-79) for 1200 bps */
- unsigned char obyte; /* byte being sent */
- unsigned int opause; /* silent pause before sending (in sample periods) */
- unsigned char obitp; /* bit in byte */
- unsigned char osync; /* sync bits to send */
- unsigned char obytep; /* byte in data */
- unsigned char obyten; /* bytes in data */
- unsigned char omsg[256]; /* data buffer (out) */
- unsigned char imsg[200]; /* data buffer (in) */
+ unsigned char hangup; /*!< we are done... */
+ unsigned char err; /*!< set for any errors */
+ unsigned char smsc:1; /*!< we are SMSC */
+ unsigned char rx:1; /*!< this is a received message */
+ char queue[30]; /*!< queue name */
+ char oa[20]; /*!< originating address */
+ char da[20]; /*!< destination address */
+ time_t scts; /*!< time stamp, UTC */
+ unsigned char pid; /*!< protocol ID */
+ unsigned char dcs; /*!< data coding scheme */
+ short mr; /*!< message reference - actually a byte, but usde -1 for not set */
+ int udl; /*!< user data length */
+ int udhl; /*!< user data header length */
+ unsigned char srr:1; /*!< Status Report request */
+ unsigned char udhi:1; /*!< User Data Header required, even if length 0 */
+ unsigned char rp:1; /*!< Reply Path */
+ unsigned int vp; /*!< validity period in minutes, 0 for not set */
+ unsigned short ud[SMSLEN]; /*!< user data (message), UCS-2 coded */
+ unsigned char udh[SMSLEN]; /*!< user data header */
+ char cli[20]; /*!< caller ID */
+ unsigned char ophase; /*!< phase (0-79) for 0 and 1 frequencies (1300Hz and 2100Hz) */
+ unsigned char ophasep; /*!< phase (0-79) for 1200 bps */
+ unsigned char obyte; /*!< byte being sent */
+ unsigned int opause; /*!< silent pause before sending (in sample periods) */
+ unsigned char obitp; /*!< bit in byte */
+ unsigned char osync; /*!< sync bits to send */
+ unsigned char obytep; /*!< byte in data */
+ unsigned char obyten; /*!< bytes in data */
+ unsigned char omsg[256]; /*!< data buffer (out) */
+ unsigned char imsg[200]; /*!< data buffer (in) */
signed long long ims0,
imc0,
ims1,
- imc1; /* magnitude averages sin/cos 0/1 */
+ imc1; /*!< magnitude averages sin/cos 0/1 */
unsigned int idle;
- unsigned short imag; /* signal level */
+ unsigned short imag; /*!< signal level */
unsigned char ips0,
ips1,
ipc0,
- ipc1; /* phase sin/cos 0/1 */
- unsigned char ibitl; /* last bit */
- unsigned char ibitc; /* bit run length count */
- unsigned char iphasep; /* bit phase (0-79) for 1200 bps */
- unsigned char ibitn; /* bit number in byte being received */
- unsigned char ibytev; /* byte value being received */
- unsigned char ibytep; /* byte pointer in messafe */
- unsigned char ibytec; /* byte checksum for message */
- unsigned char ierr; /* error flag */
- unsigned char ibith; /* history of last bits */
+ ipc1; /*!< phase sin/cos 0/1 */
+ unsigned char ibitl; /*!< last bit */
+ unsigned char ibitc; /*!< bit run length count */
+ unsigned char iphasep; /*!< bit phase (0-79) for 1200 bps */
+ unsigned char ibitn; /*!< bit number in byte being received */
+ unsigned char ibytev; /*!< byte value being received */
+ unsigned char ibytep; /*!< byte pointer in messafe */
+ unsigned char ibytec; /*!< byte checksum for message */
+ unsigned char ierr; /*!< error flag */
+ unsigned char ibith; /*!< history of last bits */
unsigned char ibitt; /* total of 1's in last 3 bites */
/* more to go here */
} sms_t;
Modified: team/murf/bug6334/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6334/apps/app_voicemail.c?view=diff&rev=48337&r1=48336&r2=48337
==============================================================================
--- team/murf/bug6334/apps/app_voicemail.c (original)
+++ team/murf/bug6334/apps/app_voicemail.c Wed Dec 6 14:19:08 2006
@@ -143,6 +143,7 @@
/* Don't modify these here; set your umask at runtime instead */
#define VOICEMAIL_DIR_MODE 0777
[... 4194 lines stripped ...]
More information about the asterisk-commits
mailing list