[asterisk-commits] nadi: branch group/trunk-cm-csel-hash r48352 - in
/team/group/trunk-cm-csel-h...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Dec 7 09:59:12 MST 2006
Author: nadi
Date: Thu Dec 7 10:59:11 2006
New Revision: 48352
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48352
Log:
Merged revisions 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,48299-48300,48302-48303,48305-48307,48318,48324-48325,48327,48332,48338,48350 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r48130 | oej | 2006-11-30 10:23:25 +0100 (Do, 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 15:32:52 +0100 (Do, 30 Nov 2006) | 2 lines
Add information on status events
................
r48139 | oej | 2006-11-30 18:15:54 +0100 (Do, 30 Nov 2006) | 2 lines
Adding some generic docs on extension and device states - watchers and providers
................
r48144 | file | 2006-11-30 18:58:53 +0100 (Do, 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 19:20:57 +0100 (Do, 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 19:22:10 +0100 (Do, 30 Nov 2006) | 2 lines
Doxygen updates
................
r48150 | oej | 2006-11-30 19:25:51 +0100 (Do, 30 Nov 2006) | 2 lines
Small update
................
r48153 | file | 2006-11-30 19:49:59 +0100 (Do, 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 20:06:22 +0100 (Do, 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 21:09:46 +0100 (Do, 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 21:29:11 +0100 (Do, 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 21:34:23 +0100 (Do, 30 Nov 2006) | 2 lines
Documentation updates
................
r48167 | oej | 2006-11-30 21:55:43 +0100 (Do, 30 Nov 2006) | 2 lines
Issue #8319 (imported from 1.2, 1.4) - Increment nonce-count properly (noriyuki)
................
r48169 | file | 2006-11-30 22:22:01 +0100 (Do, 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 18:33:56 +0100 (Fr, 01 Dez 2006) | 2 lines
Tiny doxygen improvement
................
r48178 | oej | 2006-12-01 19:16:16 +0100 (Fr, 01 Dez 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 20:41:02 +0100 (Fr, 01 Dez 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 21:26:44 +0100 (Fr, 01 Dez 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 21:49:06 +0100 (Fr, 01 Dez 2006) | 2 lines
Formatting fix
................
r48191 | russell | 2006-12-02 00:20:17 +0100 (Sa, 02 Dez 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-02 00:39:59 +0100 (Sa, 02 Dez 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-02 04:53:02 +0100 (Sa, 02 Dez 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 13:05:40 +0100 (Sa, 02 Dez 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 14:40:13 +0100 (Sa, 02 Dez 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 15:07:20 +0100 (Sa, 02 Dez 2006) | 2 lines
Doxygenification
................
r48208 | oej | 2006-12-02 18:40:58 +0100 (Sa, 02 Dez 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 20:11:02 +0100 (Sa, 02 Dez 2006) | 2 lines
Invitestate updates
................
r48216 | oej | 2006-12-02 21:30:58 +0100 (Sa, 02 Dez 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 21:50:54 +0100 (Sa, 02 Dez 2006) | 3 lines
Removing two .h files means we need to update cleancount to force
make depend again (or ?)
................
r48220 | oej | 2006-12-02 23:03:14 +0100 (Sa, 02 Dez 2006) | 2 lines
Cleaning up handle_response a bit. (Imported from 1.4)
................
r48224 | russell | 2006-12-03 07:35:46 +0100 (So, 03 Dez 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 18:44:12 +0100 (Mo, 04 Dez 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 18:55:38 +0100 (Mo, 04 Dez 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 19:18:07 +0100 (Mo, 04 Dez 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 22:49:38 +0100 (Mo, 04 Dez 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-05 02:39:53 +0100 (Di, 05 Dez 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-05 02:46:14 +0100 (Di, 05 Dez 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 11:52:53 +0100 (Di, 05 Dez 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 12:09:23 +0100 (Di, 05 Dez 2006) | 2 lines
Well, yes...
................
r48266 | transnexus | 2006-12-05 15:33:21 +0100 (Di, 05 Dez 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 17:48:15 +0100 (Di, 05 Dez 2006) | 2 lines
Adding docs on t.38
................
r48271 | oej | 2006-12-05 18:34:55 +0100 (Di, 05 Dez 2006) | 2 lines
Blocking invitestate patch that is already merged to svn trunk.
................
r48273 | oej | 2006-12-05 20:41:26 +0100 (Di, 05 Dez 2006) | 3 lines
Issue #8506 - translate spanish comments in fskmodem to english (according to bug guidelines)
Thanks merbanan!
................
r48276 | qwell | 2006-12-05 21:15:37 +0100 (Di, 05 Dez 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 21:39:13 +0100 (Di, 05 Dez 2006) | 2 lines
Doxygen updates
................
r48280 | qwell | 2006-12-05 21:44:12 +0100 (Di, 05 Dez 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 21:46:26 +0100 (Di, 05 Dez 2006) | 2 lines
Regenerate configure for Qwell's last commit.
................
r48283 | qwell | 2006-12-05 21:52:37 +0100 (Di, 05 Dez 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.
........
................
r48299 | russell | 2006-12-06 08:15:16 +0100 (Mi, 06 Dez 2006) | 3 lines
Make the "usage" member of the ast_cli_entry struct const to resolve a compiler
warning.
................
r48300 | russell | 2006-12-06 08:16:09 +0100 (Mi, 06 Dez 2006) | 2 lines
Instead of creating an unused instance of an unnamed enum, give it a name.
................
r48302 | russell | 2006-12-06 08:23:32 +0100 (Mi, 06 Dez 2006) | 2 lines
Constify a bunch of the usage strings for CLI commands.
................
r48303 | russell | 2006-12-06 08:28:56 +0100 (Mi, 06 Dez 2006) | 2 lines
Staticize one, and Constify a bunch of usage strings for CLI commands.
................
r48305 | russell | 2006-12-06 08:31:28 +0100 (Mi, 06 Dez 2006) | 2 lines
Constify a bunch of usage strings for CLI commands.
................
r48306 | russell | 2006-12-06 08:35:31 +0100 (Mi, 06 Dez 2006) | 2 lines
Constify a bunch of usage strings for CLI commands.
................
r48307 | russell | 2006-12-06 08:39:39 +0100 (Mi, 06 Dez 2006) | 3 lines
Resolve some pointer signedness compiler warnings in app_osplookup, and
constify a bunch of usage strings for CLI commands.
................
r48318 | oej | 2006-12-06 13:34:58 +0100 (Mi, 06 Dez 2006) | 3 lines
Don't send Contact in SIP Messages (imported from 1.2/1.4).
Reported by Gunnar at Omnitor.
................
r48324 | rizzo | 2006-12-06 17:17:57 +0100 (Mi, 06 Dez 2006) | 14 lines
Make externally visible some generic code useful to create
and implement services over tcp and/or tcp-tls.
This commit is nothing more than moving structure definitions
(and documentation) from main/http.c to include/asterisk/http.h
(temporary location until we find a better place), and removing the
'static' qualifier from server_root() and server_start().
The name change (adding the ast_ prefix as a minimum, and then
possibly a more meaningful name) is postponed to future commits.
Does not apply to other versions of asterisk.
................
r48325 | russell | 2006-12-06 17:19:01 +0100 (Mi, 06 Dez 2006) | 19 lines
Merged revisions 48323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48323 | russell | 2006-12-06 11:15:45 -0500 (Wed, 06 Dec 2006) | 11 lines
Merged revisions 48322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48322 | russell | 2006-12-06 11:05:54 -0500 (Wed, 06 Dec 2006) | 3 lines
Fix the name of the rtignoreregexpire option in the sample configuration file.
(issue #8526, arkadia)
........
................
................
r48327 | oej | 2006-12-06 17:54:27 +0100 (Mi, 06 Dez 2006) | 2 lines
Handle multiple 487's correctly
................
r48332 | rizzo | 2006-12-06 19:45:19 +0100 (Mi, 06 Dez 2006) | 23 lines
Part of the transformations necessary to add TLS support,
as described in
http://lists.digium.com/pipermail/asterisk-dev/2006-December/025213.html
In detail, this commit does the following:
b) change the function get_input() to use fread() instead of read()
to collect the data. One can still do the ast_wait_for_input() on
the original descriptor returned by accept().
c) change the function send_string() to work on the FILE *.
As a side effect, this change now really guarantees that
we don't spend more than "writetimeout" milliseconds on
each line sent.
d) modify the function action_command() so that it creates a
temporary file descriptor to be passed to ast_cli_command(),
and then read back the data from the temp file and write it
to the output with send_string(). The code is similar to
what is done in generic_http_callback() to support AMI-over-HTTP.
................
r48338 | rizzo | 2006-12-06 21:46:01 +0100 (Mi, 06 Dez 2006) | 11 lines
remove duplicated code to start the server threads, use
the infrastructure exposed in http.c earlier today.
As a bonus, now we can restart the session on a different
port just reloading the module.
On passing, fix a bug in the handling of 'enabled' in the configuration
file - previously, a missing "enabled=" line in manager.conf meant
"whatever the state was before" instead of a specific value.
................
r48350 | murf | 2006-12-07 17:03:56 +0100 (Do, 07 Dez 2006) | 115 lines
Merged revisions 47986,47995,47997,48001,48003-48004,48008-48014,48016,48018-48019 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r47986 | oej | 2006-11-24 07:00:19 -0700 (Fri, 24 Nov 2006) | 6 lines
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.
................
r47995 | murf | 2006-11-24 10:40:49 -0700 (Fri, 24 Nov 2006) | 1 line
This fix inspired by a patch supplied in bug 8189, which points out problems with the PLC code
................
r47997 | murf | 2006-11-24 11:17:25 -0700 (Fri, 24 Nov 2006) | 1 line
removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly created branches
................
r48001 | rizzo | 2006-11-25 02:02:42 -0700 (Sat, 25 Nov 2006) | 5 lines
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.
................
r48003 | oej | 2006-11-25 02:45:57 -0700 (Sat, 25 Nov 2006) | 9 lines
- 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.
................
r48004 | oej | 2006-11-25 02:48:30 -0700 (Sat, 25 Nov 2006) | 2 lines
Changing ERROR to lesser level. Imported from 1.2/1.4
................
r48008 | rizzo | 2006-11-25 10:37:04 -0700 (Sat, 25 Nov 2006) | 7 lines
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).
................
r48009 | mattf | 2006-11-25 13:30:04 -0700 (Sat, 25 Nov 2006) | 1 line
Updates to show linkset command
................
r48010 | mattf | 2006-11-25 13:54:38 -0700 (Sat, 25 Nov 2006) | 2 lines
Add ss7 show linkset command
................
r48011 | mattf | 2006-11-25 14:32:33 -0700 (Sat, 25 Nov 2006) | 1 line
Make sure we don't send a group reset on a group larger than 32 CICs
................
r48012 | mattf | 2006-11-25 14:35:23 -0700 (Sat, 25 Nov 2006) | 1 line
bug fix
................
r48013 | mattf | 2006-11-25 14:46:58 -0700 (Sat, 25 Nov 2006) | 1 line
Make compiler happier
................
r48014 | mattf | 2006-11-25 14:50:42 -0700 (Sat, 25 Nov 2006) | 1 line
Little fix so we use the right message
................
r48016 | murf | 2006-11-25 17:15:42 -0700 (Sat, 25 Nov 2006) | 9 lines
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.
........
................
r48018 | murf | 2006-11-25 17:31:13 -0700 (Sat, 25 Nov 2006) | 9 lines
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
........
................
r48019 | russell | 2006-11-25 23:55:33 -0700 (Sat, 25 Nov 2006) | 6 lines
- 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.
................
................
Removed:
team/group/trunk-cm-csel-hash/main/coef_in.h
team/group/trunk-cm-csel-hash/main/coef_out.h
Modified:
team/group/trunk-cm-csel-hash/ (props changed)
team/group/trunk-cm-csel-hash/.cleancount
team/group/trunk-cm-csel-hash/Makefile
team/group/trunk-cm-csel-hash/agi/eagi-sphinx-test.c
team/group/trunk-cm-csel-hash/agi/eagi-test.c
team/group/trunk-cm-csel-hash/apps/app_dial.c
team/group/trunk-cm-csel-hash/apps/app_meetme.c
team/group/trunk-cm-csel-hash/apps/app_osplookup.c
team/group/trunk-cm-csel-hash/apps/app_queue.c
team/group/trunk-cm-csel-hash/apps/app_sms.c
team/group/trunk-cm-csel-hash/apps/app_voicemail.c
team/group/trunk-cm-csel-hash/channels/chan_agent.c
team/group/trunk-cm-csel-hash/channels/chan_alsa.c
team/group/trunk-cm-csel-hash/channels/chan_features.c
team/group/trunk-cm-csel-hash/channels/chan_gtalk.c
team/group/trunk-cm-csel-hash/channels/chan_iax2.c
team/group/trunk-cm-csel-hash/channels/chan_local.c
team/group/trunk-cm-csel-hash/channels/chan_mgcp.c
team/group/trunk-cm-csel-hash/channels/chan_oss.c
team/group/trunk-cm-csel-hash/channels/chan_sip.c
team/group/trunk-cm-csel-hash/channels/chan_skinny.c
team/group/trunk-cm-csel-hash/channels/chan_zap.c
team/group/trunk-cm-csel-hash/channels/iax2-provision.c
team/group/trunk-cm-csel-hash/configs/extensions.conf.sample
team/group/trunk-cm-csel-hash/configs/iax.conf.sample
team/group/trunk-cm-csel-hash/configs/sip.conf.sample
team/group/trunk-cm-csel-hash/configs/voicemail.conf.sample
team/group/trunk-cm-csel-hash/configure
team/group/trunk-cm-csel-hash/configure.ac
team/group/trunk-cm-csel-hash/contrib/asterisk-ng-doxygen
team/group/trunk-cm-csel-hash/doc/manager.txt
team/group/trunk-cm-csel-hash/doc/snmp.txt
team/group/trunk-cm-csel-hash/include/asterisk/channel.h
team/group/trunk-cm-csel-hash/include/asterisk/cli.h
team/group/trunk-cm-csel-hash/include/asterisk/devicestate.h
team/group/trunk-cm-csel-hash/include/asterisk/doxyref.h
team/group/trunk-cm-csel-hash/include/asterisk/frame.h
team/group/trunk-cm-csel-hash/include/asterisk/fskmodem.h
team/group/trunk-cm-csel-hash/include/asterisk/http.h
team/group/trunk-cm-csel-hash/include/asterisk/pbx.h
team/group/trunk-cm-csel-hash/include/asterisk/rtp.h
team/group/trunk-cm-csel-hash/include/asterisk/threadstorage.h
team/group/trunk-cm-csel-hash/main/asterisk.c
team/group/trunk-cm-csel-hash/main/callerid.c
team/group/trunk-cm-csel-hash/main/cdr.c
team/group/trunk-cm-csel-hash/main/channel.c
team/group/trunk-cm-csel-hash/main/cli.c
team/group/trunk-cm-csel-hash/main/db.c
team/group/trunk-cm-csel-hash/main/devicestate.c
team/group/trunk-cm-csel-hash/main/file.c
team/group/trunk-cm-csel-hash/main/frame.c
team/group/trunk-cm-csel-hash/main/fskmodem.c
team/group/trunk-cm-csel-hash/main/http.c
team/group/trunk-cm-csel-hash/main/manager.c
team/group/trunk-cm-csel-hash/main/pbx.c
team/group/trunk-cm-csel-hash/main/rtp.c
team/group/trunk-cm-csel-hash/main/tdd.c
team/group/trunk-cm-csel-hash/main/translate.c
team/group/trunk-cm-csel-hash/main/udptl.c
team/group/trunk-cm-csel-hash/makeopts.in
team/group/trunk-cm-csel-hash/pbx/pbx_dundi.c
team/group/trunk-cm-csel-hash/res/res_agi.c
team/group/trunk-cm-csel-hash/res/res_config_pgsql.c
team/group/trunk-cm-csel-hash/res/res_configman.c
team/group/trunk-cm-csel-hash/res/res_crypto.c
team/group/trunk-cm-csel-hash/res/res_features.c
team/group/trunk-cm-csel-hash/res/res_jabber.c
team/group/trunk-cm-csel-hash/res/res_limit.c
team/group/trunk-cm-csel-hash/res/res_odbc.c
team/group/trunk-cm-csel-hash/res/res_realtime.c
team/group/trunk-cm-csel-hash/sounds/Makefile
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec 7 10:59:11 2006
@@ -1,1 +1,1 @@
-/trunk:1-48126
+/trunk:1-48350
Modified: team/group/trunk-cm-csel-hash/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/.cleancount?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/.cleancount (original)
+++ team/group/trunk-cm-csel-hash/.cleancount Thu Dec 7 10:59:11 2006
@@ -1,1 +1,1 @@
-26
+27
Modified: team/group/trunk-cm-csel-hash/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/Makefile?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/Makefile (original)
+++ team/group/trunk-cm-csel-hash/Makefile Thu Dec 7 10:59:11 2006
@@ -57,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
@@ -273,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/group/trunk-cm-csel-hash/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/agi/eagi-sphinx-test.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/agi/eagi-sphinx-test.c (original)
+++ team/group/trunk-cm-csel-hash/agi/eagi-sphinx-test.c Thu Dec 7 10:59:11 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/group/trunk-cm-csel-hash/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/agi/eagi-test.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/agi/eagi-test.c (original)
+++ team/group/trunk-cm-csel-hash/agi/eagi-test.c Thu Dec 7 10:59:11 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/group/trunk-cm-csel-hash/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_dial.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_dial.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_dial.c Thu Dec 7 10:59:11 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/group/trunk-cm-csel-hash/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_meetme.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_meetme.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_meetme.c Thu Dec 7 10:59:11 2006
@@ -900,11 +900,11 @@
return NULL;
}
-static char meetme_usage[] =
+static const char meetme_usage[] =
"Usage: meetme (un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
" Executes a command for the conference or on a conferee\n";
-static char sla_show_usage[] =
+static const char sla_show_usage[] =
"Usage: sla show\n"
" Lists status of all shared line appearances\n";
Modified: team/group/trunk-cm-csel-hash/apps/app_osplookup.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_osplookup.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_osplookup.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_osplookup.c Thu Dec 7 10:59:11 2006
@@ -146,7 +146,7 @@
/* Call ID */
struct osp_callid {
- char buf[OSPC_CALLID_MAXSIZE]; /* Call ID string */
+ unsigned char buf[OSPC_CALLID_MAXSIZE]; /* Call ID string */
unsigned int len; /* Call ID length */
};
Modified: team/group/trunk-cm-csel-hash/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_queue.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_queue.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_queue.c Thu Dec 7 10:59:11 2006
@@ -4633,14 +4633,14 @@
return NULL;
}
-static char queue_show_usage[] =
+static const char queue_show_usage[] =
"Usage: queue show\n"
" Provides summary information on a specified queue.\n";
-static char qam_cmd_usage[] =
+static const char qam_cmd_usage[] =
"Usage: queue add member <channel> to <queue> [penalty <penalty>]\n";
-static char qrm_cmd_usage[] =
+static const char qrm_cmd_usage[] =
"Usage: queue remove member <channel> from <queue>\n";
static struct ast_cli_entry cli_queue[] = {
Modified: team/group/trunk-cm-csel-hash/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_sms.c?view=diff&rev=48352&r1=48351&r2=48352
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_sms.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_sms.c Thu Dec 7 10:59:11 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 */
[... 4807 lines stripped ...]
More information about the asterisk-commits
mailing list