2000-01-06 12:33:15 +00:00
|
|
|
/*
|
2005-09-14 20:46:50 +00:00
|
|
|
* Asterisk -- An open source telephony toolkit.
|
2000-01-06 12:33:15 +00:00
|
|
|
*
|
2007-11-23 15:54:13 +00:00
|
|
|
* Copyright (C) 1999 - 2007, Digium, Inc.
|
2000-01-06 12:33:15 +00:00
|
|
|
*
|
2004-10-02 00:58:31 +00:00
|
|
|
* Mark Spencer <markster@digium.com>
|
2000-01-06 12:33:15 +00:00
|
|
|
*
|
2005-08-03 04:11:52 +00:00
|
|
|
* FreeBSD changes and multiple device support by Luigi Rizzo, 2005.05.25
|
|
|
|
* note-this code best seen with ts=8 (8-spaces tabs) in the editor
|
2005-09-14 20:46:50 +00:00
|
|
|
*
|
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
2007-11-23 15:54:13 +00:00
|
|
|
// #define HAVE_VIDEO_CONSOLE // uncomment to enable video
|
2005-10-24 20:12:06 +00:00
|
|
|
/*! \file
|
2005-09-14 20:46:50 +00:00
|
|
|
*
|
2005-10-24 20:12:06 +00:00
|
|
|
* \brief Channel driver for OSS sound cards
|
2005-09-14 20:46:50 +00:00
|
|
|
*
|
2005-12-30 21:18:06 +00:00
|
|
|
* \author Mark Spencer <markster@digium.com>
|
|
|
|
* \author Luigi Rizzo
|
|
|
|
*
|
2005-11-06 15:09:47 +00:00
|
|
|
* \ingroup channel_drivers
|
2000-01-06 12:33:15 +00:00
|
|
|
*/
|
|
|
|
|
2012-10-14 21:47:40 +00:00
|
|
|
/*! \li \ref chan_oss.c uses the configuration file \ref oss.conf
|
2012-10-01 23:24:35 +00:00
|
|
|
* \addtogroup configuration_file
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*! \page oss.conf oss.conf
|
|
|
|
* \verbinclude oss.conf.sample
|
|
|
|
*/
|
|
|
|
|
2006-04-24 17:11:45 +00:00
|
|
|
/*** MODULEINFO
|
2008-11-04 15:07:54 +00:00
|
|
|
<depend>oss</depend>
|
2011-07-14 20:28:54 +00:00
|
|
|
<support_level>extended</support_level>
|
2006-04-24 17:11:45 +00:00
|
|
|
***/
|
|
|
|
|
2006-06-07 18:54:56 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
2007-12-15 00:11:04 +00:00
|
|
|
#include <ctype.h> /* isalnum() used here */
|
2006-06-07 18:54:56 +00:00
|
|
|
#include <math.h>
|
2007-12-15 00:11:04 +00:00
|
|
|
#include <sys/ioctl.h>
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2003-04-23 20:23:30 +00:00
|
|
|
#ifdef __linux
|
2000-01-06 12:33:15 +00:00
|
|
|
#include <linux/soundcard.h>
|
2014-04-17 20:25:16 +00:00
|
|
|
#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__) || defined(__sun)
|
2004-05-27 22:12:55 +00:00
|
|
|
#include <sys/soundcard.h>
|
2003-04-23 20:23:30 +00:00
|
|
|
#else
|
|
|
|
#include <soundcard.h>
|
|
|
|
#endif
|
2005-06-06 21:09:59 +00:00
|
|
|
|
|
|
|
#include "asterisk/channel.h"
|
2007-12-15 00:11:04 +00:00
|
|
|
#include "asterisk/file.h"
|
|
|
|
#include "asterisk/callerid.h"
|
2005-06-06 21:09:59 +00:00
|
|
|
#include "asterisk/module.h"
|
|
|
|
#include "asterisk/pbx.h"
|
|
|
|
#include "asterisk/cli.h"
|
|
|
|
#include "asterisk/causes.h"
|
2006-07-19 20:44:39 +00:00
|
|
|
#include "asterisk/musiconhold.h"
|
2007-01-15 02:28:32 +00:00
|
|
|
#include "asterisk/app.h"
|
2013-08-02 14:05:07 +00:00
|
|
|
#include "asterisk/bridge.h"
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
#include "asterisk/format_cache.h"
|
2005-06-06 21:09:59 +00:00
|
|
|
|
2007-12-22 18:28:40 +00:00
|
|
|
#include "console_video.h"
|
|
|
|
|
2011-05-05 22:55:09 +00:00
|
|
|
/*! Global jitterbuffer configuration - by default, jb is disabled
|
|
|
|
* \note Values shown here match the defaults shown in oss.conf.sample */
|
2006-05-31 16:56:50 +00:00
|
|
|
static struct ast_jb_conf default_jbconf =
|
|
|
|
{
|
|
|
|
.flags = 0,
|
2011-05-05 22:55:09 +00:00
|
|
|
.max_size = 200,
|
|
|
|
.resync_threshold = 1000,
|
|
|
|
.impl = "fixed",
|
|
|
|
.target_extra = 40,
|
2006-05-31 16:56:50 +00:00
|
|
|
};
|
|
|
|
static struct ast_jb_conf global_jbconf;
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
/*
|
|
|
|
* Basic mode of operation:
|
|
|
|
*
|
|
|
|
* we have one keyboard (which receives commands from the keyboard)
|
|
|
|
* and multiple headset's connected to audio cards.
|
|
|
|
* Cards/Headsets are named as the sections of oss.conf.
|
|
|
|
* The section called [general] contains the default parameters.
|
|
|
|
*
|
|
|
|
* At any time, the keyboard is attached to one card, and you
|
|
|
|
* can switch among them using the command 'console foo'
|
|
|
|
* where 'foo' is the name of the card you want.
|
|
|
|
*
|
|
|
|
* oss.conf parameters are
|
2006-02-10 23:19:05 +00:00
|
|
|
START_CONFIG
|
2005-08-03 04:11:52 +00:00
|
|
|
|
|
|
|
[general]
|
2006-03-28 13:23:05 +00:00
|
|
|
; General config options, with default values shown.
|
|
|
|
; You should use one section per device, with [general] being used
|
|
|
|
; for the first device and also as a template for other devices.
|
|
|
|
;
|
|
|
|
; All but 'debug' can go also in the device-specific sections.
|
|
|
|
;
|
|
|
|
; debug = 0x0 ; misc debug flags, default is 0
|
|
|
|
|
|
|
|
; Set the device to use for I/O
|
|
|
|
; device = /dev/dsp
|
|
|
|
|
|
|
|
; Optional mixer command to run upon startup (e.g. to set
|
|
|
|
; volume levels, mutes, etc.
|
|
|
|
; mixer =
|
|
|
|
|
|
|
|
; Software mic volume booster (or attenuator), useful for sound
|
|
|
|
; cards or microphones with poor sensitivity. The volume level
|
|
|
|
; is in dB, ranging from -20.0 to +20.0
|
|
|
|
; boost = n ; mic volume boost in dB
|
|
|
|
|
|
|
|
; Set the callerid for outgoing calls
|
|
|
|
; callerid = John Doe <555-1234>
|
|
|
|
|
|
|
|
; autoanswer = no ; no autoanswer on call
|
|
|
|
; autohangup = yes ; hangup when other party closes
|
|
|
|
; extension = s ; default extension to call
|
|
|
|
; context = default ; default context for outgoing calls
|
|
|
|
; language = "" ; default language
|
|
|
|
|
2006-07-19 20:44:39 +00:00
|
|
|
; Default Music on Hold class to use when this channel is placed on hold in
|
|
|
|
; the case that the music class is not set on the channel with
|
|
|
|
; Set(CHANNEL(musicclass)=whatever) in the dialplan and the peer channel
|
|
|
|
; putting this one on hold did not suggest a class to use.
|
|
|
|
;
|
|
|
|
; mohinterpret=default
|
|
|
|
|
2006-03-28 13:23:05 +00:00
|
|
|
; If you set overridecontext to 'yes', then the whole dial string
|
|
|
|
; will be interpreted as an extension, which is extremely useful
|
|
|
|
; to dial SIP, IAX and other extensions which use the '@' character.
|
|
|
|
; The default is 'no' just for backward compatibility, but the
|
|
|
|
; suggestion is to change it.
|
|
|
|
; overridecontext = no ; if 'no', the last @ will start the context
|
|
|
|
; if 'yes' the whole string is an extension.
|
|
|
|
|
|
|
|
; low level device parameters in case you have problems with the
|
|
|
|
; device driver on your operating system. You should not touch these
|
|
|
|
; unless you know what you are doing.
|
|
|
|
; queuesize = 10 ; frames in device driver
|
|
|
|
; frags = 8 ; argument to SETFRAGMENT
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-05-31 16:56:50 +00:00
|
|
|
;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
|
|
|
|
; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of an
|
|
|
|
; OSS channel. Defaults to "no". An enabled jitterbuffer will
|
|
|
|
; be used only if the sending side can create and the receiving
|
2006-06-01 16:47:28 +00:00
|
|
|
; side can not accept jitter. The OSS channel can't accept jitter,
|
|
|
|
; thus an enabled jitterbuffer on the receive OSS side will always
|
|
|
|
; be used if the sending side can create jitter.
|
2006-05-31 16:56:50 +00:00
|
|
|
|
|
|
|
; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds.
|
|
|
|
|
|
|
|
; jbresyncthreshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
|
|
|
|
; resynchronized. Useful to improve the quality of the voice, with
|
|
|
|
; big jumps in/broken timestamps, usualy sent from exotic devices
|
|
|
|
; and programs. Defaults to 1000.
|
|
|
|
|
2006-06-01 16:47:28 +00:00
|
|
|
; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of an OSS
|
|
|
|
; channel. Two implementations are currenlty available - "fixed"
|
2006-05-31 16:56:50 +00:00
|
|
|
; (with size always equals to jbmax-size) and "adaptive" (with
|
|
|
|
; variable size, actually the new jb of IAX2). Defaults to fixed.
|
|
|
|
|
|
|
|
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
|
|
|
|
;-----------------------------------------------------------------------------------
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
[card1]
|
2006-03-28 13:23:05 +00:00
|
|
|
; device = /dev/dsp1 ; alternate device
|
2006-02-10 23:19:05 +00:00
|
|
|
|
|
|
|
END_CONFIG
|
2005-08-03 04:11:52 +00:00
|
|
|
|
|
|
|
.. and so on for the other cards.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The following parameters are used in the driver:
|
|
|
|
*
|
|
|
|
* FRAME_SIZE the size of an audio frame, in samples.
|
|
|
|
* 160 is used almost universally, so you should not change it.
|
|
|
|
*
|
|
|
|
* FRAGS the argument for the SETFRAGMENT ioctl.
|
|
|
|
* Overridden by the 'frags' parameter in oss.conf
|
|
|
|
*
|
|
|
|
* Bits 0-7 are the base-2 log of the device's block size,
|
|
|
|
* bits 16-31 are the number of blocks in the driver's queue.
|
|
|
|
* There are a lot of differences in the way this parameter
|
|
|
|
* is supported by different drivers, so you may need to
|
|
|
|
* experiment a bit with the value.
|
|
|
|
* A good default for linux is 30 blocks of 64 bytes, which
|
|
|
|
* results in 6 frames of 320 bytes (160 samples).
|
|
|
|
* FreeBSD works decently with blocks of 256 or 512 bytes,
|
|
|
|
* leaving the number unspecified.
|
|
|
|
* Note that this only refers to the device buffer size,
|
|
|
|
* this module will then try to keep the lenght of audio
|
|
|
|
* buffered within small constraints.
|
|
|
|
*
|
|
|
|
* QUEUE_SIZE The max number of blocks actually allowed in the device
|
|
|
|
* driver's buffer, irrespective of the available number.
|
|
|
|
* Overridden by the 'queuesize' parameter in oss.conf
|
|
|
|
*
|
|
|
|
* Should be >=2, and at most as large as the hw queue above
|
|
|
|
* (otherwise it will never be full).
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define FRAME_SIZE 160
|
|
|
|
#define QUEUE_SIZE 10
|
|
|
|
|
|
|
|
#if defined(__FreeBSD__)
|
|
|
|
#define FRAGS 0x8
|
|
|
|
#else
|
|
|
|
#define FRAGS ( ( (6 * 5) << 16 ) | 0x6 )
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX text message sizes are probably 256 chars, but i am
|
|
|
|
* not sure if there is a suitable definition anywhere.
|
|
|
|
*/
|
|
|
|
#define TEXT_SIZE 256
|
|
|
|
|
|
|
|
#if 0
|
2006-09-08 03:51:26 +00:00
|
|
|
#define TRYOPEN 1 /* try to open on startup */
|
2005-08-03 04:11:52 +00:00
|
|
|
#endif
|
2006-09-08 03:51:26 +00:00
|
|
|
#define O_CLOSE 0x444 /* special 'close' mode for device */
|
2000-01-06 12:33:15 +00:00
|
|
|
/* Which device to use */
|
2004-08-31 13:32:11 +00:00
|
|
|
#if defined( __OpenBSD__ ) || defined( __NetBSD__ )
|
2003-10-22 03:10:34 +00:00
|
|
|
#define DEV_DSP "/dev/audio"
|
|
|
|
#else
|
2000-01-06 12:33:15 +00:00
|
|
|
#define DEV_DSP "/dev/dsp"
|
2003-10-22 03:10:34 +00:00
|
|
|
#endif
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
static char *config = "oss.conf"; /* default config file */
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
static int oss_debug;
|
2001-05-03 04:32:56 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief descriptor for one of our channels.
|
|
|
|
*
|
2005-08-03 04:11:52 +00:00
|
|
|
* There is one used for 'default' values (from the [general] entry in
|
|
|
|
* the configuration file), and then one instance for each device
|
|
|
|
* (the default is cloned from [general], others are only created
|
|
|
|
* if the relevant section exists).
|
|
|
|
*/
|
|
|
|
struct chan_oss_pvt {
|
|
|
|
struct chan_oss_pvt *next;
|
|
|
|
|
|
|
|
char *name;
|
2006-12-29 13:25:07 +00:00
|
|
|
int total_blocks; /*!< total blocks in the output device */
|
2005-08-03 04:11:52 +00:00
|
|
|
int sounddev;
|
|
|
|
enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
|
2009-01-25 23:58:00 +00:00
|
|
|
int autoanswer; /*!< Boolean: whether to answer the immediately upon calling */
|
|
|
|
int autohangup; /*!< Boolean: whether to hangup the call when the remote end hangs up */
|
|
|
|
int hookstate; /*!< Boolean: 1 if offhook; 0 if onhook */
|
2006-12-29 13:25:07 +00:00
|
|
|
char *mixer_cmd; /*!< initial command to issue to the mixer */
|
|
|
|
unsigned int queuesize; /*!< max fragments in queue */
|
|
|
|
unsigned int frags; /*!< parameter for SETFRAGMENT */
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
int warned; /*!< various flags used for warnings */
|
2005-08-03 04:11:52 +00:00
|
|
|
#define WARN_used_blocks 1
|
|
|
|
#define WARN_speed 2
|
|
|
|
#define WARN_frag 4
|
2006-12-29 13:25:07 +00:00
|
|
|
int w_errors; /*!< overfull in the write path */
|
2005-08-03 04:11:52 +00:00
|
|
|
struct timeval lastopen;
|
|
|
|
|
|
|
|
int overridecontext;
|
|
|
|
int mute;
|
2006-02-10 23:19:05 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*! boost support. BOOST_SCALE * 10 ^(BOOST_MAX/20) must
|
|
|
|
* be representable in 16 bits to avoid overflows.
|
2006-02-10 23:19:05 +00:00
|
|
|
*/
|
|
|
|
#define BOOST_SCALE (1<<9)
|
2006-12-29 13:25:07 +00:00
|
|
|
#define BOOST_MAX 40 /*!< slightly less than 7 bits */
|
|
|
|
int boost; /*!< input boost, scaled by BOOST_SCALE */
|
|
|
|
char device[64]; /*!< device to open */
|
2005-08-03 04:11:52 +00:00
|
|
|
|
|
|
|
pthread_t sthread;
|
|
|
|
|
2000-01-06 12:33:15 +00:00
|
|
|
struct ast_channel *owner;
|
2007-11-23 15:54:13 +00:00
|
|
|
|
|
|
|
struct video_desc *env; /*!< parameters for video support */
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
char ext[AST_MAX_EXTENSION];
|
|
|
|
char ctx[AST_MAX_CONTEXT];
|
|
|
|
char language[MAX_LANGUAGE];
|
2009-01-25 23:58:00 +00:00
|
|
|
char cid_name[256]; /*!< Initial CallerID name */
|
|
|
|
char cid_num[256]; /*!< Initial CallerID number */
|
2006-07-19 20:44:39 +00:00
|
|
|
char mohinterpret[MAX_MUSICCLASS];
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*! buffers used in oss_write */
|
2006-09-08 03:51:26 +00:00
|
|
|
char oss_write_buf[FRAME_SIZE * 2];
|
2005-08-03 04:11:52 +00:00
|
|
|
int oss_write_dst;
|
2006-12-29 13:25:07 +00:00
|
|
|
/*! buffers used in oss_read - AST_FRIENDLY_OFFSET space for headers
|
|
|
|
* plus enough room for a full frame
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
|
|
|
char oss_read_buf[FRAME_SIZE * 2 + AST_FRIENDLY_OFFSET];
|
2006-12-29 13:25:07 +00:00
|
|
|
int readpos; /*!< read position above */
|
|
|
|
struct ast_frame read_f; /*!< returned by oss_read */
|
2005-08-03 04:11:52 +00:00
|
|
|
};
|
|
|
|
|
2007-11-23 15:54:13 +00:00
|
|
|
/*! forward declaration */
|
2009-05-21 21:13:09 +00:00
|
|
|
static struct chan_oss_pvt *find_desc(const char *dev);
|
2007-11-23 15:54:13 +00:00
|
|
|
|
2008-01-09 12:13:32 +00:00
|
|
|
static char *oss_active; /*!< the active device */
|
|
|
|
|
2007-11-23 15:54:13 +00:00
|
|
|
/*! \brief return the pointer to the video descriptor */
|
2007-12-22 18:28:40 +00:00
|
|
|
struct video_desc *get_video_desc(struct ast_channel *c)
|
2007-11-23 15:54:13 +00:00
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = c ? ast_channel_tech_pvt(c) : find_desc(oss_active);
|
2007-11-23 15:54:13 +00:00
|
|
|
return o ? o->env : NULL;
|
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
static struct chan_oss_pvt oss_default = {
|
|
|
|
.sounddev = -1,
|
2006-09-08 03:51:26 +00:00
|
|
|
.duplex = M_UNSET, /* XXX check this */
|
2005-08-03 04:11:52 +00:00
|
|
|
.autoanswer = 1,
|
|
|
|
.autohangup = 1,
|
|
|
|
.queuesize = QUEUE_SIZE,
|
|
|
|
.frags = FRAGS,
|
|
|
|
.ext = "s",
|
|
|
|
.ctx = "default",
|
|
|
|
.readpos = AST_FRIENDLY_OFFSET, /* start here on reads */
|
|
|
|
.lastopen = { 0, 0 },
|
2006-02-10 23:19:05 +00:00
|
|
|
.boost = BOOST_SCALE,
|
2005-08-03 04:11:52 +00:00
|
|
|
};
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
|
|
|
|
static int setformat(struct chan_oss_pvt *o, int mode);
|
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
static struct ast_channel *oss_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor,
|
2012-02-01 19:53:38 +00:00
|
|
|
const char *data, int *cause);
|
2006-08-31 01:59:02 +00:00
|
|
|
static int oss_digit_begin(struct ast_channel *c, char digit);
|
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 18:06:03 +00:00
|
|
|
static int oss_digit_end(struct ast_channel *c, char digit, unsigned int duration);
|
2005-04-21 06:30:23 +00:00
|
|
|
static int oss_text(struct ast_channel *c, const char *text);
|
2005-03-04 06:47:24 +00:00
|
|
|
static int oss_hangup(struct ast_channel *c);
|
|
|
|
static int oss_answer(struct ast_channel *c);
|
|
|
|
static struct ast_frame *oss_read(struct ast_channel *chan);
|
2012-02-01 19:53:38 +00:00
|
|
|
static int oss_call(struct ast_channel *c, const char *dest, int timeout);
|
2005-03-04 06:47:24 +00:00
|
|
|
static int oss_write(struct ast_channel *chan, struct ast_frame *f);
|
2006-05-10 12:24:11 +00:00
|
|
|
static int oss_indicate(struct ast_channel *chan, int cond, const void *data, size_t datalen);
|
2005-03-04 06:47:24 +00:00
|
|
|
static int oss_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
|
2006-05-09 08:44:50 +00:00
|
|
|
static char tdesc[] = "OSS Console Channel Driver";
|
2005-03-04 06:47:24 +00:00
|
|
|
|
2007-12-22 18:28:40 +00:00
|
|
|
/* cannot do const because need to update some fields at runtime */
|
|
|
|
static struct ast_channel_tech oss_tech = {
|
2006-09-08 03:51:26 +00:00
|
|
|
.type = "Console",
|
|
|
|
.description = tdesc,
|
2006-02-01 23:05:28 +00:00
|
|
|
.requester = oss_request,
|
2006-08-31 01:59:02 +00:00
|
|
|
.send_digit_begin = oss_digit_begin,
|
|
|
|
.send_digit_end = oss_digit_end,
|
2006-02-01 23:05:28 +00:00
|
|
|
.send_text = oss_text,
|
|
|
|
.hangup = oss_hangup,
|
|
|
|
.answer = oss_answer,
|
|
|
|
.read = oss_read,
|
|
|
|
.call = oss_call,
|
|
|
|
.write = oss_write,
|
2007-11-23 15:54:13 +00:00
|
|
|
.write_video = console_write_video,
|
2006-02-01 23:05:28 +00:00
|
|
|
.indicate = oss_indicate,
|
|
|
|
.fixup = oss_fixup,
|
2005-03-04 06:47:24 +00:00
|
|
|
};
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief returns a pointer to the descriptor with the given name
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
2009-05-21 21:13:09 +00:00
|
|
|
static struct chan_oss_pvt *find_desc(const char *dev)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2006-09-08 03:51:26 +00:00
|
|
|
struct chan_oss_pvt *o = NULL;
|
|
|
|
|
|
|
|
if (!dev)
|
2006-02-10 23:19:05 +00:00
|
|
|
ast_log(LOG_WARNING, "null dev\n");
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2006-09-08 03:51:26 +00:00
|
|
|
for (o = oss_default.next; o && o->name && dev && strcmp(o->name, dev) != 0; o = o->next);
|
|
|
|
|
|
|
|
if (!o)
|
2006-02-10 23:19:05 +00:00
|
|
|
ast_log(LOG_WARNING, "could not find <%s>\n", dev ? dev : "--no-device--");
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
return o;
|
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/* !
|
|
|
|
* \brief split a string in extension-context, returns pointers to malloc'ed
|
|
|
|
* strings.
|
|
|
|
*
|
2005-08-03 19:58:34 +00:00
|
|
|
* If we do not have 'overridecontext' then the last @ is considered as
|
2005-08-03 04:11:52 +00:00
|
|
|
* a context separator, and the context is overridden.
|
|
|
|
* This is usually not very necessary as you can play with the dialplan,
|
|
|
|
* and it is nice not to need it because you have '@' in SIP addresses.
|
2006-12-29 13:25:07 +00:00
|
|
|
*
|
|
|
|
* \return the buffer address.
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
|
|
|
static char *ast_ext_ctx(const char *src, char **ext, char **ctx)
|
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
|
|
|
|
if (ext == NULL || ctx == NULL)
|
2006-09-08 03:51:26 +00:00
|
|
|
return NULL; /* error */
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
*ext = *ctx = NULL;
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (src && *src != '\0')
|
2006-01-11 01:20:29 +00:00
|
|
|
*ext = ast_strdup(src);
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (*ext == NULL)
|
|
|
|
return NULL;
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (!o->overridecontext) {
|
|
|
|
/* parse from the right */
|
|
|
|
*ctx = strrchr(*ext, '@');
|
|
|
|
if (*ctx)
|
|
|
|
*(*ctx)++ = '\0';
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
return *ext;
|
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief Returns the number of blocks used in the audio output channel
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
|
|
|
static int used_blocks(struct chan_oss_pvt *o)
|
|
|
|
{
|
|
|
|
struct audio_buf_info info;
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (ioctl(o->sounddev, SNDCTL_DSP_GETOSPACE, &info)) {
|
2006-09-08 03:51:26 +00:00
|
|
|
if (!(o->warned & WARN_used_blocks)) {
|
2005-08-03 04:11:52 +00:00
|
|
|
ast_log(LOG_WARNING, "Error reading output space\n");
|
|
|
|
o->warned |= WARN_used_blocks;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o->total_blocks == 0) {
|
2006-09-08 03:51:26 +00:00
|
|
|
if (0) /* debugging */
|
|
|
|
ast_log(LOG_WARNING, "fragtotal %d size %d avail %d\n", info.fragstotal, info.fragsize, info.fragments);
|
2005-08-03 04:11:52 +00:00
|
|
|
o->total_blocks = info.fragments;
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
return o->total_blocks - info.fragments;
|
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*! Write an exactly FRAME_SIZE sized frame */
|
2005-08-03 04:11:52 +00:00
|
|
|
static int soundcard_writeframe(struct chan_oss_pvt *o, short *data)
|
2006-09-08 03:51:26 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
int res;
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o->sounddev < 0)
|
|
|
|
setformat(o, O_RDWR);
|
|
|
|
if (o->sounddev < 0)
|
2006-09-08 03:51:26 +00:00
|
|
|
return 0; /* not fatal */
|
2005-08-03 04:11:52 +00:00
|
|
|
/*
|
|
|
|
* Nothing complex to manage the audio device queue.
|
|
|
|
* If the buffer is full just drop the extra, otherwise write.
|
|
|
|
* XXX in some cases it might be useful to write anyways after
|
|
|
|
* a number of failures, to restart the output chain.
|
|
|
|
*/
|
|
|
|
res = used_blocks(o);
|
|
|
|
if (res > o->queuesize) { /* no room to write a block */
|
|
|
|
if (o->w_errors++ == 0 && (oss_debug & 0x4))
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_log(LOG_WARNING, "write: used %d blocks (%d)\n", res, o->w_errors);
|
2005-08-03 04:11:52 +00:00
|
|
|
return 0;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
o->w_errors = 0;
|
2006-11-18 08:19:41 +00:00
|
|
|
return write(o->sounddev, (void *)data, FRAME_SIZE * 2);
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2001-05-03 04:32:56 +00:00
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
2005-08-03 04:11:52 +00:00
|
|
|
* reset and close the device if opened,
|
|
|
|
* then open and initialize it in the desired mode,
|
|
|
|
* trigger reads and writes so we can start using it.
|
|
|
|
*/
|
|
|
|
static int setformat(struct chan_oss_pvt *o, int mode)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
int fmt, desired, res, fd;
|
|
|
|
|
|
|
|
if (o->sounddev >= 0) {
|
|
|
|
ioctl(o->sounddev, SNDCTL_DSP_RESET, 0);
|
|
|
|
close(o->sounddev);
|
|
|
|
o->duplex = M_UNSET;
|
|
|
|
o->sounddev = -1;
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
if (mode == O_CLOSE) /* we are done */
|
2000-01-06 12:33:15 +00:00
|
|
|
return 0;
|
2005-08-03 04:11:52 +00:00
|
|
|
if (ast_tvdiff_ms(ast_tvnow(), o->lastopen) < 1000)
|
2006-09-08 03:51:26 +00:00
|
|
|
return -1; /* don't open too often */
|
2005-08-03 04:11:52 +00:00
|
|
|
o->lastopen = ast_tvnow();
|
2006-09-08 03:51:26 +00:00
|
|
|
fd = o->sounddev = open(o->device, mode | O_NONBLOCK);
|
2005-08-03 04:11:52 +00:00
|
|
|
if (fd < 0) {
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to re-open DSP device %s: %s\n", o->device, strerror(errno));
|
2005-08-03 04:11:52 +00:00
|
|
|
return -1;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o->owner)
|
2007-08-08 21:44:58 +00:00
|
|
|
ast_channel_set_fd(o->owner, 0, fd);
|
2005-03-24 00:55:40 +00:00
|
|
|
|
|
|
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
2000-01-06 12:33:15 +00:00
|
|
|
fmt = AFMT_S16_LE;
|
2005-03-24 00:55:40 +00:00
|
|
|
#else
|
|
|
|
fmt = AFMT_S16_BE;
|
|
|
|
#endif
|
2000-01-06 12:33:15 +00:00
|
|
|
res = ioctl(fd, SNDCTL_DSP_SETFMT, &fmt);
|
|
|
|
if (res < 0) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to set format to 16-bit signed\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
switch (mode) {
|
2006-11-16 22:03:27 +00:00
|
|
|
case O_RDWR:
|
|
|
|
res = ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
|
|
|
|
/* Check to see if duplex set (FreeBSD Bug) */
|
|
|
|
res = ioctl(fd, SNDCTL_DSP_GETCAPS, &fmt);
|
|
|
|
if (res == 0 && (fmt & DSP_CAP_DUPLEX)) {
|
2007-07-26 15:49:18 +00:00
|
|
|
ast_verb(2, "Console is full duplex\n");
|
2006-11-16 22:03:27 +00:00
|
|
|
o->duplex = M_FULL;
|
|
|
|
};
|
|
|
|
break;
|
|
|
|
|
|
|
|
case O_WRONLY:
|
|
|
|
o->duplex = M_WRITE;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case O_RDONLY:
|
|
|
|
o->duplex = M_READ;
|
|
|
|
break;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2000-01-06 12:33:15 +00:00
|
|
|
fmt = 0;
|
|
|
|
res = ioctl(fd, SNDCTL_DSP_STEREO, &fmt);
|
|
|
|
if (res < 0) {
|
|
|
|
ast_log(LOG_WARNING, "Failed to set audio device to mono\n");
|
|
|
|
return -1;
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
fmt = desired = DEFAULT_SAMPLE_RATE; /* 8000 Hz desired */
|
2000-01-06 12:33:15 +00:00
|
|
|
res = ioctl(fd, SNDCTL_DSP_SPEED, &fmt);
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2000-01-06 12:33:15 +00:00
|
|
|
if (res < 0) {
|
2012-07-24 17:16:40 +00:00
|
|
|
ast_log(LOG_WARNING, "Failed to set sample rate to %d\n", desired);
|
2000-01-06 12:33:15 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (fmt != desired) {
|
2005-08-03 04:11:52 +00:00
|
|
|
if (!(o->warned & WARN_speed)) {
|
|
|
|
ast_log(LOG_WARNING,
|
|
|
|
"Requested %d Hz, got %d Hz -- sound may be choppy\n",
|
|
|
|
desired, fmt);
|
|
|
|
o->warned |= WARN_speed;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
/*
|
|
|
|
* on Freebsd, SETFRAGMENT does not work very well on some cards.
|
|
|
|
* Default to use 256 bytes, let the user override
|
|
|
|
*/
|
|
|
|
if (o->frags) {
|
|
|
|
fmt = o->frags;
|
|
|
|
res = ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &fmt);
|
|
|
|
if (res < 0) {
|
|
|
|
if (!(o->warned & WARN_frag)) {
|
|
|
|
ast_log(LOG_WARNING,
|
|
|
|
"Unable to set fragment size -- sound may be choppy\n");
|
|
|
|
o->warned |= WARN_frag;
|
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
/* on some cards, we need SNDCTL_DSP_SETTRIGGER to start outputting */
|
|
|
|
res = PCM_ENABLE_INPUT | PCM_ENABLE_OUTPUT;
|
|
|
|
res = ioctl(fd, SNDCTL_DSP_SETTRIGGER, &res);
|
|
|
|
/* it may fail if we are in half duplex, never mind */
|
|
|
|
return 0;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
/*
|
|
|
|
* some of the standard methods supported by channels.
|
|
|
|
*/
|
2006-08-31 01:59:02 +00:00
|
|
|
static int oss_digit_begin(struct ast_channel *c, char digit)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 18:06:03 +00:00
|
|
|
static int oss_digit_end(struct ast_channel *c, char digit, unsigned int duration)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
/* no better use for received digits than print them */
|
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 18:06:03 +00:00
|
|
|
ast_verbose(" << Console Received digit %c of duration %u ms >> \n",
|
|
|
|
digit, duration);
|
2000-01-06 12:33:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-21 06:30:23 +00:00
|
|
|
static int oss_text(struct ast_channel *c, const char *text)
|
2000-03-26 01:59:06 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
/* print received messages */
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_verbose(" << Console Received text %s >> \n", text);
|
2000-03-26 01:59:06 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief handler for incoming calls. Either autoanswer, or start ringing
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
2012-02-01 19:53:38 +00:00
|
|
|
static int oss_call(struct ast_channel *c, const char *dest, int timeout)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(c);
|
2009-11-04 14:05:12 +00:00
|
|
|
struct ast_frame f = { AST_FRAME_CONTROL, };
|
2007-01-15 02:28:32 +00:00
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(name);
|
|
|
|
AST_APP_ARG(flags);
|
|
|
|
);
|
|
|
|
char *parse = ast_strdupa(dest);
|
|
|
|
|
|
|
|
AST_NONSTANDARD_APP_ARGS(args, parse, '/');
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2010-04-03 02:12:33 +00:00
|
|
|
ast_verbose(" << Call to device '%s' dnid '%s' rdnis '%s' on console from '%s' <%s> >>\n",
|
2010-07-14 15:48:36 +00:00
|
|
|
dest,
|
2012-02-29 16:52:47 +00:00
|
|
|
S_OR(ast_channel_dialed(c)->number.str, ""),
|
|
|
|
S_COR(ast_channel_redirecting(c)->from.number.valid, ast_channel_redirecting(c)->from.number.str, ""),
|
|
|
|
S_COR(ast_channel_caller(c)->id.name.valid, ast_channel_caller(c)->id.name.str, ""),
|
|
|
|
S_COR(ast_channel_caller(c)->id.number.valid, ast_channel_caller(c)->id.number.str, ""));
|
2007-01-15 02:28:32 +00:00
|
|
|
if (!ast_strlen_zero(args.flags) && strcasecmp(args.flags, "answer") == 0) {
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = AST_CONTROL_ANSWER;
|
2007-01-15 02:28:32 +00:00
|
|
|
ast_queue_frame(c, &f);
|
|
|
|
} else if (!ast_strlen_zero(args.flags) && strcasecmp(args.flags, "noanswer") == 0) {
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = AST_CONTROL_RINGING;
|
2007-01-15 02:28:32 +00:00
|
|
|
ast_queue_frame(c, &f);
|
2008-01-03 19:56:29 +00:00
|
|
|
ast_indicate(c, AST_CONTROL_RINGING);
|
2007-01-15 02:28:32 +00:00
|
|
|
} else if (o->autoanswer) {
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_verbose(" << Auto-answered >> \n");
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = AST_CONTROL_ANSWER;
|
2004-04-07 15:59:14 +00:00
|
|
|
ast_queue_frame(c, &f);
|
2009-01-25 23:58:00 +00:00
|
|
|
o->hookstate = 1;
|
2000-01-06 12:33:15 +00:00
|
|
|
} else {
|
2005-08-03 04:11:52 +00:00
|
|
|
ast_verbose("<< Type 'answer' to answer, or use 'autoanswer' for future calls >> \n");
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = AST_CONTROL_RINGING;
|
2004-04-07 15:59:14 +00:00
|
|
|
ast_queue_frame(c, &f);
|
2008-01-03 19:56:29 +00:00
|
|
|
ast_indicate(c, AST_CONTROL_RINGING);
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief remote side answered the phone
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
2000-01-06 12:33:15 +00:00
|
|
|
static int oss_answer(struct ast_channel *c)
|
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(c);
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_verbose(" << Console call has been answered >> \n");
|
2002-08-28 04:07:50 +00:00
|
|
|
ast_setstate(c, AST_STATE_UP);
|
2009-01-25 23:58:00 +00:00
|
|
|
o->hookstate = 1;
|
2000-01-06 12:33:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int oss_hangup(struct ast_channel *c)
|
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(c);
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_tech_pvt_set(c, NULL);
|
2005-08-03 04:11:52 +00:00
|
|
|
o->owner = NULL;
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_verbose(" << Hangup on console >> \n");
|
2007-11-23 15:54:13 +00:00
|
|
|
console_video_uninit(o->env);
|
2007-01-23 22:59:55 +00:00
|
|
|
ast_module_unref(ast_module_info->self);
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o->hookstate) {
|
|
|
|
if (o->autoanswer || o->autohangup) {
|
2002-01-13 18:51:27 +00:00
|
|
|
/* Assume auto-hangup too */
|
2005-08-03 04:11:52 +00:00
|
|
|
o->hookstate = 0;
|
|
|
|
setformat(o, O_CLOSE);
|
2002-01-13 18:51:27 +00:00
|
|
|
}
|
2001-05-03 04:32:56 +00:00
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*! \brief used for data coming from the network */
|
2005-08-03 04:11:52 +00:00
|
|
|
static int oss_write(struct ast_channel *c, struct ast_frame *f)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
int src;
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(c);
|
2005-08-03 04:11:52 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* we could receive a block which is not a multiple of our
|
|
|
|
* FRAME_SIZE, so buffer it locally and write to the device
|
|
|
|
* in FRAME_SIZE chunks.
|
|
|
|
* Keep the residue stored for future use.
|
|
|
|
*/
|
2006-09-08 03:51:26 +00:00
|
|
|
src = 0; /* read position into f->data */
|
|
|
|
while (src < f->datalen) {
|
2005-08-03 04:11:52 +00:00
|
|
|
/* Compute spare room in the buffer */
|
|
|
|
int l = sizeof(o->oss_write_buf) - o->oss_write_dst;
|
|
|
|
|
|
|
|
if (f->datalen - src >= l) { /* enough to fill a frame */
|
2008-05-22 16:29:54 +00:00
|
|
|
memcpy(o->oss_write_buf + o->oss_write_dst, f->data.ptr + src, l);
|
2006-09-08 03:51:26 +00:00
|
|
|
soundcard_writeframe(o, (short *) o->oss_write_buf);
|
2005-08-03 04:11:52 +00:00
|
|
|
src += l;
|
|
|
|
o->oss_write_dst = 0;
|
2006-09-08 03:51:26 +00:00
|
|
|
} else { /* copy residue */
|
2005-08-03 04:11:52 +00:00
|
|
|
l = f->datalen - src;
|
2008-05-22 16:29:54 +00:00
|
|
|
memcpy(o->oss_write_buf + o->oss_write_dst, f->data.ptr + src, l);
|
2006-09-08 03:51:26 +00:00
|
|
|
src += l; /* but really, we are done */
|
2005-08-03 04:11:52 +00:00
|
|
|
o->oss_write_dst += l;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
static struct ast_frame *oss_read(struct ast_channel *c)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
|
|
|
int res;
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(c);
|
2005-08-03 04:11:52 +00:00
|
|
|
struct ast_frame *f = &o->read_f;
|
|
|
|
|
2006-02-10 23:19:05 +00:00
|
|
|
/* XXX can be simplified returning &ast_null_frame */
|
2005-08-03 04:11:52 +00:00
|
|
|
/* prepare a NULL frame in case we don't have enough data to return */
|
2008-10-09 14:17:33 +00:00
|
|
|
memset(f, '\0', sizeof(struct ast_frame));
|
2005-08-03 04:11:52 +00:00
|
|
|
f->frametype = AST_FRAME_NULL;
|
2006-02-01 23:05:28 +00:00
|
|
|
f->src = oss_tech.type;
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-09-08 03:51:26 +00:00
|
|
|
res = read(o->sounddev, o->oss_read_buf + o->readpos, sizeof(o->oss_read_buf) - o->readpos);
|
|
|
|
if (res < 0) /* audio data not ready, return a NULL frame */
|
2005-08-03 04:11:52 +00:00
|
|
|
return f;
|
|
|
|
|
|
|
|
o->readpos += res;
|
|
|
|
if (o->readpos < sizeof(o->oss_read_buf)) /* not enough samples */
|
|
|
|
return f;
|
|
|
|
|
|
|
|
if (o->mute)
|
|
|
|
return f;
|
|
|
|
|
|
|
|
o->readpos = AST_FRIENDLY_OFFSET; /* reset read pointer for next frame */
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_state(c) != AST_STATE_UP) /* drop data if frame is not up */
|
2005-08-03 04:11:52 +00:00
|
|
|
return f;
|
|
|
|
/* ok we can build and deliver the frame to the caller */
|
|
|
|
f->frametype = AST_FRAME_VOICE;
|
2017-01-10 20:03:24 +00:00
|
|
|
f->subclass.format = ast_format_slin;
|
2005-08-03 04:11:52 +00:00
|
|
|
f->samples = FRAME_SIZE;
|
|
|
|
f->datalen = FRAME_SIZE * 2;
|
2008-05-22 16:29:54 +00:00
|
|
|
f->data.ptr = o->oss_read_buf + AST_FRIENDLY_OFFSET;
|
2006-09-08 03:51:26 +00:00
|
|
|
if (o->boost != BOOST_SCALE) { /* scale and clip values */
|
2006-02-10 23:19:05 +00:00
|
|
|
int i, x;
|
2008-05-22 16:29:54 +00:00
|
|
|
int16_t *p = (int16_t *) f->data.ptr;
|
2006-02-10 23:19:05 +00:00
|
|
|
for (i = 0; i < f->samples; i++) {
|
|
|
|
x = (p[i] * o->boost) / BOOST_SCALE;
|
|
|
|
if (x > 32767)
|
|
|
|
x = 32767;
|
|
|
|
else if (x < -32768)
|
|
|
|
x = -32768;
|
|
|
|
p[i] = x;
|
|
|
|
}
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
f->offset = AST_FRIENDLY_OFFSET;
|
|
|
|
return f;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
|
2004-04-07 16:17:31 +00:00
|
|
|
static int oss_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
|
2001-05-03 04:32:56 +00:00
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(newchan);
|
2005-08-03 04:11:52 +00:00
|
|
|
o->owner = newchan;
|
2001-05-03 04:32:56 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-05-10 12:24:11 +00:00
|
|
|
static int oss_indicate(struct ast_channel *c, int cond, const void *data, size_t datalen)
|
2001-05-03 04:32:56 +00:00
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_oss_pvt *o = ast_channel_tech_pvt(c);
|
2008-01-03 19:56:29 +00:00
|
|
|
int res = 0;
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-09-08 03:51:26 +00:00
|
|
|
switch (cond) {
|
2011-09-09 16:28:23 +00:00
|
|
|
case AST_CONTROL_INCOMPLETE:
|
2006-11-16 22:03:27 +00:00
|
|
|
case AST_CONTROL_BUSY:
|
|
|
|
case AST_CONTROL_CONGESTION:
|
|
|
|
case AST_CONTROL_RINGING:
|
2012-05-14 19:44:27 +00:00
|
|
|
case AST_CONTROL_PVT_CAUSE_CODE:
|
2006-11-16 22:03:27 +00:00
|
|
|
case -1:
|
|
|
|
res = -1;
|
|
|
|
break;
|
2008-01-03 19:56:29 +00:00
|
|
|
case AST_CONTROL_PROGRESS:
|
|
|
|
case AST_CONTROL_PROCEEDING:
|
|
|
|
case AST_CONTROL_VIDUPDATE:
|
2008-03-05 22:43:22 +00:00
|
|
|
case AST_CONTROL_SRCUPDATE:
|
2008-01-03 19:56:29 +00:00
|
|
|
break;
|
2006-11-16 22:03:27 +00:00
|
|
|
case AST_CONTROL_HOLD:
|
|
|
|
ast_verbose(" << Console Has Been Placed on Hold >> \n");
|
|
|
|
ast_moh_start(c, data, o->mohinterpret);
|
|
|
|
break;
|
|
|
|
case AST_CONTROL_UNHOLD:
|
|
|
|
ast_verbose(" << Console Has Been Retrieved from Hold >> \n");
|
|
|
|
ast_moh_stop(c);
|
|
|
|
break;
|
|
|
|
default:
|
2012-01-09 22:15:50 +00:00
|
|
|
ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, ast_channel_name(c));
|
2006-11-16 22:03:27 +00:00
|
|
|
return -1;
|
2001-05-03 04:32:56 +00:00
|
|
|
}
|
2006-07-19 20:44:39 +00:00
|
|
|
|
2008-01-03 19:56:29 +00:00
|
|
|
return res;
|
2001-05-03 04:32:56 +00:00
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief allocate a new channel.
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
static struct ast_channel *oss_new(struct chan_oss_pvt *o, char *ext, char *ctx, int state, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
struct ast_channel *c;
|
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
c = ast_channel_alloc(1, state, o->cid_num, o->cid_name, "", ext, ctx, assignedids, requestor, 0, "Console/%s", o->device + 5);
|
2005-08-03 04:11:52 +00:00
|
|
|
if (c == NULL)
|
|
|
|
return NULL;
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_tech_set(c, &oss_tech);
|
2006-02-10 23:19:05 +00:00
|
|
|
if (o->sounddev < 0)
|
|
|
|
setformat(o, O_RDWR);
|
2007-08-08 21:44:58 +00:00
|
|
|
ast_channel_set_fd(c, 0, o->sounddev); /* -1 if device closed, override later */
|
2011-02-03 16:22:10 +00:00
|
|
|
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_channel_set_readformat(c, ast_format_slin);
|
|
|
|
ast_channel_set_writeformat(c, ast_format_slin);
|
|
|
|
ast_channel_nativeformats_set(c, oss_tech.capabilities);
|
2011-02-03 16:22:10 +00:00
|
|
|
|
2007-11-23 15:54:13 +00:00
|
|
|
/* if the console makes the call, add video to the offer */
|
2011-02-03 16:22:10 +00:00
|
|
|
/* if (state == AST_STATE_RINGING) TODO XXX CONSOLE VIDEO IS DISABLED UNTIL IT GETS A MAINTAINER
|
|
|
|
c->nativeformats |= console_video_formats; */
|
2007-11-23 15:54:13 +00:00
|
|
|
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_tech_pvt_set(c, o);
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2005-10-27 02:19:37 +00:00
|
|
|
if (!ast_strlen_zero(o->language))
|
2012-01-24 20:12:09 +00:00
|
|
|
ast_channel_language_set(c, o->language);
|
2006-11-07 21:47:49 +00:00
|
|
|
/* Don't use ast_set_callerid() here because it will
|
|
|
|
* generate a needless NewCallerID event */
|
2010-07-14 16:58:03 +00:00
|
|
|
if (!ast_strlen_zero(o->cid_num)) {
|
2012-02-29 16:52:47 +00:00
|
|
|
ast_channel_caller(c)->ani.number.valid = 1;
|
|
|
|
ast_channel_caller(c)->ani.number.str = ast_strdup(o->cid_num);
|
2010-07-14 16:58:03 +00:00
|
|
|
}
|
2010-07-14 15:48:36 +00:00
|
|
|
if (!ast_strlen_zero(ext)) {
|
2012-02-29 16:52:47 +00:00
|
|
|
ast_channel_dialed(c)->number.str = ast_strdup(ext);
|
2010-07-14 15:48:36 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
|
|
|
|
o->owner = c;
|
2007-01-23 22:59:55 +00:00
|
|
|
ast_module_ref(ast_module_info->self);
|
2006-08-16 03:43:47 +00:00
|
|
|
ast_jb_configure(c, &global_jbconf);
|
2013-12-18 19:28:05 +00:00
|
|
|
ast_channel_unlock(c);
|
2005-08-03 04:11:52 +00:00
|
|
|
if (state != AST_STATE_DOWN) {
|
|
|
|
if (ast_pbx_start(c)) {
|
2012-01-09 22:15:50 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(c));
|
2005-08-03 04:11:52 +00:00
|
|
|
ast_hangup(c);
|
2006-06-23 16:49:12 +00:00
|
|
|
o->owner = c = NULL;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
}
|
2007-11-23 15:54:13 +00:00
|
|
|
console_video_start(get_video_desc(c), c); /* XXX cleanup */
|
2006-05-31 16:56:50 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
return c;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
static struct ast_channel *oss_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
struct ast_channel *c;
|
2007-01-15 02:28:32 +00:00
|
|
|
struct chan_oss_pvt *o;
|
|
|
|
AST_DECLARE_APP_ARGS(args,
|
|
|
|
AST_APP_ARG(name);
|
|
|
|
AST_APP_ARG(flags);
|
|
|
|
);
|
|
|
|
char *parse = ast_strdupa(data);
|
|
|
|
|
|
|
|
AST_NONSTANDARD_APP_ARGS(args, parse, '/');
|
|
|
|
o = find_desc(args.name);
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2012-02-01 19:53:38 +00:00
|
|
|
ast_log(LOG_WARNING, "oss_request ty <%s> data 0x%p <%s>\n", type, data, data);
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o == NULL) {
|
2007-01-15 02:28:32 +00:00
|
|
|
ast_log(LOG_NOTICE, "Device %s not found\n", args.name);
|
2005-08-03 04:11:52 +00:00
|
|
|
/* XXX we could default to 'dsp' perhaps ? */
|
2000-01-06 12:33:15 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
if (ast_format_cap_iscompatible_format(cap, ast_format_slin) == AST_FORMAT_CMP_NOT_EQUAL) {
|
2015-11-09 09:01:41 +00:00
|
|
|
struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_log(LOG_NOTICE, "Format %s unsupported\n", ast_format_cap_get_names(cap, &codec_buf));
|
2005-08-03 04:11:52 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (o->owner) {
|
|
|
|
ast_log(LOG_NOTICE, "Already have a call (chan %p) on the OSS channel\n", o->owner);
|
2004-10-26 22:25:43 +00:00
|
|
|
*cause = AST_CAUSE_BUSY;
|
2000-01-06 12:33:15 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
c = oss_new(o, NULL, NULL, AST_STATE_DOWN, assignedids, requestor);
|
2005-08-03 04:11:52 +00:00
|
|
|
if (c == NULL) {
|
2000-03-26 01:59:06 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to create new OSS channel\n");
|
2005-08-03 04:11:52 +00:00
|
|
|
return NULL;
|
2000-03-26 01:59:06 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
return c;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
|
2007-11-23 15:54:13 +00:00
|
|
|
static void store_config_core(struct chan_oss_pvt *o, const char *var, const char *value);
|
|
|
|
|
|
|
|
/*! Generic console command handler. Basically a wrapper for a subset
|
|
|
|
* of config file options which are also available from the CLI
|
|
|
|
*/
|
|
|
|
static char *console_cmd(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
const char *var, *value;
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = CONSOLE_VIDEO_CMDS;
|
2008-12-18 21:21:44 +00:00
|
|
|
e->usage =
|
|
|
|
"Usage: " CONSOLE_VIDEO_CMDS "...\n"
|
|
|
|
" Generic handler for console commands.\n";
|
2007-11-23 15:54:13 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a->argc < e->args)
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
if (o == NULL) {
|
|
|
|
ast_log(LOG_WARNING, "Cannot find device %s (should not happen!)\n",
|
|
|
|
oss_active);
|
|
|
|
return CLI_FAILURE;
|
|
|
|
}
|
|
|
|
var = a->argv[e->args-1];
|
|
|
|
value = a->argc > e->args ? a->argv[e->args] : NULL;
|
|
|
|
if (value) /* handle setting */
|
|
|
|
store_config_core(o, var, value);
|
2007-12-22 18:28:40 +00:00
|
|
|
if (!console_video_cli(o->env, var, a->fd)) /* print video-related values */
|
2007-11-23 15:54:13 +00:00
|
|
|
return CLI_SUCCESS;
|
|
|
|
/* handle other values */
|
|
|
|
if (!strcasecmp(var, "device")) {
|
|
|
|
ast_cli(a->fd, "device is [%s]\n", o->device);
|
|
|
|
}
|
|
|
|
return CLI_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
2008-09-28 23:32:14 +00:00
|
|
|
e->command = "console {set|show} autoanswer [on|off]";
|
2006-11-16 22:44:29 +00:00
|
|
|
e->usage =
|
2008-09-28 23:32:14 +00:00
|
|
|
"Usage: console {set|show} autoanswer [on|off]\n"
|
2006-11-16 22:44:29 +00:00
|
|
|
" Enables or disables autoanswer feature. If used without\n"
|
|
|
|
" argument, displays the current on/off status of autoanswer.\n"
|
|
|
|
" The default value of autoanswer is in 'oss.conf'.\n";
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
case CLI_GENERATE:
|
2006-11-17 11:15:54 +00:00
|
|
|
return NULL;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2006-11-16 22:44:29 +00:00
|
|
|
|
2006-11-17 11:15:54 +00:00
|
|
|
if (a->argc == e->args - 1) {
|
2006-11-16 22:44:29 +00:00
|
|
|
ast_cli(a->fd, "Auto answer is %s.\n", o->autoanswer ? "on" : "off");
|
|
|
|
return CLI_SUCCESS;
|
|
|
|
}
|
2006-11-17 11:15:54 +00:00
|
|
|
if (a->argc != e->args)
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
if (o == NULL) {
|
|
|
|
ast_log(LOG_WARNING, "Cannot find device %s (should not happen!)\n",
|
|
|
|
oss_active);
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2006-11-17 11:15:54 +00:00
|
|
|
if (!strcasecmp(a->argv[e->args-1], "on"))
|
2006-11-16 22:44:29 +00:00
|
|
|
o->autoanswer = 1;
|
2006-11-17 11:15:54 +00:00
|
|
|
else if (!strcasecmp(a->argv[e->args - 1], "off"))
|
2006-09-18 19:54:18 +00:00
|
|
|
o->autoanswer = 0;
|
|
|
|
else
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
2007-12-22 18:28:40 +00:00
|
|
|
/*! \brief helper function for the answer key/cli command */
|
2008-01-03 19:56:29 +00:00
|
|
|
static char *console_do_answer(int fd)
|
2007-12-22 18:28:40 +00:00
|
|
|
{
|
2009-11-04 14:05:12 +00:00
|
|
|
struct ast_frame f = { AST_FRAME_CONTROL, { AST_CONTROL_ANSWER } };
|
2007-12-22 18:28:40 +00:00
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
if (!o->owner) {
|
|
|
|
if (fd > -1)
|
|
|
|
ast_cli(fd, "No one is calling us\n");
|
|
|
|
return CLI_FAILURE;
|
|
|
|
}
|
|
|
|
o->hookstate = 1;
|
|
|
|
ast_queue_frame(o->owner, &f);
|
|
|
|
return CLI_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief answer command from the console
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
2006-11-16 22:44:29 +00:00
|
|
|
static char *console_answer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
2006-11-16 22:44:29 +00:00
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console answer";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console answer\n"
|
|
|
|
" Answers an incoming call on the console (OSS) channel.\n";
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL; /* no completion */
|
|
|
|
}
|
|
|
|
if (a->argc != e->args)
|
|
|
|
return CLI_SHOWUSAGE;
|
2007-12-22 18:28:40 +00:00
|
|
|
return console_do_answer(a->fd);
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief Console send text CLI command
|
|
|
|
*
|
|
|
|
* \note concatenate all arguments into a single string. argv is NULL-terminated
|
2006-02-10 23:19:05 +00:00
|
|
|
* so we can use it right away
|
2005-08-03 04:11:52 +00:00
|
|
|
*/
|
2006-11-16 22:44:29 +00:00
|
|
|
static char *console_sendtext(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
char buf[TEXT_SIZE];
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
if (cmd == CLI_INIT) {
|
|
|
|
e->command = "console send text";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console send text <message>\n"
|
|
|
|
" Sends a text message for display on the remote terminal.\n";
|
|
|
|
return NULL;
|
|
|
|
} else if (cmd == CLI_GENERATE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (a->argc < e->args + 1)
|
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
if (!o->owner) {
|
2006-11-16 22:44:29 +00:00
|
|
|
ast_cli(a->fd, "Not in a call\n");
|
|
|
|
return CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2006-11-16 22:44:29 +00:00
|
|
|
ast_join(buf, sizeof(buf) - 1, a->argv + e->args);
|
2006-09-18 19:54:18 +00:00
|
|
|
if (!ast_strlen_zero(buf)) {
|
|
|
|
struct ast_frame f = { 0, };
|
|
|
|
int i = strlen(buf);
|
|
|
|
buf[i] = '\n';
|
|
|
|
f.frametype = AST_FRAME_TEXT;
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = 0;
|
2008-05-22 16:29:54 +00:00
|
|
|
f.data.ptr = buf;
|
2006-09-18 19:54:18 +00:00
|
|
|
f.datalen = i + 1;
|
|
|
|
ast_queue_frame(o->owner, &f);
|
|
|
|
}
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
static char *console_hangup(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
if (cmd == CLI_INIT) {
|
|
|
|
e->command = "console hangup";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console hangup\n"
|
|
|
|
" Hangs up any call currently placed on the console.\n";
|
|
|
|
return NULL;
|
|
|
|
} else if (cmd == CLI_GENERATE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (a->argc != e->args)
|
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
if (!o->owner && !o->hookstate) { /* XXX maybe only one ? */
|
2006-11-16 22:44:29 +00:00
|
|
|
ast_cli(a->fd, "No call to hang up\n");
|
|
|
|
return CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
o->hookstate = 0;
|
|
|
|
if (o->owner)
|
2008-05-22 16:29:54 +00:00
|
|
|
ast_queue_hangup_with_cause(o->owner, AST_CAUSE_NORMAL_CLEARING);
|
2006-09-18 19:54:18 +00:00
|
|
|
setformat(o, O_CLOSE);
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
static char *console_flash(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
2009-11-04 14:05:12 +00:00
|
|
|
struct ast_frame f = { AST_FRAME_CONTROL, { AST_CONTROL_FLASH } };
|
2006-09-18 19:54:18 +00:00
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
if (cmd == CLI_INIT) {
|
|
|
|
e->command = "console flash";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console flash\n"
|
|
|
|
" Flashes the call currently placed on the console.\n";
|
|
|
|
return NULL;
|
|
|
|
} else if (cmd == CLI_GENERATE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (a->argc != e->args)
|
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-08 03:51:26 +00:00
|
|
|
if (!o->owner) { /* XXX maybe !o->hookstate too ? */
|
2006-11-16 22:44:29 +00:00
|
|
|
ast_cli(a->fd, "No call to flash\n");
|
|
|
|
return CLI_FAILURE;
|
2004-12-23 11:34:33 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
o->hookstate = 0;
|
2009-01-25 23:58:00 +00:00
|
|
|
if (o->owner)
|
2005-08-03 04:11:52 +00:00
|
|
|
ast_queue_frame(o->owner, &f);
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SUCCESS;
|
2004-12-23 11:34:33 +00:00
|
|
|
}
|
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
static char *console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
2009-05-21 21:13:09 +00:00
|
|
|
char *s = NULL;
|
|
|
|
char *mye = NULL, *myc = NULL;
|
2006-09-18 19:54:18 +00:00
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
2000-01-06 12:33:15 +00:00
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
if (cmd == CLI_INIT) {
|
|
|
|
e->command = "console dial";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console dial [extension[@context]]\n"
|
|
|
|
" Dials a given extension (and context if specified)\n";
|
|
|
|
return NULL;
|
|
|
|
} else if (cmd == CLI_GENERATE)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (a->argc > e->args + 1)
|
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
if (o->owner) { /* already in a call */
|
|
|
|
int i;
|
2009-11-04 14:05:12 +00:00
|
|
|
struct ast_frame f = { AST_FRAME_DTMF, { 0 } };
|
2012-03-08 17:02:52 +00:00
|
|
|
const char *digits;
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-11-16 22:44:29 +00:00
|
|
|
if (a->argc == e->args) { /* argument is mandatory here */
|
|
|
|
ast_cli(a->fd, "Already in a call. You can only dial digits until you hangup.\n");
|
|
|
|
return CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2012-03-08 17:02:52 +00:00
|
|
|
digits = a->argv[e->args];
|
2006-09-18 19:54:18 +00:00
|
|
|
/* send the string one char at a time */
|
2012-03-08 17:02:52 +00:00
|
|
|
for (i = 0; i < strlen(digits); i++) {
|
|
|
|
f.subclass.integer = digits[i];
|
2006-09-18 19:54:18 +00:00
|
|
|
ast_queue_frame(o->owner, &f);
|
|
|
|
}
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
/* if we have an argument split it into extension and context */
|
2006-11-16 22:44:29 +00:00
|
|
|
if (a->argc == e->args + 1)
|
|
|
|
s = ast_ext_ctx(a->argv[e->args], &mye, &myc);
|
2006-09-18 19:54:18 +00:00
|
|
|
/* supply default values if needed */
|
|
|
|
if (mye == NULL)
|
|
|
|
mye = o->ext;
|
|
|
|
if (myc == NULL)
|
|
|
|
myc = o->ctx;
|
|
|
|
if (ast_exists_extension(NULL, myc, mye, 1, NULL)) {
|
|
|
|
o->hookstate = 1;
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
oss_new(o, mye, myc, AST_STATE_RINGING, NULL, NULL);
|
2006-09-18 19:54:18 +00:00
|
|
|
} else
|
2006-11-16 22:44:29 +00:00
|
|
|
ast_cli(a->fd, "No such extension '%s' in context '%s'\n", mye, myc);
|
2006-09-18 19:54:18 +00:00
|
|
|
if (s)
|
2007-06-06 21:20:11 +00:00
|
|
|
ast_free(s);
|
2006-11-16 22:44:29 +00:00
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-11-16 23:05:50 +00:00
|
|
|
static char *console_mute(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2005-08-03 04:11:52 +00:00
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
2009-05-21 21:13:09 +00:00
|
|
|
const char *s;
|
2008-06-29 13:02:54 +00:00
|
|
|
int toggle = 0;
|
2006-09-18 19:54:18 +00:00
|
|
|
|
2006-11-16 23:05:50 +00:00
|
|
|
if (cmd == CLI_INIT) {
|
2008-06-29 13:02:54 +00:00
|
|
|
e->command = "console {mute|unmute} [toggle]";
|
2006-11-16 23:05:50 +00:00
|
|
|
e->usage =
|
2008-06-29 13:02:54 +00:00
|
|
|
"Usage: console {mute|unmute} [toggle]\n"
|
2006-11-16 23:05:50 +00:00
|
|
|
" Mute/unmute the microphone.\n";
|
|
|
|
return NULL;
|
|
|
|
} else if (cmd == CLI_GENERATE)
|
2006-11-17 11:15:54 +00:00
|
|
|
return NULL;
|
2006-09-18 19:54:18 +00:00
|
|
|
|
2008-06-29 13:02:54 +00:00
|
|
|
if (a->argc > e->args)
|
2006-11-16 23:05:50 +00:00
|
|
|
return CLI_SHOWUSAGE;
|
2008-06-29 13:02:54 +00:00
|
|
|
if (a->argc == e->args) {
|
|
|
|
if (strcasecmp(a->argv[e->args-1], "toggle"))
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
toggle = 1;
|
|
|
|
}
|
|
|
|
s = a->argv[e->args-2];
|
2006-11-16 23:05:50 +00:00
|
|
|
if (!strcasecmp(s, "mute"))
|
2009-11-12 23:30:10 +00:00
|
|
|
o->mute = toggle ? !o->mute : 1;
|
2006-11-16 23:05:50 +00:00
|
|
|
else if (!strcasecmp(s, "unmute"))
|
2009-11-12 23:30:10 +00:00
|
|
|
o->mute = toggle ? !o->mute : 0;
|
2006-11-16 23:05:50 +00:00
|
|
|
else
|
|
|
|
return CLI_SHOWUSAGE;
|
2008-06-29 13:02:54 +00:00
|
|
|
ast_cli(a->fd, "Console mic is %s\n", o->mute ? "off" : "on");
|
2006-11-16 23:05:50 +00:00
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:03:06 +00:00
|
|
|
static char *console_transfer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2002-08-28 04:07:50 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
char *tmp, *ext, *ctx;
|
|
|
|
|
2007-10-11 19:03:06 +00:00
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console transfer";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console transfer <extension>[@context]\n"
|
|
|
|
" Transfers the currently connected call to the given extension (and\n"
|
|
|
|
" context if specified)\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a->argc != 3)
|
|
|
|
return CLI_SHOWUSAGE;
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o == NULL)
|
2007-10-11 19:03:06 +00:00
|
|
|
return CLI_FAILURE;
|
2013-08-02 14:05:07 +00:00
|
|
|
if (o->owner == NULL || !ast_channel_is_bridged(o->owner)) {
|
2007-10-11 19:03:06 +00:00
|
|
|
ast_cli(a->fd, "There is no call to transfer\n");
|
|
|
|
return CLI_SUCCESS;
|
2005-08-03 04:11:52 +00:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:03:06 +00:00
|
|
|
tmp = ast_ext_ctx(a->argv[2], &ext, &ctx);
|
2013-08-02 14:05:07 +00:00
|
|
|
if (ctx == NULL) { /* supply default context if needed */
|
2012-02-13 17:27:06 +00:00
|
|
|
ctx = ast_strdupa(ast_channel_context(o->owner));
|
2002-08-28 04:07:50 +00:00
|
|
|
}
|
2013-08-02 14:05:07 +00:00
|
|
|
if (ast_bridge_transfer_blind(1, o->owner, ext, ctx, NULL, NULL) != AST_BRIDGE_TRANSFER_SUCCESS) {
|
|
|
|
ast_log(LOG_WARNING, "Unable to transfer call from channel %s\n", ast_channel_name(o->owner));
|
|
|
|
}
|
|
|
|
ast_free(tmp);
|
2007-10-11 19:03:06 +00:00
|
|
|
return CLI_SUCCESS;
|
2002-08-28 04:07:50 +00:00
|
|
|
}
|
|
|
|
|
2007-10-11 19:03:06 +00:00
|
|
|
static char *console_active(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
2007-10-11 19:03:06 +00:00
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
2008-09-28 23:32:14 +00:00
|
|
|
e->command = "console {set|show} active [<device>]";
|
2007-10-11 19:03:06 +00:00
|
|
|
e->usage =
|
|
|
|
"Usage: console active [device]\n"
|
|
|
|
" If used without a parameter, displays which device is the current\n"
|
|
|
|
" console. If a device is specified, the console sound device is changed to\n"
|
|
|
|
" the device specified.\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-09-28 23:32:14 +00:00
|
|
|
if (a->argc == 3)
|
2007-10-11 19:03:06 +00:00
|
|
|
ast_cli(a->fd, "active console is [%s]\n", oss_active);
|
2008-09-28 23:32:14 +00:00
|
|
|
else if (a->argc != 4)
|
2007-10-11 19:03:06 +00:00
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
else {
|
|
|
|
struct chan_oss_pvt *o;
|
2008-09-28 23:32:14 +00:00
|
|
|
if (strcmp(a->argv[3], "show") == 0) {
|
2006-09-18 19:54:18 +00:00
|
|
|
for (o = oss_default.next; o; o = o->next)
|
2007-10-11 19:03:06 +00:00
|
|
|
ast_cli(a->fd, "device [%s] exists\n", o->name);
|
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
2008-09-28 23:32:14 +00:00
|
|
|
o = find_desc(a->argv[3]);
|
2006-09-18 19:54:18 +00:00
|
|
|
if (o == NULL)
|
2008-09-28 23:32:14 +00:00
|
|
|
ast_cli(a->fd, "No device [%s] exists\n", a->argv[3]);
|
2006-09-18 19:54:18 +00:00
|
|
|
else
|
|
|
|
oss_active = o->name;
|
|
|
|
}
|
2007-10-11 19:03:06 +00:00
|
|
|
return CLI_SUCCESS;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
|
|
|
* \brief store the boost factor
|
2006-02-10 23:19:05 +00:00
|
|
|
*/
|
2007-11-14 13:18:40 +00:00
|
|
|
static void store_boost(struct chan_oss_pvt *o, const char *s)
|
2006-02-10 23:19:05 +00:00
|
|
|
{
|
|
|
|
double boost = 0;
|
2009-08-10 19:20:57 +00:00
|
|
|
if (sscanf(s, "%30lf", &boost) != 1) {
|
2006-02-10 23:19:05 +00:00
|
|
|
ast_log(LOG_WARNING, "invalid boost <%s>\n", s);
|
|
|
|
return;
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
if (boost < -BOOST_MAX) {
|
|
|
|
ast_log(LOG_WARNING, "boost %s too small, using %d\n", s, -BOOST_MAX);
|
2006-02-10 23:19:05 +00:00
|
|
|
boost = -BOOST_MAX;
|
|
|
|
} else if (boost > BOOST_MAX) {
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_log(LOG_WARNING, "boost %s too large, using %d\n", s, BOOST_MAX);
|
2006-02-10 23:19:05 +00:00
|
|
|
boost = BOOST_MAX;
|
|
|
|
}
|
2006-09-08 03:51:26 +00:00
|
|
|
boost = exp(log(10) * boost / 20) * BOOST_SCALE;
|
2006-02-10 23:19:05 +00:00
|
|
|
o->boost = boost;
|
|
|
|
ast_log(LOG_WARNING, "setting boost %s to %d\n", s, o->boost);
|
|
|
|
}
|
|
|
|
|
2007-10-11 19:03:06 +00:00
|
|
|
static char *console_boost(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-02-10 23:19:05 +00:00
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o = find_desc(oss_active);
|
|
|
|
|
2007-10-11 19:03:06 +00:00
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console boost";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console boost [boost in dB]\n"
|
|
|
|
" Sets or display mic boost in dB\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a->argc == 2)
|
|
|
|
ast_cli(a->fd, "boost currently %5.1f\n", 20 * log10(((double) o->boost / (double) BOOST_SCALE)));
|
|
|
|
else if (a->argc == 3)
|
|
|
|
store_boost(o, a->argv[2]);
|
|
|
|
return CLI_SUCCESS;
|
2006-02-10 23:19:05 +00:00
|
|
|
}
|
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
static struct ast_cli_entry cli_oss[] = {
|
2007-10-22 20:05:18 +00:00
|
|
|
AST_CLI_DEFINE(console_answer, "Answer an incoming console call"),
|
|
|
|
AST_CLI_DEFINE(console_hangup, "Hangup a call on the console"),
|
|
|
|
AST_CLI_DEFINE(console_flash, "Flash a call on the console"),
|
|
|
|
AST_CLI_DEFINE(console_dial, "Dial an extension on the console"),
|
|
|
|
AST_CLI_DEFINE(console_mute, "Disable/Enable mic input"),
|
|
|
|
AST_CLI_DEFINE(console_transfer, "Transfer a call to a different extension"),
|
2007-11-23 15:54:13 +00:00
|
|
|
AST_CLI_DEFINE(console_cmd, "Generic console command"),
|
2007-10-22 20:05:18 +00:00
|
|
|
AST_CLI_DEFINE(console_sendtext, "Send text to the remote device"),
|
|
|
|
AST_CLI_DEFINE(console_autoanswer, "Sets/displays autoanswer"),
|
|
|
|
AST_CLI_DEFINE(console_boost, "Sets/displays mic boost in dB"),
|
|
|
|
AST_CLI_DEFINE(console_active, "Sets/displays active console"),
|
2000-01-06 12:33:15 +00:00
|
|
|
};
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
2005-08-03 04:11:52 +00:00
|
|
|
* store the mixer argument from the config file, filtering possibly
|
|
|
|
* invalid or dangerous values (the string is used as argument for
|
|
|
|
* system("mixer %s")
|
|
|
|
*/
|
2007-11-14 13:18:40 +00:00
|
|
|
static void store_mixer(struct chan_oss_pvt *o, const char *s)
|
2000-01-06 12:33:15 +00:00
|
|
|
{
|
2005-08-03 04:11:52 +00:00
|
|
|
int i;
|
|
|
|
|
2006-09-08 03:51:26 +00:00
|
|
|
for (i = 0; i < strlen(s); i++) {
|
2008-09-25 22:21:28 +00:00
|
|
|
if (!isalnum(s[i]) && strchr(" \t-/", s[i]) == NULL) {
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_log(LOG_WARNING, "Suspect char %c in mixer cmd, ignoring:\n\t%s\n", s[i], s);
|
2005-08-03 04:11:52 +00:00
|
|
|
return;
|
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o->mixer_cmd)
|
2007-06-06 21:20:11 +00:00
|
|
|
ast_free(o->mixer_cmd);
|
2006-01-11 01:20:29 +00:00
|
|
|
o->mixer_cmd = ast_strdup(s);
|
2005-08-03 04:11:52 +00:00
|
|
|
ast_log(LOG_WARNING, "setting mixer %s\n", s);
|
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
2005-11-21 01:11:40 +00:00
|
|
|
* store the callerid components
|
|
|
|
*/
|
2007-11-14 13:18:40 +00:00
|
|
|
static void store_callerid(struct chan_oss_pvt *o, const char *s)
|
2005-11-21 01:11:40 +00:00
|
|
|
{
|
|
|
|
ast_callerid_split(s, o->cid_name, sizeof(o->cid_name), o->cid_num, sizeof(o->cid_num));
|
|
|
|
}
|
|
|
|
|
2007-11-16 09:51:41 +00:00
|
|
|
static void store_config_core(struct chan_oss_pvt *o, const char *var, const char *value)
|
|
|
|
{
|
add some macros to simplify parsing the config file,
see description in config.h .
They are a variant of the set of macros i used in chan_oss.c,
structured in a way to be more robust to the presence of
spurious ';' - basically, they define wrappers for 'do {'
and '} while (0)', plus some helper functions to deal with simple
cases such as ast_copy_string, ast_malloc, strtoul, ast_true ...
The prefix (CV_ as 'Config Variable') tries to be easy to remember
and has been chosen to not conflict with other existing macros in the tree.
For the time being, I have only updated the three source files in the
tree that used the old M_* macros. Hopefully, more files will be
converted.
NOTE:
I understand that inventing my own dialect of C is generally wrong;
however, the lack of adequate support in the language encourages
lazy programming practices (such as ignoring errors, bounds, etc.)
and this increases the chance of vulnerability in the code, especially
because we are parsing user input here.
Hopefully, these macros and the use of ast_parse_arg (in config.h)
should encourage the programmer to write more robust code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 12:56:07 +00:00
|
|
|
CV_START(var, value);
|
2007-11-16 09:51:41 +00:00
|
|
|
|
|
|
|
/* handle jb conf */
|
2007-12-27 23:00:55 +00:00
|
|
|
if (!ast_jb_read_conf(&global_jbconf, var, value))
|
2007-11-16 09:51:41 +00:00
|
|
|
return;
|
|
|
|
|
2007-11-23 15:54:13 +00:00
|
|
|
if (!console_video_config(&o->env, var, value))
|
2007-12-22 18:28:40 +00:00
|
|
|
return; /* matched there */
|
add some macros to simplify parsing the config file,
see description in config.h .
They are a variant of the set of macros i used in chan_oss.c,
structured in a way to be more robust to the presence of
spurious ';' - basically, they define wrappers for 'do {'
and '} while (0)', plus some helper functions to deal with simple
cases such as ast_copy_string, ast_malloc, strtoul, ast_true ...
The prefix (CV_ as 'Config Variable') tries to be easy to remember
and has been chosen to not conflict with other existing macros in the tree.
For the time being, I have only updated the three source files in the
tree that used the old M_* macros. Hopefully, more files will be
converted.
NOTE:
I understand that inventing my own dialect of C is generally wrong;
however, the lack of adequate support in the language encourages
lazy programming practices (such as ignoring errors, bounds, etc.)
and this increases the chance of vulnerability in the code, especially
because we are parsing user input here.
Hopefully, these macros and the use of ast_parse_arg (in config.h)
should encourage the programmer to write more robust code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-12-20 12:56:07 +00:00
|
|
|
CV_BOOL("autoanswer", o->autoanswer);
|
|
|
|
CV_BOOL("autohangup", o->autohangup);
|
|
|
|
CV_BOOL("overridecontext", o->overridecontext);
|
|
|
|
CV_STR("device", o->device);
|
|
|
|
CV_UINT("frags", o->frags);
|
|
|
|
CV_UINT("debug", oss_debug);
|
|
|
|
CV_UINT("queuesize", o->queuesize);
|
|
|
|
CV_STR("context", o->ctx);
|
|
|
|
CV_STR("language", o->language);
|
|
|
|
CV_STR("mohinterpret", o->mohinterpret);
|
|
|
|
CV_STR("extension", o->ext);
|
|
|
|
CV_F("mixer", store_mixer(o, value));
|
|
|
|
CV_F("callerid", store_callerid(o, value)) ;
|
|
|
|
CV_F("boost", store_boost(o, value));
|
|
|
|
|
|
|
|
CV_END;
|
2007-11-16 09:51:41 +00:00
|
|
|
}
|
|
|
|
|
2006-12-29 13:25:07 +00:00
|
|
|
/*!
|
2005-08-03 04:11:52 +00:00
|
|
|
* grab fields from the config file, init the descriptor and open the device.
|
|
|
|
*/
|
2006-09-08 03:51:26 +00:00
|
|
|
static struct chan_oss_pvt *store_config(struct ast_config *cfg, char *ctg)
|
2005-08-03 04:11:52 +00:00
|
|
|
{
|
|
|
|
struct ast_variable *v;
|
|
|
|
struct chan_oss_pvt *o;
|
|
|
|
|
|
|
|
if (ctg == NULL) {
|
|
|
|
o = &oss_default;
|
|
|
|
ctg = "general";
|
|
|
|
} else {
|
2006-01-11 01:20:29 +00:00
|
|
|
if (!(o = ast_calloc(1, sizeof(*o))))
|
2005-08-03 04:11:52 +00:00
|
|
|
return NULL;
|
|
|
|
*o = oss_default;
|
|
|
|
/* "general" is also the default thing */
|
|
|
|
if (strcmp(ctg, "general") == 0) {
|
2006-01-11 01:20:29 +00:00
|
|
|
o->name = ast_strdup("dsp");
|
2005-08-03 04:11:52 +00:00
|
|
|
oss_active = o->name;
|
|
|
|
goto openit;
|
2001-05-03 04:32:56 +00:00
|
|
|
}
|
2006-01-11 01:20:29 +00:00
|
|
|
o->name = ast_strdup(ctg);
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-07-19 20:44:39 +00:00
|
|
|
strcpy(o->mohinterpret, "default");
|
|
|
|
|
2006-09-08 03:51:26 +00:00
|
|
|
o->lastopen = ast_tvnow(); /* don't leave it 0 or tvdiff may wrap */
|
2005-08-03 04:11:52 +00:00
|
|
|
/* fill other fields from configuration */
|
2006-09-08 03:51:26 +00:00
|
|
|
for (v = ast_variable_browse(cfg, ctg); v; v = v->next) {
|
2007-11-16 09:51:41 +00:00
|
|
|
store_config_core(o, v->name, v->value);
|
2005-08-03 04:11:52 +00:00
|
|
|
}
|
|
|
|
if (ast_strlen_zero(o->device))
|
|
|
|
ast_copy_string(o->device, DEV_DSP, sizeof(o->device));
|
|
|
|
if (o->mixer_cmd) {
|
|
|
|
char *cmd;
|
|
|
|
|
2012-08-21 21:01:11 +00:00
|
|
|
if (ast_asprintf(&cmd, "mixer %s", o->mixer_cmd) >= 0) {
|
2008-11-02 18:52:13 +00:00
|
|
|
ast_log(LOG_WARNING, "running [%s]\n", cmd);
|
|
|
|
if (system(cmd) < 0) {
|
|
|
|
ast_log(LOG_WARNING, "system() failed: %s\n", strerror(errno));
|
|
|
|
}
|
|
|
|
ast_free(cmd);
|
|
|
|
}
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2008-06-30 15:45:15 +00:00
|
|
|
|
|
|
|
/* if the config file requested to start the GUI, do it */
|
|
|
|
if (get_gui_startup(o->env))
|
|
|
|
console_video_start(o->env, NULL);
|
|
|
|
|
2006-09-08 03:51:26 +00:00
|
|
|
if (o == &oss_default) /* we are done with the default */
|
2005-08-03 04:11:52 +00:00
|
|
|
return NULL;
|
|
|
|
|
2008-01-03 19:56:29 +00:00
|
|
|
openit:
|
2007-02-18 15:03:42 +00:00
|
|
|
#ifdef TRYOPEN
|
2005-08-03 04:11:52 +00:00
|
|
|
if (setformat(o, O_RDWR) < 0) { /* open device */
|
2007-07-26 15:49:18 +00:00
|
|
|
ast_verb(1, "Device %s not detected\n", ctg);
|
|
|
|
ast_verb(1, "Turn off OSS support by adding " "'noload=chan_oss.so' in /etc/asterisk/modules.conf\n");
|
2005-08-03 04:11:52 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (o->duplex != M_FULL)
|
2006-09-08 03:51:26 +00:00
|
|
|
ast_log(LOG_WARNING, "XXX I don't work right with non " "full-duplex sound cards XXX\n");
|
2005-08-03 04:11:52 +00:00
|
|
|
#endif /* TRYOPEN */
|
2008-01-03 19:56:29 +00:00
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
/* link into list of devices */
|
|
|
|
if (o != &oss_default) {
|
|
|
|
o->next = oss_default.next;
|
|
|
|
oss_default.next = o;
|
|
|
|
}
|
|
|
|
return o;
|
|
|
|
|
2008-01-03 19:56:29 +00:00
|
|
|
#ifdef TRYOPEN
|
|
|
|
error:
|
2005-08-03 04:11:52 +00:00
|
|
|
if (o != &oss_default)
|
2007-06-06 21:20:11 +00:00
|
|
|
ast_free(o);
|
2005-08-03 04:11:52 +00:00
|
|
|
return NULL;
|
2008-01-03 19:56:29 +00:00
|
|
|
#endif
|
2005-08-03 04:11:52 +00:00
|
|
|
}
|
|
|
|
|
2017-04-11 16:07:39 +00:00
|
|
|
static int unload_module(void)
|
|
|
|
{
|
|
|
|
struct chan_oss_pvt *o, *next;
|
|
|
|
|
|
|
|
ast_channel_unregister(&oss_tech);
|
|
|
|
ast_cli_unregister_multiple(cli_oss, ARRAY_LEN(cli_oss));
|
|
|
|
|
|
|
|
o = oss_default.next;
|
|
|
|
while (o) {
|
|
|
|
close(o->sounddev);
|
|
|
|
if (o->owner)
|
|
|
|
ast_softhangup(o->owner, AST_SOFTHANGUP_APPUNLOAD);
|
|
|
|
if (o->owner)
|
|
|
|
return -1;
|
|
|
|
next = o->next;
|
|
|
|
ast_free(o->name);
|
|
|
|
ast_free(o);
|
|
|
|
o = next;
|
|
|
|
}
|
|
|
|
ao2_cleanup(oss_tech.capabilities);
|
|
|
|
oss_tech.capabilities = NULL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-10-01 23:24:35 +00:00
|
|
|
/*!
|
|
|
|
* \brief Load the module
|
|
|
|
*
|
|
|
|
* Module loading including tests for configuration or dependencies.
|
|
|
|
* This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
|
|
|
|
* or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
|
|
|
|
* tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
|
|
|
|
* configuration file or other non-critical problem return
|
|
|
|
* AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
|
|
|
|
*/
|
2006-08-21 02:11:39 +00:00
|
|
|
static int load_module(void)
|
2005-08-03 04:11:52 +00:00
|
|
|
{
|
2006-09-21 22:23:30 +00:00
|
|
|
struct ast_config *cfg = NULL;
|
|
|
|
char *ctg = NULL;
|
2007-08-16 21:09:46 +00:00
|
|
|
struct ast_flags config_flags = { 0 };
|
2005-08-03 04:11:52 +00:00
|
|
|
|
2006-05-31 16:56:50 +00:00
|
|
|
/* Copy the default jb config over global_jbconf */
|
|
|
|
memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
/* load config file */
|
2007-08-16 21:09:46 +00:00
|
|
|
if (!(cfg = ast_config_load(config, config_flags))) {
|
2006-09-21 22:23:30 +00:00
|
|
|
ast_log(LOG_NOTICE, "Unable to load config %s\n", config);
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2008-09-12 23:30:03 +00:00
|
|
|
} else if (cfg == CONFIG_STATUS_FILEINVALID) {
|
|
|
|
ast_log(LOG_ERROR, "Config file %s is in an invalid format. Aborting.\n", config);
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
2006-09-21 22:23:30 +00:00
|
|
|
|
|
|
|
do {
|
|
|
|
store_config(cfg, ctg);
|
|
|
|
} while ( (ctg = ast_category_browse(cfg, ctg)) != NULL);
|
|
|
|
|
|
|
|
ast_config_destroy(cfg);
|
|
|
|
|
2005-08-03 04:11:52 +00:00
|
|
|
if (find_desc(oss_active) == NULL) {
|
|
|
|
ast_log(LOG_NOTICE, "Device %s not found\n", oss_active);
|
|
|
|
/* XXX we could default to 'dsp' perhaps ? */
|
2017-04-11 16:07:39 +00:00
|
|
|
unload_module();
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2005-08-03 04:11:52 +00:00
|
|
|
}
|
2006-09-21 22:23:30 +00:00
|
|
|
|
2013-10-03 14:58:16 +00:00
|
|
|
if (!(oss_tech.capabilities = ast_format_cap_alloc(0))) {
|
2017-04-11 16:07:39 +00:00
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2011-02-03 16:22:10 +00:00
|
|
|
}
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_format_cap_append(oss_tech.capabilities, ast_format_slin, 0);
|
2011-02-03 16:22:10 +00:00
|
|
|
|
|
|
|
/* TODO XXX CONSOLE VIDEO IS DISABLE UNTIL IT HAS A MAINTAINER
|
|
|
|
* add console_video_formats to oss_tech.capabilities once this occurs. */
|
2007-12-22 18:28:40 +00:00
|
|
|
|
2006-09-21 22:23:30 +00:00
|
|
|
if (ast_channel_register(&oss_tech)) {
|
2006-12-24 21:21:21 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to register channel type 'OSS'\n");
|
2010-06-09 22:19:20 +00:00
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2005-08-03 04:11:52 +00:00
|
|
|
}
|
2006-09-21 22:23:30 +00:00
|
|
|
|
2008-12-05 10:31:25 +00:00
|
|
|
ast_cli_register_multiple(cli_oss, ARRAY_LEN(cli_oss));
|
2006-09-21 22:23:30 +00:00
|
|
|
|
|
|
|
return AST_MODULE_LOAD_SUCCESS;
|
2000-01-06 12:33:15 +00:00
|
|
|
}
|
|
|
|
|
2014-07-25 16:47:17 +00:00
|
|
|
AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "OSS Console Channel Driver");
|
|
|
|
|