[svn-commits] branch bweschke/queue_improvements r19056 - in
/team/bweschke/queue_improveme...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon Apr 10 19:24:03 MST 2006
Author: bweschke
Date: Mon Apr 10 21:23:29 2006
New Revision: 19056
URL: http://svn.digium.com/view/asterisk?rev=19056&view=rev
Log:
Merged revisions 18022-18025,18033,18056-18060,18090,18130,18161,18190,18192,18221,18261-18262,18307,18309,18342,18369-18371,18373,18403,18437,18492-18493,18495,18541,18552,18572,18574,18603,18607,18639,18666,18693-18694,18704,18721-18723,18755,18784-18793,18797,18799-18800,18835,18867,18909,18940,18977,18979,19009 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r18022 | oej | 2006-04-06 15:16:08 -0500 (Thu, 06 Apr 2006) | 3 lines
Implement a handle_response_refer function to take care of responses
to outbound REFERS. Not that common, but still needed.
................
r18023 | bweschke | 2006-04-06 15:23:18 -0500 (Thu, 06 Apr 2006) | 3 lines
Fix a problem where if the channel was hungup during detection, the application wouldn't block indefinitely looking for another frame from that channel. Don't try to do frame size analysis on a frame that isn't voice, only report DEBUG and VERBOSE msgs to the logger channels when the DEBUG and VERBOSE settings are high enough to require it, and some other minor cleanups.
................
r18024 | oej | 2006-04-06 15:36:25 -0500 (Thu, 06 Apr 2006) | 3 lines
- Implement handle_request_notify to handle incoming NOTIFY requests
and respond properly to them.
................
r18025 | bweschke | 2006-04-06 15:37:29 -0500 (Thu, 06 Apr 2006) | 3 lines
More code optimizations. Thanks kpfleming!
................
r18033 | oej | 2006-04-06 16:01:06 -0500 (Thu, 06 Apr 2006) | 3 lines
- Don't change channel direction on re-invites
- Don't re-initialize initreq on re-invites
................
r18056 | oej | 2006-04-06 16:13:32 -0500 (Thu, 06 Apr 2006) | 2 lines
Small fixes to handle_request_invite
................
r18057 | oej | 2006-04-06 16:18:12 -0500 (Thu, 06 Apr 2006) | 2 lines
Small changes to parse_sip_options
................
r18058 | oej | 2006-04-06 16:29:54 -0500 (Thu, 06 Apr 2006) | 2 lines
Improved handling of 491 responses
................
r18059 | oej | 2006-04-06 16:33:39 -0500 (Thu, 06 Apr 2006) | 3 lines
Add "NewChan" event to history to track the birth of a new ast_chan from a
SIP invite
................
r18060 | oej | 2006-04-06 16:49:24 -0500 (Thu, 06 Apr 2006) | 2 lines
Cosmetic update for outbound REFERs
................
r18090 | kpfleming | 2006-04-06 17:16:23 -0500 (Thu, 06 Apr 2006) | 11 lines
Merged revisions 18087 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r18087 | kpfleming | 2006-04-06 17:04:58 -0500 (Thu, 06 Apr 2006) | 3 lines
don't try to support 'i' or 'r' options if chan_zap is not loaded, and warn the user when they attempt to use them (issue #6675)
update application help text to more clearly define when Zaptel and chan_zap are required
........
................
r18130 | oej | 2006-04-07 02:04:05 -0500 (Fri, 07 Apr 2006) | 4 lines
Issue #6580 - Unify directory definitions to one section of Makefile (casper)
- Maybe we should define proper directories for OS/X too?
- Should OpenBSD and NetBSD follow the FreeBSD rules?
................
r18161 | oej | 2006-04-07 03:19:52 -0500 (Fri, 07 Apr 2006) | 3 lines
Issue #6674: Set the URI correctly on BYEs when we have an incoming call
Reported by aubergine, fix by oej
................
r18190 | crichter | 2006-04-07 04:31:27 -0500 (Fri, 07 Apr 2006) | 1 line
fixed a bridging-endless-loop also fixed the rdnis is not exported issue
................
r18192 | crichter | 2006-04-07 04:46:38 -0500 (Fri, 07 Apr 2006) | 1 line
................
r18221 | crichter | 2006-04-07 07:03:51 -0500 (Fri, 07 Apr 2006) | 1 line
sorry litle mistake
................
r18261 | oej | 2006-04-07 09:30:14 -0500 (Fri, 07 Apr 2006) | 4 lines
Import of revistion 18250 from 1.2
- Fix minor memory leak
- Add proper cause codes on memory allocation failures
................
r18262 | oej | 2006-04-07 09:42:25 -0500 (Fri, 07 Apr 2006) | 4 lines
- Add cause code for format error
- Change to SWITCH_CONGESTION instead of CONGESTION
(imported from 1.2)
................
r18307 | oej | 2006-04-07 11:22:28 -0500 (Fri, 07 Apr 2006) | 4 lines
- sip_alloc failures are also caused by too few available file descriptors, so we can not
open socket for RTP (audio/video/rtcp).
Error message change to clarify.
................
r18309 | russell | 2006-04-07 11:28:50 -0500 (Fri, 07 Apr 2006) | 3 lines
change a couple uses of !strlen() to ast_strlen_zero(). Oddly enough, one of
these used to be this way and got changed ...
................
r18342 | oej | 2006-04-07 13:52:23 -0500 (Fri, 07 Apr 2006) | 2 lines
Hmm. What is that keyword?? Let me see... Wait... Maybe... Ahh! OOPS!
................
r18369 | oej | 2006-04-07 14:11:22 -0500 (Fri, 07 Apr 2006) | 4 lines
Issue #6899 - remove OSP support code from chan_sip.c and app_dial.c
- implement all functions through internal APIs in res_osp.c and app_osplookup.c
(homesick)
................
r18370 | oej | 2006-04-07 14:25:19 -0500 (Fri, 07 Apr 2006) | 2 lines
Add some more information to SIP history
................
r18371 | oej | 2006-04-07 14:36:44 -0500 (Fri, 07 Apr 2006) | 2 lines
make history easier to read
................
r18373 | oej | 2006-04-07 14:46:50 -0500 (Fri, 07 Apr 2006) | 3 lines
Add history events for re-invites
(need to nail this issue...)
................
r18403 | oej | 2006-04-07 15:19:44 -0500 (Fri, 07 Apr 2006) | 2 lines
-Fixing some debugging messages in history and console
................
r18437 | tilghman | 2006-04-07 17:11:12 -0500 (Fri, 07 Apr 2006) | 10 lines
Merged revisions 18436 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r18436 | tilghman | 2006-04-07 17:07:38 -0500 (Fri, 07 Apr 2006) | 2 lines
Bug 6913 - fix for possible buffer overflow
........
................
r18492 | russell | 2006-04-08 14:13:37 -0500 (Sat, 08 Apr 2006) | 3 lines
remove traces of "look", something that does not exist in the tree
(issue #6904)
................
r18493 | russell | 2006-04-08 14:16:38 -0500 (Sat, 08 Apr 2006) | 2 lines
fix bug in smdi config parsing (issue #6908)
................
r18495 | tilghman | 2006-04-08 14:22:29 -0500 (Sat, 08 Apr 2006) | 10 lines
Merged revisions 18494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r18494 | tilghman | 2006-04-08 14:20:45 -0500 (Sat, 08 Apr 2006) | 2 lines
Bug 6914 - .txt file fails to rename on operator out
........
................
r18541 | kpfleming | 2006-04-08 16:40:57 -0500 (Sat, 08 Apr 2006) | 2 lines
merge rizzo's codec module rework (very similar to the format module rework)
................
r18552 | kpfleming | 2006-04-08 17:01:19 -0500 (Sat, 08 Apr 2006) | 2 lines
since the module API is changing, it's a good time to const-ify the description() and key() return values
................
r18572 | kpfleming | 2006-04-08 17:16:34 -0500 (Sat, 08 Apr 2006) | 2 lines
a few cleanups from the last commit
................
r18574 | kpfleming | 2006-04-08 17:37:30 -0500 (Sat, 08 Apr 2006) | 2 lines
update module license key text and update loader to accept it
................
r18603 | oej | 2006-04-09 13:53:46 -0500 (Sun, 09 Apr 2006) | 2 lines
Issue 6919 - clarify error message
................
r18607 | oej | 2006-04-09 13:57:25 -0500 (Sun, 09 Apr 2006) | 2 lines
Issue 6917 - some cleanups for res_config_pgsql.c (mithraen)
................
r18639 | rizzo | 2006-04-09 17:31:38 -0500 (Sun, 09 Apr 2006) | 3 lines
rename FR_SET_BUF to AST_FRAME_SET_BUFFER
................
r18666 | rizzo | 2006-04-09 18:16:29 -0500 (Sun, 09 Apr 2006) | 5 lines
a bunch of trivial code normalizations (removal of unnecessary
casts and parentheses, formatting fixes, pointing out replicated
code and so on). No functional changes.
................
r18693 | russell | 2006-04-09 20:51:47 -0500 (Sun, 09 Apr 2006) | 8 lines
add back braces that were removed in a recent commit that leave a bunch of
nested statements in a block without branches, which is a violation of the
coding guidelines.
As a matter of fact, this module violates the coding guidelines in multiple
ways that including formatting and code issues. In my opinion, this module
should not have been merged into the trunk in this form.
................
r18694 | russell | 2006-04-09 20:54:13 -0500 (Sun, 09 Apr 2006) | 2 lines
fix typo in the provided indent command
................
r18704 | russell | 2006-04-09 21:01:39 -0500 (Sun, 09 Apr 2006) | 3 lines
run the module through indent to fix the formatting issues that violate the
coding guidelines
................
r18721 | russell | 2006-04-09 21:05:59 -0500 (Sun, 09 Apr 2006) | 6 lines
Instead of using strncpy, use ast_copy_string. Also, in the case of copying a
constant string into a buffer that we know is big enough, don't use a length
limited copy at all, use strcpy.
... as stated in the coding guidelines.
................
r18722 | russell | 2006-04-09 21:15:47 -0500 (Sun, 09 Apr 2006) | 4 lines
use ast_*alloc and don't create duplicated error messages.
... as stated in the coding guidelines.
................
r18723 | russell | 2006-04-09 21:19:58 -0500 (Sun, 09 Apr 2006) | 2 lines
remove a couple more unnecessary "out of memory" error messages
................
r18755 | tilghman | 2006-04-10 02:48:52 -0500 (Mon, 10 Apr 2006) | 2 lines
Bug 6829 - asprintf for Solaris
................
r18784 | rizzo | 2006-04-10 04:53:22 -0500 (Mon, 10 Apr 2006) | 5 lines
another batch of minor code simplifications
(moving repeated expressions into a function, const on
some arguments)
................
r18785 | oej | 2006-04-10 05:01:14 -0500 (Mon, 10 Apr 2006) | 2 lines
Re-instate removed comment
................
r18786 | rizzo | 2006-04-10 05:22:42 -0500 (Mon, 10 Apr 2006) | 4 lines
more cleanup: remove useless braces, replace "if" with "?",
localize a couple of variables, remove trailing whitespace.
................
r18787 | rizzo | 2006-04-10 05:30:38 -0500 (Mon, 10 Apr 2006) | 8 lines
struct sip_request cleanup:
- remove a debug field that was read but never set, so it was basically
unused as well as the code testing it (also removed);
- make scalar fields contiguous so any array overflow will be
less harmful;
................
r18788 | rizzo | 2006-04-10 05:40:13 -0500 (Mon, 10 Apr 2006) | 6 lines
- describe how sip packets are stored internally;
- remove useless braces or local variables;
- simplify some code sequences;
- mark with XXX a possible locking issue.
................
r18789 | rizzo | 2006-04-10 06:04:04 -0500 (Mon, 10 Apr 2006) | 5 lines
constify get_header(), which let me find out and fix one bug (overwriting
a string in the buffer) and finding out another one (not fixed yet,
just marked XXX).
................
r18790 | rizzo | 2006-04-10 06:19:14 -0500 (Mon, 10 Apr 2006) | 3 lines
constify get_sdp*() and friends.
................
r18791 | rizzo | 2006-04-10 06:36:02 -0500 (Mon, 10 Apr 2006) | 6 lines
- localize 'struct cfalias' into the only function using it;
- remove duplicate code to walk through sdp packets, replacing
sdpLineNum_iterator_init(&foo); with "foo = 0";
- remove duplicate code to test ast_test_flag(&p->flags[0], SIP_NAT_ROUTE);
................
r18792 | rizzo | 2006-04-10 06:57:40 -0500 (Mon, 10 Apr 2006) | 13 lines
- constification of some functions (args and return values):
transmit_response_reliable()
hangup_cause2sip()
- remove useless braces;
- add comments on some slightly cryptic code segments
- mark XXX possible critical pieces of code.
- remove an unneeded string termination after ast_copy_string
- mark usage of some rarely used functions;
- use strsep() instead of emulating it inline;
- replace magic constants with sizeof(array)
................
r18793 | rizzo | 2006-04-10 07:20:57 -0500 (Mon, 10 Apr 2006) | 6 lines
- staticize gettag() complete_sip_peer() get_calleridname() arguments;
- use strsep() instead of strchr() where appropriate
- constify some args and add comments.
- remove a conditional near line 1940 - we already know what to use.
................
r18797 | oej | 2006-04-10 08:19:36 -0500 (Mon, 10 Apr 2006) | 2 lines
Small fix
................
r18799 | oej | 2006-04-10 08:43:54 -0500 (Mon, 10 Apr 2006) | 2 lines
Making sure that cancel destroy is only executed once...
................
r18800 | crichter | 2006-04-10 09:09:17 -0500 (Mon, 10 Apr 2006) | 1 line
we send nearly everytime a RELEASE, only if we for sure know, that it's a TE and we did create the call we don't to hear the Inband Info
................
r18835 | crichter | 2006-04-10 11:50:20 -0500 (Mon, 10 Apr 2006) | 1 line
fixed some issues, that appear at higher load
................
r18867 | bweschke | 2006-04-10 12:32:29 -0500 (Mon, 10 Apr 2006) | 10 lines
Merged revisions 18866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r18866 | bweschke | 2006-04-10 12:29:51 -0500 (Mon, 10 Apr 2006) | 2 lines
Don't say that we can pass an 'exten' argument in the documentation of Park() when we really cannot. #6902 (opsys)
........
................
r18909 | oej | 2006-04-10 14:55:39 -0500 (Mon, 10 Apr 2006) | 2 lines
Resolve conflicts, prepare for next batch of conflicts
................
r18940 | oej | 2006-04-10 15:18:14 -0500 (Mon, 10 Apr 2006) | 2 lines
Fixup fixup - add some debugging and error handling
................
r18977 | kpfleming | 2006-04-10 18:01:22 -0500 (Mon, 10 Apr 2006) | 2 lines
remove support for BYEXTENSION (which nobody even knows about anymore)
................
r18979 | file | 2006-04-10 18:29:50 -0500 (Mon, 10 Apr 2006) | 2 lines
Presenting a revised data stores and oh my, a generic speech recognition API! I wonder what we can do with this now...
................
r19009 | bweschke | 2006-04-10 20:12:13 -0500 (Mon, 10 Apr 2006) | 11 lines
Merged revisions 19008 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r19008 | bweschke | 2006-04-10 20:05:01 -0500 (Mon, 10 Apr 2006) | 3 lines
When using the silence detector in ast_play_and_record() and ast_play_and_prepend(), the truncation code never gets called to remove the detected silence, because the value of res is zero when control gets to that point. #6903 w/some mods (softins)
........
................
Added:
team/bweschke/queue_improvements/apps/app_speech_utils.c (props changed)
- copied unchanged from r19009, trunk/apps/app_speech_utils.c
team/bweschke/queue_improvements/doc/datastores.txt (props changed)
- copied unchanged from r19009, trunk/doc/datastores.txt
team/bweschke/queue_improvements/doc/speechrec.txt (props changed)
- copied unchanged from r19009, trunk/doc/speechrec.txt
team/bweschke/queue_improvements/include/asterisk/speech.h (props changed)
- copied unchanged from r19009, trunk/include/asterisk/speech.h
team/bweschke/queue_improvements/res/res_speech.c (props changed)
- copied unchanged from r19009, trunk/res/res_speech.c
Modified:
team/bweschke/queue_improvements/.cleancount
team/bweschke/queue_improvements/Makefile
team/bweschke/queue_improvements/UPGRADE.txt
team/bweschke/queue_improvements/app.c
team/bweschke/queue_improvements/apps/Makefile
team/bweschke/queue_improvements/apps/app_adsiprog.c
team/bweschke/queue_improvements/apps/app_alarmreceiver.c
team/bweschke/queue_improvements/apps/app_amd.c
team/bweschke/queue_improvements/apps/app_authenticate.c
team/bweschke/queue_improvements/apps/app_cdr.c
team/bweschke/queue_improvements/apps/app_chanisavail.c
team/bweschke/queue_improvements/apps/app_channelredirect.c
team/bweschke/queue_improvements/apps/app_chanspy.c
team/bweschke/queue_improvements/apps/app_controlplayback.c
team/bweschke/queue_improvements/apps/app_db.c
team/bweschke/queue_improvements/apps/app_dial.c
team/bweschke/queue_improvements/apps/app_dictate.c
team/bweschke/queue_improvements/apps/app_directed_pickup.c
team/bweschke/queue_improvements/apps/app_directory.c
team/bweschke/queue_improvements/apps/app_disa.c
team/bweschke/queue_improvements/apps/app_dumpchan.c
team/bweschke/queue_improvements/apps/app_echo.c
team/bweschke/queue_improvements/apps/app_exec.c
team/bweschke/queue_improvements/apps/app_externalivr.c
team/bweschke/queue_improvements/apps/app_festival.c
team/bweschke/queue_improvements/apps/app_flash.c
team/bweschke/queue_improvements/apps/app_forkcdr.c
team/bweschke/queue_improvements/apps/app_getcpeid.c
team/bweschke/queue_improvements/apps/app_hasnewvoicemail.c
team/bweschke/queue_improvements/apps/app_ices.c
team/bweschke/queue_improvements/apps/app_image.c
team/bweschke/queue_improvements/apps/app_ivrdemo.c
team/bweschke/queue_improvements/apps/app_lookupblacklist.c
team/bweschke/queue_improvements/apps/app_lookupcidname.c
team/bweschke/queue_improvements/apps/app_macro.c
team/bweschke/queue_improvements/apps/app_meetme.c
team/bweschke/queue_improvements/apps/app_milliwatt.c
team/bweschke/queue_improvements/apps/app_mixmonitor.c
team/bweschke/queue_improvements/apps/app_morsecode.c
team/bweschke/queue_improvements/apps/app_mp3.c
team/bweschke/queue_improvements/apps/app_nbscat.c
team/bweschke/queue_improvements/apps/app_osplookup.c
team/bweschke/queue_improvements/apps/app_page.c
team/bweschke/queue_improvements/apps/app_parkandannounce.c
team/bweschke/queue_improvements/apps/app_playback.c
team/bweschke/queue_improvements/apps/app_privacy.c
team/bweschke/queue_improvements/apps/app_queue.c
team/bweschke/queue_improvements/apps/app_random.c
team/bweschke/queue_improvements/apps/app_read.c
team/bweschke/queue_improvements/apps/app_readfile.c
team/bweschke/queue_improvements/apps/app_realtime.c
team/bweschke/queue_improvements/apps/app_record.c
team/bweschke/queue_improvements/apps/app_rpt.c
team/bweschke/queue_improvements/apps/app_sayunixtime.c
team/bweschke/queue_improvements/apps/app_senddtmf.c
team/bweschke/queue_improvements/apps/app_sendtext.c
team/bweschke/queue_improvements/apps/app_setcallerid.c
team/bweschke/queue_improvements/apps/app_setcdruserfield.c
team/bweschke/queue_improvements/apps/app_settransfercapability.c
team/bweschke/queue_improvements/apps/app_skel.c
team/bweschke/queue_improvements/apps/app_sms.c
team/bweschke/queue_improvements/apps/app_softhangup.c
team/bweschke/queue_improvements/apps/app_stack.c
team/bweschke/queue_improvements/apps/app_system.c
team/bweschke/queue_improvements/apps/app_talkdetect.c
team/bweschke/queue_improvements/apps/app_test.c
team/bweschke/queue_improvements/apps/app_transfer.c
team/bweschke/queue_improvements/apps/app_url.c
team/bweschke/queue_improvements/apps/app_userevent.c
team/bweschke/queue_improvements/apps/app_verbose.c
team/bweschke/queue_improvements/apps/app_voicemail.c
team/bweschke/queue_improvements/apps/app_waitforring.c
team/bweschke/queue_improvements/apps/app_waitforsilence.c
team/bweschke/queue_improvements/apps/app_while.c
team/bweschke/queue_improvements/apps/app_zapateller.c
team/bweschke/queue_improvements/apps/app_zapbarge.c
team/bweschke/queue_improvements/apps/app_zapras.c
team/bweschke/queue_improvements/apps/app_zapscan.c
team/bweschke/queue_improvements/cdr.c
team/bweschke/queue_improvements/channel.c
team/bweschke/queue_improvements/channels/chan_agent.c
team/bweschke/queue_improvements/channels/chan_alsa.c
team/bweschke/queue_improvements/channels/chan_features.c
team/bweschke/queue_improvements/channels/chan_h323.c
team/bweschke/queue_improvements/channels/chan_iax2.c
team/bweschke/queue_improvements/channels/chan_local.c
team/bweschke/queue_improvements/channels/chan_mgcp.c
team/bweschke/queue_improvements/channels/chan_misdn.c
team/bweschke/queue_improvements/channels/chan_nbs.c
team/bweschke/queue_improvements/channels/chan_oss.c
team/bweschke/queue_improvements/channels/chan_phone.c
team/bweschke/queue_improvements/channels/chan_sip.c
team/bweschke/queue_improvements/channels/chan_skinny.c
team/bweschke/queue_improvements/channels/chan_vpb.c
team/bweschke/queue_improvements/channels/chan_zap.c
team/bweschke/queue_improvements/channels/misdn/isdn_lib.c
team/bweschke/queue_improvements/codecs/codec_a_mu.c
team/bweschke/queue_improvements/codecs/codec_adpcm.c
team/bweschke/queue_improvements/codecs/codec_alaw.c
team/bweschke/queue_improvements/codecs/codec_g723_1.c
team/bweschke/queue_improvements/codecs/codec_g726.c
team/bweschke/queue_improvements/codecs/codec_ilbc.c
team/bweschke/queue_improvements/codecs/codec_lpc10.c
team/bweschke/queue_improvements/codecs/codec_speex.c
team/bweschke/queue_improvements/codecs/codec_ulaw.c
team/bweschke/queue_improvements/config.c
team/bweschke/queue_improvements/configs/extensions.conf.sample
team/bweschke/queue_improvements/configs/iax.conf.sample
team/bweschke/queue_improvements/configs/meetme.conf.sample
team/bweschke/queue_improvements/configs/mgcp.conf.sample
team/bweschke/queue_improvements/configs/osp.conf.sample
team/bweschke/queue_improvements/configs/queues.conf.sample
team/bweschke/queue_improvements/configs/sip.conf.sample
team/bweschke/queue_improvements/configs/skinny.conf.sample
team/bweschke/queue_improvements/configs/voicemail.conf.sample
team/bweschke/queue_improvements/doc/CODING-GUIDELINES
team/bweschke/queue_improvements/doc/channelvariables.txt
team/bweschke/queue_improvements/file.c
team/bweschke/queue_improvements/funcs/func_base64.c
team/bweschke/queue_improvements/funcs/func_callerid.c
team/bweschke/queue_improvements/funcs/func_cdr.c
team/bweschke/queue_improvements/funcs/func_channel.c
team/bweschke/queue_improvements/funcs/func_curl.c
team/bweschke/queue_improvements/funcs/func_cut.c
team/bweschke/queue_improvements/funcs/func_db.c
team/bweschke/queue_improvements/funcs/func_enum.c
team/bweschke/queue_improvements/funcs/func_env.c
team/bweschke/queue_improvements/funcs/func_groupcount.c
team/bweschke/queue_improvements/funcs/func_language.c
team/bweschke/queue_improvements/funcs/func_logic.c
team/bweschke/queue_improvements/funcs/func_math.c
team/bweschke/queue_improvements/funcs/func_md5.c
team/bweschke/queue_improvements/funcs/func_moh.c
team/bweschke/queue_improvements/funcs/func_odbc.c
team/bweschke/queue_improvements/funcs/func_rand.c
team/bweschke/queue_improvements/funcs/func_sha1.c
team/bweschke/queue_improvements/funcs/func_strings.c
team/bweschke/queue_improvements/funcs/func_timeout.c
team/bweschke/queue_improvements/funcs/func_uri.c
team/bweschke/queue_improvements/include/asterisk/astosp.h
team/bweschke/queue_improvements/include/asterisk/channel.h
team/bweschke/queue_improvements/include/asterisk/compat.h
team/bweschke/queue_improvements/include/asterisk/frame.h
team/bweschke/queue_improvements/include/asterisk/module.h
team/bweschke/queue_improvements/include/asterisk/translate.h
team/bweschke/queue_improvements/loader.c
team/bweschke/queue_improvements/pbx.c
team/bweschke/queue_improvements/pbx/pbx_ael.c
team/bweschke/queue_improvements/pbx/pbx_config.c
team/bweschke/queue_improvements/pbx/pbx_dundi.c
team/bweschke/queue_improvements/pbx/pbx_gtkconsole.c
team/bweschke/queue_improvements/pbx/pbx_loopback.c
team/bweschke/queue_improvements/pbx/pbx_realtime.c
team/bweschke/queue_improvements/pbx/pbx_spool.c
team/bweschke/queue_improvements/res/res_adsi.c
team/bweschke/queue_improvements/res/res_agi.c
team/bweschke/queue_improvements/res/res_clioriginate.c
team/bweschke/queue_improvements/res/res_config_odbc.c
team/bweschke/queue_improvements/res/res_config_pgsql.c
team/bweschke/queue_improvements/res/res_convert.c
team/bweschke/queue_improvements/res/res_crypto.c
team/bweschke/queue_improvements/res/res_features.c
team/bweschke/queue_improvements/res/res_indications.c
team/bweschke/queue_improvements/res/res_monitor.c
team/bweschke/queue_improvements/res/res_musiconhold.c
team/bweschke/queue_improvements/res/res_odbc.c
team/bweschke/queue_improvements/res/res_osp.c
team/bweschke/queue_improvements/res/res_smdi.c
team/bweschke/queue_improvements/res/res_snmp.c
team/bweschke/queue_improvements/sched.c
team/bweschke/queue_improvements/translate.c
team/bweschke/queue_improvements/utils.c
Modified: team/bweschke/queue_improvements/.cleancount
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/.cleancount?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/.cleancount (original)
+++ team/bweschke/queue_improvements/.cleancount Mon Apr 10 21:23:29 2006
@@ -1,1 +1,1 @@
-13
+14
Modified: team/bweschke/queue_improvements/Makefile
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/Makefile?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/Makefile (original)
+++ team/bweschke/queue_improvements/Makefile Mon Apr 10 21:23:29 2006
@@ -15,23 +15,33 @@
# Create OPTIONS variable
OPTIONS=
+
# If cross compiling, define these to suit
-# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_ARCH=Linux
+#CROSS_PROC=arm
+#SUB_PROC=xscale # or maverick
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
CC=$(CROSS_COMPILE)gcc
HOST_CC=gcc
-# CROSS_ARCH=Linux
-# CROSS_PROC=arm
-# SUB_PROC=xscale # or maverick
ifeq ($(CROSS_COMPILE),)
OSARCH=$(shell uname -s)
- OSREV=$(shell uname -r)
- MARCH=$(shell uname -m)
+ PROC?=$(shell uname -m)
else
OSARCH=$(CROSS_ARCH)
- OSREV=$(CROSS_REV)
+ PROC=$(CROSS_PROC)
endif
PWD=$(shell pwd)
@@ -40,13 +50,13 @@
MAKETOPLEVEL?=$(MAKELEVEL)
ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
-######### More GSM codec optimization
-######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-######### which support MMX instructions. This should be newer pentiums,
-######### ppro's, etc, as well as the AMD K6 and K7.
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions. This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.
#K6OPT = -DK6OPT
-#Tell gcc to optimize the code
+# Tell gcc to optimize the code
OPTIMIZE+=-O6
else
# Stack backtraces, while useful for debugging, are incompatible with optimizations
@@ -55,14 +65,13 @@
endif
endif
-#Overwite config files on "make samples"
+# Overwite config files on "make samples"
OVERWRITE=y
-#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
DEBUG=-g3 #-pg
-#Set NOCRYPTO to yes if you do not want to have crypto support or
-#dependencies
+# Set NOCRYPTO to yes if you do not want to have crypto support or dependencies
#NOCRYPTO=yes
# If you are running a radio application, define RADIO_RELAX so that the DTMF
@@ -71,14 +80,11 @@
# If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
# to reduce the size of certain static buffers
-
#ifneq ($(CROSS_COMPILE),)
#OPTIONS += -DLOW_MEMORY
#endif
-#
# Asterisk SMDI integration
-#
WITH_SMDI = 1
# Optional debugging parameters
@@ -102,7 +108,7 @@
# Files are copied here temporarily during the install process
# For example, make DESTDIR=/tmp/asterisk woud put things in
# /tmp/asterisk/etc/asterisk
-# XXX watch out, put no spaces or comments after the value
+# !!! Watch out, put no spaces or comments after the value !!!
DESTDIR?=
#DESTDIR?=/tmp/asterisk
@@ -118,57 +124,64 @@
# Don't use together with -DBUSYDETECT_TONEONLY
BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
-ifneq ($(OSARCH),SunOS)
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf
+ifeq ($(OSARCH),SunOS)
+ ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
+ ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
+ ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
+ ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
+ ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
+ ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
+ ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
+ ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
+ ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
+ ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+else
+ifeq ($(OSARCH),FreeBSD)
+ PREFIX?=/usr/local
+ ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+ ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+ ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+ ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+ ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+ ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+ ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+ ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+ ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+ ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+else
+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-else
- ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
- ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
- ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
- ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
- ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
- ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
- ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-endif
+endif
+endif
+
+# Asterisk.conf is located in ASTETCDIR or by using the -C flag
+# when starting Asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+
+# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
+HTTP_DOCSDIR=/var/www/html
+# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
+HTTP_CGIDIR=/var/www/cgi-bin
ASTCFLAGS=
# Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-#Uncomment this to use the older DSP routines
+# Uncomment this to use the older DSP routines
#ASTCFLAGS+=-DOLD_DSP_ROUTINES
-
-# Determine by a grep 'DocumentRoot' of your httpd.conf file
-HTTP_DOCSDIR=/var/www/html
-# Determine by a grep 'ScriptAlias' of your httpd.conf file
-HTTP_CGIDIR=/var/www/cgi-bin
# If the file .asterisk.makeopts is present in your home directory, you can
# include all of your favorite Makefile options so that every time you download
@@ -185,12 +198,6 @@
endif
ifeq ($(OSARCH),Linux)
- ifeq ($(CROSS_COMPILE),)
- PROC?=$(shell uname -m)
- else
- PROC=$(CROSS_PROC)
- endif
-
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
@@ -244,7 +251,6 @@
ASTOBJ=-o asterisk
ifeq ($(findstring BSD,$(OSARCH)),BSD)
- PROC=$(shell uname -m)
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
@@ -272,22 +278,6 @@
ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
endif
MPG123TARG=freebsd
-
- # XXX FreeBSD paths
- PREFIX?=/usr/local
- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
- # XXX end FreeBSD paths
-
endif # FreeBSD
ifeq ($(OSARCH),NetBSD)
@@ -312,7 +302,6 @@
ASTLINK=
LIBS+=-lpthread -lncurses -lm -lresolv
ASTSBINDIR=$(MODULES_DIR)
- PROC=$(shell uname -m)
endif
ifndef WITHOUT_ZAPTEL
@@ -399,12 +388,12 @@
ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
# Mac on Intel CoreDuo does not need poll compatibility layer
- ifneq ($(MARCH),i386)
+ ifneq ($(PROC),i386)
OBJS+=poll.o
ASTCFLAGS+=-DPOLLCOMPAT
endif
else
-#These are used for all but Darwin
+# These are used for all but Darwin
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -967,11 +956,9 @@
@echo " + $(MAKE) uninstall-all +"
@echo " +-------------------------------------------+"
-
uninstall-all: _uninstall
rm -rf $(DESTDIR)$(ASTLIBDIR)
rm -rf $(DESTDIR)$(ASTVARLIBDIR)
rm -rf $(DESTDIR)$(ASTSPOOLDIR)
rm -rf $(DESTDIR)$(ASTETCDIR)
rm -rf $(DESTDIR)$(ASTLOGDIR)
-
Modified: team/bweschke/queue_improvements/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/UPGRADE.txt?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/UPGRADE.txt (original)
+++ team/bweschke/queue_improvements/UPGRADE.txt Mon Apr 10 21:23:29 2006
@@ -1,5 +1,10 @@
Information for Upgrading From Previous Asterisk Releases
=========================================================
+
+PBX Core:
+
+* The (very old and undocumented) ability to use BYEXTENSION for dialing
+ instead of ${EXTEN} has been removed.
Command Line Interface:
@@ -29,6 +34,8 @@
"noanswer" will not work. Use s or n. Also there is a new feature i, for
using indication tones, so typing in skip would give you unexpected results.
+* OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
+
Variables:
* The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
@@ -39,6 +46,10 @@
* The CDR-CSV variables uniqueid, userfield, and basing time on GMT are now
adjustable from cdr.conf, instead of recompiling.
+
+* OSP applications exports several new variables, ${OSPINHANDLE},
+ ${OSPOUTHANDLE}, ${OSPINTOKEN}, ${OSPOUTTOKEN}, ${OSPCALLING},
+ ${OSPINTIMELIMIT}, and ${OSPOUTTIMELIMIT}
Functions:
@@ -66,6 +77,10 @@
* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
+* OSP support code is removed from SIP channel to OSP applications. ospauth
+ option in sip.conf is removed to osp.conf as authpolicy. allowguest option
+ in sip.conf cannot be set as osp anymore.
+
Installation:
* On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf
Modified: team/bweschke/queue_improvements/app.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/app.c?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/app.c (original)
+++ team/bweschke/queue_improvements/app.c Mon Apr 10 21:23:29 2006
@@ -552,7 +552,6 @@
struct ast_dsp *sildet=NULL; /* silence detector dsp */
int totalsilence = 0;
int dspsilence = 0;
- int gotsilence = 0; /* did we timeout for silence? */
int rfmt=0;
struct ast_silence_generator *silgen = NULL;
@@ -675,7 +674,7 @@
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
ast_frfree(f);
- gotsilence = 1;
+ res = 'S';
outmsg=2;
break;
}
@@ -779,7 +778,6 @@
struct ast_dsp *sildet; /* silence detector dsp */
int totalsilence = 0;
int dspsilence = 0;
- int gotsilence = 0; /* did we timeout for silence? */
int rfmt=0;
char prependfile[80];
@@ -898,7 +896,7 @@
if (option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
ast_frfree(f);
- gotsilence = 1;
+ res = 'S';
outmsg=2;
break;
}
Modified: team/bweschke/queue_improvements/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/apps/Makefile?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/apps/Makefile (original)
+++ team/bweschke/queue_improvements/apps/Makefile Mon Apr 10 21:23:29 2006
@@ -59,7 +59,7 @@
rm -f .depend
clean: clean-depend
- rm -f *.so *.o look
+ rm -f *.so *.o
%.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -75,14 +75,10 @@
uninstall:
-look: look.c
- $(CC) -pipe -O6 -g look.c -o look -lncurses
-
ifeq (SunOS,$(shell uname))
app_chanspy.so: app_chanspy.o
$(CC) $(SOLINK) -o $@ $< -lrt
endif
-
ifneq ($(wildcard .depend),)
include .depend
Modified: team/bweschke/queue_improvements/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/apps/app_adsiprog.c?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/apps/app_adsiprog.c (original)
+++ team/bweschke/queue_improvements/apps/app_adsiprog.c Mon Apr 10 21:23:29 2006
@@ -1586,7 +1586,7 @@
return ast_register_application(app, adsi_exec, synopsis, descrip);
}
-char *description(void)
+const char *description(void)
{
return tdesc;
}
@@ -1598,7 +1598,7 @@
return res;
}
-char *key()
+const char *key()
{
return ASTERISK_GPL_KEY;
}
Modified: team/bweschke/queue_improvements/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/queue_improvements/apps/app_alarmreceiver.c?rev=19056&r1=19055&r2=19056&view=diff
==============================================================================
--- team/bweschke/queue_improvements/apps/app_alarmreceiver.c (original)
[... 20031 lines stripped ...]
More information about the svn-commits
mailing list