update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@418 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
1e04eb13b5
commit
0ea203849f
|
@ -1 +0,0 @@
|
||||||
-brs -npsl -di0 -br -ce -d0 -cli0 -npcs -nfc1 -ut -i4 -ts4 -l120 -cs -T size_t -T pieces -T switch_file_t -T switch_thread_cond_t -T switch_thread -T switch_threadattr_t -T switch_thread_start_t -T switch_socket_t -T switch_sockaddr_t -T switch_memory_pool -T switch_pollfd_t -T switch_pollset_t -T switch_time_t -T switch_time_exp_t -T switch_hash -T switch_hash_index_t -T switch_strmatch_pattern -T switch_uuid_t -T switch_queue_t -T switch_mutex_t -T __int8 -T __int16 -T __int32 -T __int64 -T int8_t -T int16_t -T int32_t -T int64_t -T long -T switch_core_db -T switch_core_session_message -T switch_audio_resampler -T switch_event_header -T switch_event -T switch_event_subclass -T switch_event_node -T switch_loadable_module -T switch_frame -T switch_channel -T switch_endpoint_interface -T switch_timer_interface -T switch_dialplan_interface -T switch_codec_interface -T switch_application_interface -T switch_api_interface -T switch_file_interface -T switch_file_handle -T switch_core_session -T switch_loadable_module_interface -T switch_caller_profile -T switch_caller_step -T switch_caller_extension -T switch_caller_application -T switch_event_handler_table -T switch_timer -T switch_codec -T switch_core_thread_session -T switch_codec_implementation -T switch_io_event_hook_outgoing_channel -T switch_io_event_hook_answer_channel -T switch_io_event_hook_receive_message -T switch_io_event_hook_read_frame -T switch_io_event_hook_write_frame -T switch_io_event_hook_kill_channel -T switch_io_event_hook_waitfor_read -T switch_io_event_hook_waitfor_write -T switch_io_event_hook_send_dtmf -T switch_io_routines -T switch_io_event_hooks -T switch_buffer -T switch_codec_settings -T switch_config -T switch_lock_flag -T switch_core_session_message_t -T switch_stack_t -T switch_status -T switch_text_channel -T switch_channel_state -T switch_channel_flag -T switch_signal -T switch_codec_flag -T switch_codec_type -T switch_timer_flag -T switch_file_flag -T switch_io_flag -T switch_event_t
|
|
25
AUTHORS
25
AUTHORS
|
@ -1,25 +0,0 @@
|
||||||
The Initial Developer of the Original Code is
|
|
||||||
Anthony Minessale II <anthmct@yahoo.com>
|
|
||||||
Portions created by the Initial Developer are Copyright (C)
|
|
||||||
the Initial Developer. All Rights Reserved.
|
|
||||||
|
|
||||||
The PRIMARY AUTHORS are (and/or have been):
|
|
||||||
|
|
||||||
Anthony Minessale II <anthmct@yahoo.com> - Primary developer of all core components
|
|
||||||
and many of the included modules. Much of freeswitch is based on his work.
|
|
||||||
|
|
||||||
Michael Jerris <mike@jerris.com> - Windows porter and responsible for the
|
|
||||||
windows\msvc build system.
|
|
||||||
|
|
||||||
|
|
||||||
And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
|
|
||||||
people who have submitted patches, reported bugs, and generally made Freeswitch
|
|
||||||
that much better:
|
|
||||||
|
|
||||||
Joshua Colp - For his help making mod_exosip possible, and for just being a swell guy!
|
|
||||||
Brian K. West - For countless hours of work on BSD and Mac support, finding countless bugs,
|
|
||||||
and moral support.
|
|
||||||
|
|
||||||
A big THANK YOU goes to:
|
|
||||||
|
|
||||||
|
|
811
COPYING
811
COPYING
|
@ -1,471 +1,340 @@
|
||||||
MOZILLA PUBLIC LICENSE
|
GNU GENERAL PUBLIC LICENSE
|
||||||
Version 1.1
|
Version 2, June 1991
|
||||||
|
|
||||||
---------------
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||||
|
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
1. Definitions.
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
1.0.1. "Commercial Use" means distribution or otherwise making the
|
|
||||||
Covered Code available to a third party.
|
Preamble
|
||||||
|
|
||||||
1.1. "Contributor" means each entity that creates or contributes to
|
The licenses for most software are designed to take away your
|
||||||
the creation of Modifications.
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
License is intended to guarantee your freedom to share and change free
|
||||||
1.2. "Contributor Version" means the combination of the Original
|
software--to make sure the software is free for all its users. This
|
||||||
Code, prior Modifications used by a Contributor, and the Modifications
|
General Public License applies to most of the Free Software
|
||||||
made by that particular Contributor.
|
Foundation's software and to any other program whose authors commit to
|
||||||
|
using it. (Some other Free Software Foundation software is covered by
|
||||||
1.3. "Covered Code" means the Original Code or Modifications or the
|
the GNU Library General Public License instead.) You can apply it to
|
||||||
combination of the Original Code and Modifications, in each case
|
your programs, too.
|
||||||
including portions thereof.
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
1.4. "Electronic Distribution Mechanism" means a mechanism generally
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
accepted in the software development community for the electronic
|
have the freedom to distribute copies of free software (and charge for
|
||||||
transfer of data.
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
1.5. "Executable" means Covered Code in any form other than Source
|
in new free programs; and that you know you can do these things.
|
||||||
Code.
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
1.6. "Initial Developer" means the individual or entity identified
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
as the Initial Developer in the Source Code notice required by Exhibit
|
These restrictions translate to certain responsibilities for you if you
|
||||||
A.
|
distribute copies of the software, or if you modify it.
|
||||||
|
|
||||||
1.7. "Larger Work" means a work which combines Covered Code or
|
For example, if you distribute copies of such a program, whether
|
||||||
portions thereof with code not governed by the terms of this License.
|
gratis or for a fee, you must give the recipients all the rights that
|
||||||
|
you have. You must make sure that they, too, receive or can get the
|
||||||
1.8. "License" means this document.
|
source code. And you must show them these terms so they know their
|
||||||
|
rights.
|
||||||
1.8.1. "Licensable" means having the right to grant, to the maximum
|
|
||||||
extent possible, whether at the time of the initial grant or
|
We protect your rights with two steps: (1) copyright the software, and
|
||||||
subsequently acquired, any and all of the rights conveyed herein.
|
(2) offer you this license which gives you legal permission to copy,
|
||||||
|
distribute and/or modify the software.
|
||||||
1.9. "Modifications" means any addition to or deletion from the
|
|
||||||
substance or structure of either the Original Code or any previous
|
Also, for each author's protection and ours, we want to make certain
|
||||||
Modifications. When Covered Code is released as a series of files, a
|
that everyone understands that there is no warranty for this free
|
||||||
Modification is:
|
software. If the software is modified by someone else and passed on, we
|
||||||
A. Any addition to or deletion from the contents of a file
|
want its recipients to know that what they have is not the original, so
|
||||||
containing Original Code or previous Modifications.
|
that any problems introduced by others will not reflect on the original
|
||||||
|
authors' reputations.
|
||||||
B. Any new file that contains any part of the Original Code or
|
|
||||||
previous Modifications.
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that redistributors of a free
|
||||||
1.10. "Original Code" means Source Code of computer software code
|
program will individually obtain patent licenses, in effect making the
|
||||||
which is described in the Source Code notice required by Exhibit A as
|
program proprietary. To prevent this, we have made it clear that any
|
||||||
Original Code, and which, at the time of its release under this
|
patent must be licensed for everyone's free use or not licensed at all.
|
||||||
License is not already Covered Code governed by this License.
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
1.10.1. "Patent Claims" means any patent claim(s), now owned or
|
modification follow.
|
||||||
hereafter acquired, including without limitation, method, process,
|
|
||||||
and apparatus claims, in any patent Licensable by grantor.
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
1.11. "Source Code" means the preferred form of the Covered Code for
|
|
||||||
making modifications to it, including all modules it contains, plus
|
0. This License applies to any program or other work which contains
|
||||||
any associated interface definition files, scripts used to control
|
a notice placed by the copyright holder saying it may be distributed
|
||||||
compilation and installation of an Executable, or source code
|
under the terms of this General Public License. The "Program", below,
|
||||||
differential comparisons against either the Original Code or another
|
refers to any such program or work, and a "work based on the Program"
|
||||||
well known, available Covered Code of the Contributor's choice. The
|
means either the Program or any derivative work under copyright law:
|
||||||
Source Code can be in a compressed or archival form, provided the
|
that is to say, a work containing the Program or a portion of it,
|
||||||
appropriate decompression or de-archiving software is widely available
|
either verbatim or with modifications and/or translated into another
|
||||||
for no charge.
|
language. (Hereinafter, translation is included without limitation in
|
||||||
|
the term "modification".) Each licensee is addressed as "you".
|
||||||
1.12. "You" (or "Your") means an individual or a legal entity
|
|
||||||
exercising rights under, and complying with all of the terms of, this
|
Activities other than copying, distribution and modification are not
|
||||||
License or a future version of this License issued under Section 6.1.
|
covered by this License; they are outside its scope. The act of
|
||||||
For legal entities, "You" includes any entity which controls, is
|
running the Program is not restricted, and the output from the Program
|
||||||
controlled by, or is under common control with You. For purposes of
|
is covered only if its contents constitute a work based on the
|
||||||
this definition, "control" means (a) the power, direct or indirect,
|
Program (independent of having been made by running the Program).
|
||||||
to cause the direction or management of such entity, whether by
|
Whether that is true depends on what the Program does.
|
||||||
contract or otherwise, or (b) ownership of more than fifty percent
|
|
||||||
(50%) of the outstanding shares or beneficial ownership of such
|
1. You may copy and distribute verbatim copies of the Program's
|
||||||
entity.
|
source code as you receive it, in any medium, provided that you
|
||||||
|
conspicuously and appropriately publish on each copy an appropriate
|
||||||
2. Source Code License.
|
copyright notice and disclaimer of warranty; keep intact all the
|
||||||
|
notices that refer to this License and to the absence of any warranty;
|
||||||
2.1. The Initial Developer Grant.
|
and give any other recipients of the Program a copy of this License
|
||||||
The Initial Developer hereby grants You a world-wide, royalty-free,
|
along with the Program.
|
||||||
non-exclusive license, subject to third party intellectual property
|
|
||||||
claims:
|
You may charge a fee for the physical act of transferring a copy, and
|
||||||
(a) under intellectual property rights (other than patent or
|
you may at your option offer warranty protection in exchange for a fee.
|
||||||
trademark) Licensable by Initial Developer to use, reproduce,
|
|
||||||
modify, display, perform, sublicense and distribute the Original
|
2. You may modify your copy or copies of the Program or any portion
|
||||||
Code (or portions thereof) with or without Modifications, and/or
|
of it, thus forming a work based on the Program, and copy and
|
||||||
as part of a Larger Work; and
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
(b) under Patents Claims infringed by the making, using or
|
|
||||||
selling of Original Code, to make, have made, use, practice,
|
a) You must cause the modified files to carry prominent notices
|
||||||
sell, and offer for sale, and/or otherwise dispose of the
|
stating that you changed the files and the date of any change.
|
||||||
Original Code (or portions thereof).
|
|
||||||
|
b) You must cause any work that you distribute or publish, that in
|
||||||
(c) the licenses granted in this Section 2.1(a) and (b) are
|
whole or in part contains or is derived from the Program or any
|
||||||
effective on the date Initial Developer first distributes
|
part thereof, to be licensed as a whole at no charge to all third
|
||||||
Original Code under the terms of this License.
|
parties under the terms of this License.
|
||||||
|
|
||||||
(d) Notwithstanding Section 2.1(b) above, no patent license is
|
c) If the modified program normally reads commands interactively
|
||||||
granted: 1) for code that You delete from the Original Code; 2)
|
when run, you must cause it, when started running for such
|
||||||
separate from the Original Code; or 3) for infringements caused
|
interactive use in the most ordinary way, to print or display an
|
||||||
by: i) the modification of the Original Code or ii) the
|
announcement including an appropriate copyright notice and a
|
||||||
combination of the Original Code with other software or devices.
|
notice that there is no warranty (or else, saying that you provide
|
||||||
|
a warranty) and that users may redistribute the program under
|
||||||
2.2. Contributor Grant.
|
these conditions, and telling the user how to view a copy of this
|
||||||
Subject to third party intellectual property claims, each Contributor
|
License. (Exception: if the Program itself is interactive but
|
||||||
hereby grants You a world-wide, royalty-free, non-exclusive license
|
does not normally print such an announcement, your work based on
|
||||||
|
the Program is not required to print an announcement.)
|
||||||
(a) under intellectual property rights (other than patent or
|
|
||||||
trademark) Licensable by Contributor, to use, reproduce, modify,
|
These requirements apply to the modified work as a whole. If
|
||||||
display, perform, sublicense and distribute the Modifications
|
identifiable sections of that work are not derived from the Program,
|
||||||
created by such Contributor (or portions thereof) either on an
|
and can be reasonably considered independent and separate works in
|
||||||
unmodified basis, with other Modifications, as Covered Code
|
themselves, then this License, and its terms, do not apply to those
|
||||||
and/or as part of a Larger Work; and
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
(b) under Patent Claims infringed by the making, using, or
|
on the Program, the distribution of the whole must be on the terms of
|
||||||
selling of Modifications made by that Contributor either alone
|
this License, whose permissions for other licensees extend to the
|
||||||
and/or in combination with its Contributor Version (or portions
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
of such combination), to make, use, sell, offer for sale, have
|
|
||||||
made, and/or otherwise dispose of: 1) Modifications made by that
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
Contributor (or portions thereof); and 2) the combination of
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
Modifications made by that Contributor with its Contributor
|
exercise the right to control the distribution of derivative or
|
||||||
Version (or portions of such combination).
|
collective works based on the Program.
|
||||||
|
|
||||||
(c) the licenses granted in Sections 2.2(a) and 2.2(b) are
|
In addition, mere aggregation of another work not based on the Program
|
||||||
effective on the date Contributor first makes Commercial Use of
|
with the Program (or with a work based on the Program) on a volume of
|
||||||
the Covered Code.
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
(d) Notwithstanding Section 2.2(b) above, no patent license is
|
|
||||||
granted: 1) for any code that Contributor has deleted from the
|
3. You may copy and distribute the Program (or a work based on it,
|
||||||
Contributor Version; 2) separate from the Contributor Version;
|
under Section 2) in object code or executable form under the terms of
|
||||||
3) for infringements caused by: i) third party modifications of
|
Sections 1 and 2 above provided that you also do one of the following:
|
||||||
Contributor Version or ii) the combination of Modifications made
|
|
||||||
by that Contributor with other software (except as part of the
|
a) Accompany it with the complete corresponding machine-readable
|
||||||
Contributor Version) or other devices; or 4) under Patent Claims
|
source code, which must be distributed under the terms of Sections
|
||||||
infringed by Covered Code in the absence of Modifications made by
|
1 and 2 above on a medium customarily used for software interchange; or,
|
||||||
that Contributor.
|
|
||||||
|
b) Accompany it with a written offer, valid for at least three
|
||||||
3. Distribution Obligations.
|
years, to give any third party, for a charge no more than your
|
||||||
|
cost of physically performing source distribution, a complete
|
||||||
3.1. Application of License.
|
machine-readable copy of the corresponding source code, to be
|
||||||
The Modifications which You create or to which You contribute are
|
distributed under the terms of Sections 1 and 2 above on a medium
|
||||||
governed by the terms of this License, including without limitation
|
customarily used for software interchange; or,
|
||||||
Section 2.2. The Source Code version of Covered Code may be
|
|
||||||
distributed only under the terms of this License or a future version
|
c) Accompany it with the information you received as to the offer
|
||||||
of this License released under Section 6.1, and You must include a
|
to distribute corresponding source code. (This alternative is
|
||||||
copy of this License with every copy of the Source Code You
|
allowed only for noncommercial distribution and only if you
|
||||||
distribute. You may not offer or impose any terms on any Source Code
|
received the program in object code or executable form with such
|
||||||
version that alters or restricts the applicable version of this
|
an offer, in accord with Subsection b above.)
|
||||||
License or the recipients' rights hereunder. However, You may include
|
|
||||||
an additional document offering the additional rights described in
|
The source code for a work means the preferred form of the work for
|
||||||
Section 3.5.
|
making modifications to it. For an executable work, complete source
|
||||||
|
code means all the source code for all modules it contains, plus any
|
||||||
3.2. Availability of Source Code.
|
associated interface definition files, plus the scripts used to
|
||||||
Any Modification which You create or to which You contribute must be
|
control compilation and installation of the executable. However, as a
|
||||||
made available in Source Code form under the terms of this License
|
special exception, the source code distributed need not include
|
||||||
either on the same media as an Executable version or via an accepted
|
anything that is normally distributed (in either source or binary
|
||||||
Electronic Distribution Mechanism to anyone to whom you made an
|
form) with the major components (compiler, kernel, and so on) of the
|
||||||
Executable version available; and if made available via Electronic
|
operating system on which the executable runs, unless that component
|
||||||
Distribution Mechanism, must remain available for at least twelve (12)
|
itself accompanies the executable.
|
||||||
months after the date it initially became available, or at least six
|
|
||||||
(6) months after a subsequent version of that particular Modification
|
If distribution of executable or object code is made by offering
|
||||||
has been made available to such recipients. You are responsible for
|
access to copy from a designated place, then offering equivalent
|
||||||
ensuring that the Source Code version remains available even if the
|
access to copy the source code from the same place counts as
|
||||||
Electronic Distribution Mechanism is maintained by a third party.
|
distribution of the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
3.3. Description of Modifications.
|
|
||||||
You must cause all Covered Code to which You contribute to contain a
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
file documenting the changes You made to create that Covered Code and
|
except as expressly provided under this License. Any attempt
|
||||||
the date of any change. You must include a prominent statement that
|
otherwise to copy, modify, sublicense or distribute the Program is
|
||||||
the Modification is derived, directly or indirectly, from Original
|
void, and will automatically terminate your rights under this License.
|
||||||
Code provided by the Initial Developer and including the name of the
|
However, parties who have received copies, or rights, from you under
|
||||||
Initial Developer in (a) the Source Code, and (b) in any notice in an
|
this License will not have their licenses terminated so long as such
|
||||||
Executable version or related documentation in which You describe the
|
parties remain in full compliance.
|
||||||
origin or ownership of the Covered Code.
|
|
||||||
|
5. You are not required to accept this License, since you have not
|
||||||
3.4. Intellectual Property Matters
|
signed it. However, nothing else grants you permission to modify or
|
||||||
(a) Third Party Claims.
|
distribute the Program or its derivative works. These actions are
|
||||||
If Contributor has knowledge that a license under a third party's
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
intellectual property rights is required to exercise the rights
|
modifying or distributing the Program (or any work based on the
|
||||||
granted by such Contributor under Sections 2.1 or 2.2,
|
Program), you indicate your acceptance of this License to do so, and
|
||||||
Contributor must include a text file with the Source Code
|
all its terms and conditions for copying, distributing or modifying
|
||||||
distribution titled "LEGAL" which describes the claim and the
|
the Program or works based on it.
|
||||||
party making the claim in sufficient detail that a recipient will
|
|
||||||
know whom to contact. If Contributor obtains such knowledge after
|
6. Each time you redistribute the Program (or any work based on the
|
||||||
the Modification is made available as described in Section 3.2,
|
Program), the recipient automatically receives a license from the
|
||||||
Contributor shall promptly modify the LEGAL file in all copies
|
original licensor to copy, distribute or modify the Program subject to
|
||||||
Contributor makes available thereafter and shall take other steps
|
these terms and conditions. You may not impose any further
|
||||||
(such as notifying appropriate mailing lists or newsgroups)
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
reasonably calculated to inform those who received the Covered
|
You are not responsible for enforcing compliance by third parties to
|
||||||
Code that new knowledge has been obtained.
|
this License.
|
||||||
|
|
||||||
(b) Contributor APIs.
|
7. If, as a consequence of a court judgment or allegation of patent
|
||||||
If Contributor's Modifications include an application programming
|
infringement or for any other reason (not limited to patent issues),
|
||||||
interface and Contributor has knowledge of patent licenses which
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
are reasonably necessary to implement that API, Contributor must
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
also include this information in the LEGAL file.
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
(c) Representations.
|
License and any other pertinent obligations, then as a consequence you
|
||||||
Contributor represents that, except as disclosed pursuant to
|
may not distribute the Program at all. For example, if a patent
|
||||||
Section 3.4(a) above, Contributor believes that Contributor's
|
license would not permit royalty-free redistribution of the Program by
|
||||||
Modifications are Contributor's original creation(s) and/or
|
all those who receive copies directly or indirectly through you, then
|
||||||
Contributor has sufficient rights to grant the rights conveyed by
|
the only way you could satisfy both it and this License would be to
|
||||||
this License.
|
refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
3.5. Required Notices.
|
If any portion of this section is held invalid or unenforceable under
|
||||||
You must duplicate the notice in Exhibit A in each file of the Source
|
any particular circumstance, the balance of the section is intended to
|
||||||
Code. If it is not possible to put such notice in a particular Source
|
apply and the section as a whole is intended to apply in other
|
||||||
Code file due to its structure, then You must include such notice in a
|
circumstances.
|
||||||
location (such as a relevant directory) where a user would be likely
|
|
||||||
to look for such a notice. If You created one or more Modification(s)
|
It is not the purpose of this section to induce you to infringe any
|
||||||
You may add your name as a Contributor to the notice described in
|
patents or other property right claims or to contest validity of any
|
||||||
Exhibit A. You must also duplicate this License in any documentation
|
such claims; this section has the sole purpose of protecting the
|
||||||
for the Source Code where You describe recipients' rights or ownership
|
integrity of the free software distribution system, which is
|
||||||
rights relating to Covered Code. You may choose to offer, and to
|
implemented by public license practices. Many people have made
|
||||||
charge a fee for, warranty, support, indemnity or liability
|
generous contributions to the wide range of software distributed
|
||||||
obligations to one or more recipients of Covered Code. However, You
|
through that system in reliance on consistent application of that
|
||||||
may do so only on Your own behalf, and not on behalf of the Initial
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
Developer or any Contributor. You must make it absolutely clear than
|
to distribute software through any other system and a licensee cannot
|
||||||
any such warranty, support, indemnity or liability obligation is
|
impose that choice.
|
||||||
offered by You alone, and You hereby agree to indemnify the Initial
|
|
||||||
Developer and every Contributor for any liability incurred by the
|
This section is intended to make thoroughly clear what is believed to
|
||||||
Initial Developer or such Contributor as a result of warranty,
|
be a consequence of the rest of this License.
|
||||||
support, indemnity or liability terms You offer.
|
|
||||||
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
3.6. Distribution of Executable Versions.
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
You may distribute Covered Code in Executable form only if the
|
original copyright holder who places the Program under this License
|
||||||
requirements of Section 3.1-3.5 have been met for that Covered Code,
|
may add an explicit geographical distribution limitation excluding
|
||||||
and if You include a notice stating that the Source Code version of
|
those countries, so that distribution is permitted only in or among
|
||||||
the Covered Code is available under the terms of this License,
|
countries not thus excluded. In such case, this License incorporates
|
||||||
including a description of how and where You have fulfilled the
|
the limitation as if written in the body of this License.
|
||||||
obligations of Section 3.2. The notice must be conspicuously included
|
|
||||||
in any notice in an Executable version, related documentation or
|
9. The Free Software Foundation may publish revised and/or new versions
|
||||||
collateral in which You describe recipients' rights relating to the
|
of the General Public License from time to time. Such new versions will
|
||||||
Covered Code. You may distribute the Executable version of Covered
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
Code or ownership rights under a license of Your choice, which may
|
address new problems or concerns.
|
||||||
contain terms different from this License, provided that You are in
|
|
||||||
compliance with the terms of this License and that the license for the
|
Each version is given a distinguishing version number. If the Program
|
||||||
Executable version does not attempt to limit or alter the recipient's
|
specifies a version number of this License which applies to it and "any
|
||||||
rights in the Source Code version from the rights set forth in this
|
later version", you have the option of following the terms and conditions
|
||||||
License. If You distribute the Executable version under a different
|
either of that version or of any later version published by the Free
|
||||||
license You must make it absolutely clear that any terms which differ
|
Software Foundation. If the Program does not specify a version number of
|
||||||
from this License are offered by You alone, not by the Initial
|
this License, you may choose any version ever published by the Free Software
|
||||||
Developer or any Contributor. You hereby agree to indemnify the
|
Foundation.
|
||||||
Initial Developer and every Contributor for any liability incurred by
|
|
||||||
the Initial Developer or such Contributor as a result of any such
|
10. If you wish to incorporate parts of the Program into other free
|
||||||
terms You offer.
|
programs whose distribution conditions are different, write to the author
|
||||||
|
to ask for permission. For software which is copyrighted by the Free
|
||||||
3.7. Larger Works.
|
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||||
You may create a Larger Work by combining Covered Code with other code
|
make exceptions for this. Our decision will be guided by the two goals
|
||||||
not governed by the terms of this License and distribute the Larger
|
of preserving the free status of all derivatives of our free software and
|
||||||
Work as a single product. In such a case, You must make sure the
|
of promoting the sharing and reuse of software generally.
|
||||||
requirements of this License are fulfilled for the Covered Code.
|
|
||||||
|
NO WARRANTY
|
||||||
4. Inability to Comply Due to Statute or Regulation.
|
|
||||||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
If it is impossible for You to comply with any of the terms of this
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
License with respect to some or all of the Covered Code due to
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
statute, judicial order, or regulation then You must: (a) comply with
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
the terms of this License to the maximum extent possible; and (b)
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
describe the limitations and the code they affect. Such description
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||||
must be included in the LEGAL file described in Section 3.4 and must
|
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||||
be included with all distributions of the Source Code. Except to the
|
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||||
extent prohibited by statute or regulation, such description must be
|
REPAIR OR CORRECTION.
|
||||||
sufficiently detailed for a recipient of ordinary skill to be able to
|
|
||||||
understand it.
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
5. Application of this License.
|
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||||
This License applies to code to which the Initial Developer has
|
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||||
attached the notice in Exhibit A and to related Covered Code.
|
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||||
|
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||||
6. Versions of the License.
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
6.1. New Versions.
|
|
||||||
Netscape Communications Corporation ("Netscape") may publish revised
|
END OF TERMS AND CONDITIONS
|
||||||
and/or new versions of the License from time to time. Each version
|
|
||||||
will be given a distinguishing version number.
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
6.2. Effect of New Versions.
|
If you develop a new program, and you want it to be of the greatest
|
||||||
Once Covered Code has been published under a particular version of the
|
possible use to the public, the best way to achieve this is to make it
|
||||||
License, You may always continue to use it under the terms of that
|
free software which everyone can redistribute and change under these terms.
|
||||||
version. You may also choose to use such Covered Code under the terms
|
|
||||||
of any subsequent version of the License published by Netscape. No one
|
To do so, attach the following notices to the program. It is safest
|
||||||
other than Netscape has the right to modify the terms applicable to
|
to attach them to the start of each source file to most effectively
|
||||||
Covered Code created under this License.
|
convey the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
6.3. Derivative Works.
|
|
||||||
If You create or use a modified version of this License (which you may
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
only do in order to apply it to code which is not already Covered Code
|
Copyright (C) <year> <name of author>
|
||||||
governed by this License), You must (a) rename Your license so that
|
|
||||||
the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
|
This program is free software; you can redistribute it and/or modify
|
||||||
"MPL", "NPL" or any confusingly similar phrase do not appear in your
|
it under the terms of the GNU General Public License as published by
|
||||||
license (except to note that your license differs from this License)
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
and (b) otherwise make it clear that Your version of the license
|
(at your option) any later version.
|
||||||
contains terms which differ from the Mozilla Public License and
|
|
||||||
Netscape Public License. (Filling in the name of the Initial
|
This program is distributed in the hope that it will be useful,
|
||||||
Developer, Original Code or Contributor in the notice described in
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
Exhibit A shall not of themselves be deemed to be modifications of
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
this License.)
|
GNU General Public License for more details.
|
||||||
|
|
||||||
7. DISCLAIMER OF WARRANTY.
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
|
|
||||||
WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
|
|
||||||
DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
|
|
||||||
IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
|
If the program is interactive, make it output a short notice like this
|
||||||
YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
|
when it starts in an interactive mode:
|
||||||
COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
|
|
||||||
OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
|
Gnomovision version 69, Copyright (C) year name of author
|
||||||
ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
8. TERMINATION.
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
8.1. This License and the rights granted hereunder will terminate
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
automatically if You fail to comply with terms herein and fail to cure
|
parts of the General Public License. Of course, the commands you use may
|
||||||
such breach within 30 days of becoming aware of the breach. All
|
be called something other than `show w' and `show c'; they could even be
|
||||||
sublicenses to the Covered Code which are properly granted shall
|
mouse-clicks or menu items--whatever suits your program.
|
||||||
survive any termination of this License. Provisions which, by their
|
|
||||||
nature, must remain in effect beyond the termination of this License
|
You should also get your employer (if you work as a programmer) or your
|
||||||
shall survive.
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
8.2. If You initiate litigation by asserting a patent infringement
|
|
||||||
claim (excluding declatory judgment actions) against Initial Developer
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
or a Contributor (the Initial Developer or Contributor against whom
|
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
You file such action is referred to as "Participant") alleging that:
|
|
||||||
|
<signature of Ty Coon>, 1 April 1989
|
||||||
(a) such Participant's Contributor Version directly or indirectly
|
Ty Coon, President of Vice
|
||||||
infringes any patent, then any and all rights granted by such
|
|
||||||
Participant to You under Sections 2.1 and/or 2.2 of this License
|
This General Public License does not permit incorporating your program into
|
||||||
shall, upon 60 days notice from Participant terminate prospectively,
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
unless if within 60 days after receipt of notice You either: (i)
|
consider it more useful to permit linking proprietary applications with the
|
||||||
agree in writing to pay Participant a mutually agreeable reasonable
|
library. If this is what you want to do, use the GNU Library General
|
||||||
royalty for Your past and future use of Modifications made by such
|
Public License instead of this License.
|
||||||
Participant, or (ii) withdraw Your litigation claim with respect to
|
|
||||||
the Contributor Version against such Participant. If within 60 days
|
|
||||||
of notice, a reasonable royalty and payment arrangement are not
|
|
||||||
mutually agreed upon in writing by the parties or the litigation claim
|
|
||||||
is not withdrawn, the rights granted by Participant to You under
|
|
||||||
Sections 2.1 and/or 2.2 automatically terminate at the expiration of
|
|
||||||
the 60 day notice period specified above.
|
|
||||||
|
|
||||||
(b) any software, hardware, or device, other than such Participant's
|
|
||||||
Contributor Version, directly or indirectly infringes any patent, then
|
|
||||||
any rights granted to You by such Participant under Sections 2.1(b)
|
|
||||||
and 2.2(b) are revoked effective as of the date You first made, used,
|
|
||||||
sold, distributed, or had made, Modifications made by that
|
|
||||||
Participant.
|
|
||||||
|
|
||||||
8.3. If You assert a patent infringement claim against Participant
|
|
||||||
alleging that such Participant's Contributor Version directly or
|
|
||||||
indirectly infringes any patent where such claim is resolved (such as
|
|
||||||
by license or settlement) prior to the initiation of patent
|
|
||||||
infringement litigation, then the reasonable value of the licenses
|
|
||||||
granted by such Participant under Sections 2.1 or 2.2 shall be taken
|
|
||||||
into account in determining the amount or value of any payment or
|
|
||||||
license.
|
|
||||||
|
|
||||||
8.4. In the event of termination under Sections 8.1 or 8.2 above,
|
|
||||||
all end user license agreements (excluding distributors and resellers)
|
|
||||||
which have been validly granted by You or any distributor hereunder
|
|
||||||
prior to termination shall survive termination.
|
|
||||||
|
|
||||||
9. LIMITATION OF LIABILITY.
|
|
||||||
|
|
||||||
UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
|
|
||||||
(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
|
|
||||||
DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
|
|
||||||
OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
|
|
||||||
ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
|
|
||||||
CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
|
|
||||||
WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
|
|
||||||
COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
|
|
||||||
INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
|
|
||||||
LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
|
|
||||||
RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
|
|
||||||
PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
|
|
||||||
EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
|
|
||||||
THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
|
|
||||||
|
|
||||||
10. U.S. GOVERNMENT END USERS.
|
|
||||||
|
|
||||||
The Covered Code is a "commercial item," as that term is defined in
|
|
||||||
48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
|
|
||||||
software" and "commercial computer software documentation," as such
|
|
||||||
terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
|
|
||||||
C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
|
|
||||||
all U.S. Government End Users acquire Covered Code with only those
|
|
||||||
rights set forth herein.
|
|
||||||
|
|
||||||
11. MISCELLANEOUS.
|
|
||||||
|
|
||||||
This License represents the complete agreement concerning subject
|
|
||||||
matter hereof. If any provision of this License is held to be
|
|
||||||
unenforceable, such provision shall be reformed only to the extent
|
|
||||||
necessary to make it enforceable. This License shall be governed by
|
|
||||||
California law provisions (except to the extent applicable law, if
|
|
||||||
any, provides otherwise), excluding its conflict-of-law provisions.
|
|
||||||
With respect to disputes in which at least one party is a citizen of,
|
|
||||||
or an entity chartered or registered to do business in the United
|
|
||||||
States of America, any litigation relating to this License shall be
|
|
||||||
subject to the jurisdiction of the Federal Courts of the Northern
|
|
||||||
District of California, with venue lying in Santa Clara County,
|
|
||||||
California, with the losing party responsible for costs, including
|
|
||||||
without limitation, court costs and reasonable attorneys' fees and
|
|
||||||
expenses. The application of the United Nations Convention on
|
|
||||||
Contracts for the International Sale of Goods is expressly excluded.
|
|
||||||
Any law or regulation which provides that the language of a contract
|
|
||||||
shall be construed against the drafter shall not apply to this
|
|
||||||
License.
|
|
||||||
|
|
||||||
12. RESPONSIBILITY FOR CLAIMS.
|
|
||||||
|
|
||||||
As between Initial Developer and the Contributors, each party is
|
|
||||||
responsible for claims and damages arising, directly or indirectly,
|
|
||||||
out of its utilization of rights under this License and You agree to
|
|
||||||
work with Initial Developer and Contributors to distribute such
|
|
||||||
responsibility on an equitable basis. Nothing herein is intended or
|
|
||||||
shall be deemed to constitute any admission of liability.
|
|
||||||
|
|
||||||
13. MULTIPLE-LICENSED CODE.
|
|
||||||
|
|
||||||
Initial Developer may designate portions of the Covered Code as
|
|
||||||
"Multiple-Licensed". "Multiple-Licensed" means that the Initial
|
|
||||||
Developer permits you to utilize portions of the Covered Code under
|
|
||||||
Your choice of the NPL or the alternative licenses, if any, specified
|
|
||||||
by the Initial Developer in the file described in Exhibit A.
|
|
||||||
|
|
||||||
EXHIBIT A -Mozilla Public License.
|
|
||||||
|
|
||||||
``The contents of this file are subject to the Mozilla Public License
|
|
||||||
Version 1.1 (the "License"); you may not use this file except in
|
|
||||||
compliance with the License. You may obtain a copy of the License at
|
|
||||||
http://www.mozilla.org/MPL/
|
|
||||||
|
|
||||||
Software distributed under the License is distributed on an "AS IS"
|
|
||||||
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
|
|
||||||
License for the specific language governing rights and limitations
|
|
||||||
under the License.
|
|
||||||
|
|
||||||
The Original Code is ______________________________________.
|
|
||||||
|
|
||||||
The Initial Developer of the Original Code is ________________________.
|
|
||||||
Portions created by ______________________ are Copyright (C) ______
|
|
||||||
_______________________. All Rights Reserved.
|
|
||||||
|
|
||||||
Contributor(s): ______________________________________.
|
|
||||||
|
|
||||||
Alternatively, the contents of this file may be used under the terms
|
|
||||||
of the _____ license (the "[___] License"), in which case the
|
|
||||||
provisions of [______] License are applicable instead of those
|
|
||||||
above. If you wish to allow use of your version of this file only
|
|
||||||
under the terms of the [____] License and not to allow others to use
|
|
||||||
your version of this file under the MPL, indicate your decision by
|
|
||||||
deleting the provisions above and replace them with the notice and
|
|
||||||
other provisions required by the [___] License. If you do not delete
|
|
||||||
the provisions above, a recipient may use your version of this file
|
|
||||||
under either the MPL or the [___] License."
|
|
||||||
|
|
||||||
[NOTE: The text of this Exhibit A may differ slightly from the text of
|
|
||||||
the notices in the Source Code files of the Original Code. You should
|
|
||||||
use the text of this Exhibit A rather than the text found in the
|
|
||||||
Original Code Source Code for Your Modifications.]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
12
INSTALL
12
INSTALL
|
@ -25,15 +25,3 @@ UNIX:
|
||||||
|
|
||||||
Windows 32:
|
Windows 32:
|
||||||
|
|
||||||
Requires: Microsoft Visual Studio 2005 or
|
|
||||||
Visual C++ 2005 Express Edition and Platform SDK
|
|
||||||
Internet connectivity to download dependency libraries
|
|
||||||
|
|
||||||
1) Open /w32/vsnet/Freeswitch.sln
|
|
||||||
|
|
||||||
2) Choose Release or Debug build
|
|
||||||
|
|
||||||
3) Build solution or your choice of modules using the ide.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ IGNORE_PREFIX = switch_
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Build related configuration options
|
# Build related configuration options
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
EXTRACT_ALL = YES
|
EXTRACT_ALL = NO
|
||||||
EXTRACT_PRIVATE = NO
|
EXTRACT_PRIVATE = NO
|
||||||
EXTRACT_STATIC = NO
|
EXTRACT_STATIC = NO
|
||||||
EXTRACT_LOCAL_CLASSES = YES
|
EXTRACT_LOCAL_CLASSES = YES
|
||||||
|
@ -68,7 +68,7 @@ GENERATE_DEPRECATEDLIST= YES
|
||||||
ENABLED_SECTIONS =
|
ENABLED_SECTIONS =
|
||||||
MAX_INITIALIZER_LINES = 30
|
MAX_INITIALIZER_LINES = 30
|
||||||
SHOW_USED_FILES = YES
|
SHOW_USED_FILES = YES
|
||||||
SHOW_DIRECTORIES = YES
|
SHOW_DIRECTORIES = NO
|
||||||
FILE_VERSION_FILTER =
|
FILE_VERSION_FILTER =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to warning and progress messages
|
# configuration options related to warning and progress messages
|
||||||
|
@ -125,8 +125,8 @@ FILTER_SOURCE_FILES = NO
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to source browsing
|
# configuration options related to source browsing
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
SOURCE_BROWSER = YES
|
SOURCE_BROWSER = NO
|
||||||
INLINE_SOURCES = YES
|
INLINE_SOURCES = NO
|
||||||
STRIP_CODE_COMMENTS = YES
|
STRIP_CODE_COMMENTS = YES
|
||||||
REFERENCED_BY_RELATION = YES
|
REFERENCED_BY_RELATION = YES
|
||||||
REFERENCES_RELATION = YES
|
REFERENCES_RELATION = YES
|
||||||
|
@ -149,9 +149,9 @@ HTML_FOOTER =
|
||||||
HTML_STYLESHEET =
|
HTML_STYLESHEET =
|
||||||
HTML_ALIGN_MEMBERS = YES
|
HTML_ALIGN_MEMBERS = YES
|
||||||
GENERATE_HTMLHELP = NO
|
GENERATE_HTMLHELP = NO
|
||||||
CHM_FILE = freeswitch.chm
|
CHM_FILE =
|
||||||
HHC_LOCATION =
|
HHC_LOCATION =
|
||||||
GENERATE_CHI = YES
|
GENERATE_CHI = NO
|
||||||
BINARY_TOC = NO
|
BINARY_TOC = NO
|
||||||
TOC_EXPAND = NO
|
TOC_EXPAND = NO
|
||||||
DISABLE_INDEX = NO
|
DISABLE_INDEX = NO
|
||||||
|
@ -186,14 +186,14 @@ RTF_EXTENSIONS_FILE =
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the man page output
|
# configuration options related to the man page output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_MAN = YES
|
GENERATE_MAN = NO
|
||||||
MAN_OUTPUT = man
|
MAN_OUTPUT = man
|
||||||
MAN_EXTENSION = .3
|
MAN_EXTENSION = .3
|
||||||
MAN_LINKS = NO
|
MAN_LINKS = NO
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the XML output
|
# configuration options related to the XML output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_XML = YES
|
GENERATE_XML = NO
|
||||||
XML_OUTPUT = xml
|
XML_OUTPUT = xml
|
||||||
XML_SCHEMA =
|
XML_SCHEMA =
|
||||||
XML_DTD =
|
XML_DTD =
|
||||||
|
@ -205,7 +205,7 @@ GENERATE_AUTOGEN_DEF = NO
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# configuration options related to the Perl module output
|
# configuration options related to the Perl module output
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
GENERATE_PERLMOD = YES
|
GENERATE_PERLMOD = NO
|
||||||
PERLMOD_LATEX = NO
|
PERLMOD_LATEX = NO
|
||||||
PERLMOD_PRETTY = YES
|
PERLMOD_PRETTY = YES
|
||||||
PERLMOD_MAKEVAR_PREFIX =
|
PERLMOD_MAKEVAR_PREFIX =
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
echo -n "-brs -npsl -di0 -br -ce -d0 -cli0 -npcs -nfc1 -ut -i4 -ts4 -l120 -cs -T size_t " > .indent.pro
|
|
||||||
grep typedef src/include/*.h | grep switch_ | grep -v "\*\|{" | perl -ne '@l = split; $l[2] =~ s/;//g ; print "-T $l[2] "' >> .indent.pro
|
|
||||||
grep "} switch_" src/include/*.h | perl -ne '@l = split; $l[1] =~ s/;//g ; print " -T $l[1] "' >> .indent.pro
|
|
|
@ -55,7 +55,7 @@ static void *audio_bridge_thread(switch_thread *thread, void *obj)
|
||||||
|
|
||||||
session_a = data->objs[0];
|
session_a = data->objs[0];
|
||||||
session_b = data->objs[1];
|
session_b = data->objs[1];
|
||||||
|
|
||||||
stream_id_p = data->objs[2];
|
stream_id_p = data->objs[2];
|
||||||
if (stream_id_p) {
|
if (stream_id_p) {
|
||||||
stream_id = *stream_id_p;
|
stream_id = *stream_id_p;
|
||||||
|
@ -64,16 +64,16 @@ static void *audio_bridge_thread(switch_thread *thread, void *obj)
|
||||||
chan_a = switch_core_session_get_channel(session_a);
|
chan_a = switch_core_session_get_channel(session_a);
|
||||||
chan_b = switch_core_session_get_channel(session_b);
|
chan_b = switch_core_session_get_channel(session_b);
|
||||||
|
|
||||||
while (data->running > 0) {
|
while(data->running > 0) {
|
||||||
switch_channel_state b_state = switch_channel_get_state(chan_b);
|
switch_channel_state b_state = switch_channel_get_state(chan_b);
|
||||||
|
|
||||||
switch (b_state) {
|
switch (b_state) {
|
||||||
case CS_HANGUP:
|
case CS_HANGUP:
|
||||||
data->running = -1;
|
data->running = -1;
|
||||||
continue;
|
continue;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_channel_has_dtmf(chan_a)) {
|
if (switch_channel_has_dtmf(chan_a)) {
|
||||||
|
@ -81,17 +81,16 @@ static void *audio_bridge_thread(switch_thread *thread, void *obj)
|
||||||
switch_channel_dequeue_dtmf(chan_a, dtmf, sizeof(dtmf));
|
switch_channel_dequeue_dtmf(chan_a, dtmf, sizeof(dtmf));
|
||||||
switch_core_session_send_dtmf(session_b, dtmf);
|
switch_core_session_send_dtmf(session_b, dtmf);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_core_session_read_frame(session_a, &read_frame, -1, stream_id) == SWITCH_STATUS_SUCCESS
|
if (switch_core_session_read_frame(session_a, &read_frame, -1, stream_id) == SWITCH_STATUS_SUCCESS && read_frame->datalen) {
|
||||||
&& read_frame->datalen) {
|
|
||||||
if (switch_core_session_write_frame(session_b, read_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_session_write_frame(session_b, read_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "write: Bad Frame.... Bubye!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "write: Bad Frame.... Bubye!\n");
|
||||||
data->running = -1;
|
data->running = -1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "read: Bad Frame.... Bubye!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "read: Bad Frame.... Bubye!\n");
|
||||||
data->running = -1;
|
data->running = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,8 +115,7 @@ static switch_status audio_bridge_on_hangup(switch_core_session *session)
|
||||||
other_channel = switch_core_session_get_channel(other_session);
|
other_channel = switch_core_session_get_channel(other_session);
|
||||||
assert(other_channel != NULL);
|
assert(other_channel != NULL);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "CUSTOM HANGUP %s kill %s\n", switch_channel_get_name(channel),
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "CUSTOM HANGUP %s kill %s\n", switch_channel_get_name(channel), switch_channel_get_name(other_channel));
|
||||||
switch_channel_get_name(other_channel));
|
|
||||||
|
|
||||||
switch_core_session_kill_channel(other_session, SWITCH_SIG_KILL);
|
switch_core_session_kill_channel(other_session, SWITCH_SIG_KILL);
|
||||||
switch_core_session_kill_channel(session, SWITCH_SIG_KILL);
|
switch_core_session_kill_channel(session, SWITCH_SIG_KILL);
|
||||||
|
@ -145,21 +143,21 @@ static switch_status audio_bridge_on_ring(switch_core_session *session)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_event_handler_table audio_bridge_peer_event_handlers = {
|
static const switch_event_handler_table audio_bridge_peer_event_handlers = {
|
||||||
/*.on_init */ NULL,
|
/*.on_init*/ NULL,
|
||||||
/*.on_ring */ audio_bridge_on_ring,
|
/*.on_ring*/ audio_bridge_on_ring,
|
||||||
/*.on_execute */ NULL,
|
/*.on_execute*/ NULL,
|
||||||
/*.on_hangup */ audio_bridge_on_hangup,
|
/*.on_hangup*/ audio_bridge_on_hangup,
|
||||||
/*.on_loopback */ NULL,
|
/*.on_loopback*/ NULL,
|
||||||
/*.on_transmit */ NULL
|
/*.on_transmit*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_event_handler_table audio_bridge_caller_event_handlers = {
|
static const switch_event_handler_table audio_bridge_caller_event_handlers = {
|
||||||
/*.on_init */ NULL,
|
/*.on_init*/ NULL,
|
||||||
/*.on_ring */ NULL,
|
/*.on_ring*/ NULL,
|
||||||
/*.on_execute */ NULL,
|
/*.on_execute*/ NULL,
|
||||||
/*.on_hangup */ audio_bridge_on_hangup,
|
/*.on_hangup*/ audio_bridge_on_hangup,
|
||||||
/*.on_loopback */ NULL,
|
/*.on_loopback*/ NULL,
|
||||||
/*.on_transmit */ NULL
|
/*.on_transmit*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static void audio_bridge_function(switch_core_session *session, char *data)
|
static void audio_bridge_function(switch_core_session *session, char *data)
|
||||||
|
@ -167,8 +165,8 @@ static void audio_bridge_function(switch_core_session *session, char *data)
|
||||||
switch_channel *caller_channel, *peer_channel;
|
switch_channel *caller_channel, *peer_channel;
|
||||||
switch_core_session *peer_session;
|
switch_core_session *peer_session;
|
||||||
switch_caller_profile *caller_profile, *caller_caller_profile;
|
switch_caller_profile *caller_profile, *caller_caller_profile;
|
||||||
char chan_type[128] = { '\0' }, *chan_data;
|
char chan_type[128]= {'\0'}, *chan_data;
|
||||||
int timelimit = 60; /* probably a useful option to pass in when there's time */
|
int timelimit = 60; /* probably a useful option to pass in when there's time */
|
||||||
caller_channel = switch_core_session_get_channel(session);
|
caller_channel = switch_core_session_get_channel(session);
|
||||||
assert(caller_channel != NULL);
|
assert(caller_channel != NULL);
|
||||||
|
|
||||||
|
@ -182,15 +180,17 @@ static void audio_bridge_function(switch_core_session *session, char *data)
|
||||||
|
|
||||||
caller_caller_profile = switch_channel_get_caller_profile(caller_channel);
|
caller_caller_profile = switch_channel_get_caller_profile(caller_channel);
|
||||||
caller_profile = switch_caller_profile_new(session,
|
caller_profile = switch_caller_profile_new(session,
|
||||||
caller_caller_profile->dialplan,
|
caller_caller_profile->dialplan,
|
||||||
caller_caller_profile->caller_id_name,
|
caller_caller_profile->caller_id_name,
|
||||||
caller_caller_profile->caller_id_number,
|
caller_caller_profile->caller_id_number,
|
||||||
caller_caller_profile->network_addr, NULL, NULL, chan_data);
|
caller_caller_profile->network_addr,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
chan_data);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_session_outgoing_channel(session, chan_type, caller_profile, &peer_session) !=
|
if (switch_core_session_outgoing_channel(session, chan_type, caller_profile, &peer_session) != SWITCH_STATUS_SUCCESS) {
|
||||||
SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "DOH!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "DOH!\n");
|
||||||
switch_channel_hangup(caller_channel);
|
switch_channel_hangup(caller_channel);
|
||||||
return;
|
return;
|
||||||
|
@ -215,11 +215,11 @@ static void audio_bridge_function(switch_core_session *session, char *data)
|
||||||
|
|
||||||
switch_channel_set_private(caller_channel, peer_session);
|
switch_channel_set_private(caller_channel, peer_session);
|
||||||
switch_channel_set_private(peer_channel, session);
|
switch_channel_set_private(peer_channel, session);
|
||||||
switch_channel_set_event_handlers(caller_channel, &audio_bridge_caller_event_handlers);
|
switch_channel_set_event_handlers(caller_channel, &audio_bridge_caller_event_handlers);
|
||||||
switch_channel_set_event_handlers(peer_channel, &audio_bridge_peer_event_handlers);
|
switch_channel_set_event_handlers(peer_channel, &audio_bridge_peer_event_handlers);
|
||||||
switch_core_session_thread_launch(peer_session);
|
switch_core_session_thread_launch(peer_session);
|
||||||
|
|
||||||
for (;;) {
|
for(;;) {
|
||||||
int state = switch_channel_get_state(peer_channel);
|
int state = switch_channel_get_state(peer_channel);
|
||||||
if (state > CS_RING) {
|
if (state > CS_RING) {
|
||||||
break;
|
break;
|
||||||
|
@ -228,10 +228,11 @@ static void audio_bridge_function(switch_core_session *session, char *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
time(&start);
|
time(&start);
|
||||||
while (switch_channel_get_state(caller_channel) == CS_EXECUTE &&
|
while(switch_channel_get_state(caller_channel) == CS_EXECUTE &&
|
||||||
switch_channel_get_state(peer_channel) == CS_TRANSMIT &&
|
switch_channel_get_state(peer_channel) == CS_TRANSMIT &&
|
||||||
!switch_channel_test_flag(peer_channel, CF_ANSWERED) && ((time(NULL) - start) < timelimit)) {
|
!switch_channel_test_flag(peer_channel, CF_ANSWERED) &&
|
||||||
switch_yield(20000);
|
((time(NULL) - start) < timelimit)) {
|
||||||
|
switch_yield(20000);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) {
|
if (switch_channel_test_flag(peer_channel, CF_ANSWERED)) {
|
||||||
|
@ -258,22 +259,21 @@ static void audio_bridge_function(switch_core_session *session, char *data)
|
||||||
|
|
||||||
|
|
||||||
static const switch_application_interface bridge_application_interface = {
|
static const switch_application_interface bridge_application_interface = {
|
||||||
/*.interface_name */ "bridge",
|
/*.interface_name*/ "bridge",
|
||||||
/*.application_function */ audio_bridge_function
|
/*.application_function*/ audio_bridge_function
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const switch_loadable_module_interface mod_bridgecall_module_interface = {
|
static const switch_loadable_module_interface mod_bridgecall_module_interface = {
|
||||||
/*.module_name = */ modname,
|
/*.module_name = */ modname,
|
||||||
/*.endpoint_interface = */ NULL,
|
/*.endpoint_interface = */ NULL,
|
||||||
/*.timer_interface = */ NULL,
|
/*.timer_interface = */ NULL,
|
||||||
/*.dialplan_interface = */ NULL,
|
/*.dialplan_interface = */ NULL,
|
||||||
/*.codec_interface = */ NULL,
|
/*.codec_interface = */ NULL,
|
||||||
/*.application_interface */ &bridge_application_interface
|
/*.application_interface*/ &bridge_application_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &mod_bridgecall_module_interface;
|
*interface = &mod_bridgecall_module_interface;
|
||||||
|
|
|
@ -59,11 +59,11 @@ void playback_function(switch_core_session *session, char *data)
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
if (switch_core_file_open(&fh,
|
if (switch_core_file_open(&fh,
|
||||||
data,
|
data,
|
||||||
SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT,
|
SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT,
|
||||||
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_channel_answer(channel);
|
switch_channel_answer(channel);
|
||||||
|
@ -81,17 +81,17 @@ void playback_function(switch_core_session *session, char *data)
|
||||||
codec_name = "L16";
|
codec_name = "L16";
|
||||||
|
|
||||||
if (switch_core_codec_init(&codec,
|
if (switch_core_codec_init(&codec,
|
||||||
codec_name,
|
codec_name,
|
||||||
fh.samplerate,
|
fh.samplerate,
|
||||||
interval,
|
interval,
|
||||||
fh.channels,
|
fh.channels,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, pool) == SWITCH_STATUS_SUCCESS) {
|
NULL,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Raw Codec Activated\n");
|
pool) == SWITCH_STATUS_SUCCESS) {
|
||||||
write_frame.codec = &codec;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Raw Codec Activated\n");
|
||||||
|
write_frame.codec = &codec;
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Raw Codec Activation Failed %s@%dhz %d channels %dms\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Raw Codec Activation Failed %s@%dhz %d channels %dms\n", codec_name, fh.samplerate, fh.channels, interval);
|
||||||
codec_name, fh.samplerate, fh.channels, interval);
|
|
||||||
switch_core_file_close(&fh);
|
switch_core_file_close(&fh);
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
|
@ -108,11 +108,11 @@ void playback_function(switch_core_session *session, char *data)
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "setup timer success %d bytes per %d ms!\n", len, interval);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "setup timer success %d bytes per %d ms!\n", len, interval);
|
||||||
|
|
||||||
/* start a thread to absorb incoming audio */
|
/* start a thread to absorb incoming audio */
|
||||||
for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) {
|
for(stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) {
|
||||||
switch_core_service_session(session, &thread_session, stream_id);
|
switch_core_service_session(session, &thread_session, stream_id);
|
||||||
}
|
}
|
||||||
ilen = samples;
|
ilen = samples;
|
||||||
while (switch_channel_get_state(channel) == CS_EXECUTE) {
|
while(switch_channel_get_state(channel) == CS_EXECUTE) {
|
||||||
int done = 0;
|
int done = 0;
|
||||||
|
|
||||||
if (switch_channel_has_dtmf(channel)) {
|
if (switch_channel_has_dtmf(channel)) {
|
||||||
|
@ -139,12 +139,12 @@ void playback_function(switch_core_session *session, char *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
write_frame.datalen = ilen * 2;
|
write_frame.datalen = ilen * 2;
|
||||||
write_frame.samples = (int) ilen;
|
write_frame.samples = (int)ilen;
|
||||||
#ifdef SWAP_LINEAR
|
#ifdef SWAP_LINEAR
|
||||||
switch_swap_linear(write_frame.data, (int) write_frame.datalen / 2);
|
switch_swap_linear(write_frame.data, (int)write_frame.datalen / 2);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) {
|
for(stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) {
|
||||||
if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Bad Write\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Bad Write\n");
|
||||||
done = 1;
|
done = 1;
|
||||||
|
@ -178,21 +178,20 @@ void playback_function(switch_core_session *session, char *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_application_interface playback_application_interface = {
|
static const switch_application_interface playback_application_interface = {
|
||||||
/*.interface_name */ "playback",
|
/*.interface_name*/ "playback",
|
||||||
/*.application_function */ playback_function
|
/*.application_function*/ playback_function
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface mod_playback_module_interface = {
|
static const switch_loadable_module_interface mod_playback_module_interface = {
|
||||||
/*.module_name = */ modname,
|
/*.module_name = */ modname,
|
||||||
/*.endpoint_interface = */ NULL,
|
/*.endpoint_interface = */ NULL,
|
||||||
/*.timer_interface = */ NULL,
|
/*.timer_interface = */ NULL,
|
||||||
/*.dialplan_interface = */ NULL,
|
/*.dialplan_interface = */ NULL,
|
||||||
/*.codec_interface = */ NULL,
|
/*.codec_interface = */ NULL,
|
||||||
/*.application_interface */ &playback_application_interface
|
/*.application_interface*/ &playback_application_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &mod_playback_module_interface;
|
*interface = &mod_playback_module_interface;
|
||||||
|
@ -208,3 +207,7 @@ if it returns anything but SWITCH_STATUS_TERM it will be called again automaticl
|
||||||
|
|
||||||
|
|
||||||
//switch_status switch_module_runtime(void)
|
//switch_status switch_module_runtime(void)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -34,16 +34,15 @@
|
||||||
static const char modname[] = "mod_skel";
|
static const char modname[] = "mod_skel";
|
||||||
|
|
||||||
static switch_loadable_module_interface skel_module_interface = {
|
static switch_loadable_module_interface skel_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
switch_status switch_module_load(switch_loadable_module_interface **interface, char *filename)
|
switch_status switch_module_load(switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &skel_module_interface;
|
*interface = &skel_module_interface;
|
||||||
|
|
||||||
|
@ -52,3 +51,4 @@ switch_status switch_module_load(switch_loadable_module_interface **interface, c
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,71 +47,70 @@
|
||||||
*/
|
*/
|
||||||
#define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */
|
#define SIGN_BIT (0x80) /* Sign bit for a A-law byte. */
|
||||||
#define QUANT_MASK (0xf) /* Quantization field mask. */
|
#define QUANT_MASK (0xf) /* Quantization field mask. */
|
||||||
#define NSEGS (8) /* Number of A-law segments. */
|
#define NSEGS (8) /* Number of A-law segments. */
|
||||||
#define SEG_SHIFT (4) /* Left shift for segment number. */
|
#define SEG_SHIFT (4) /* Left shift for segment number. */
|
||||||
#define SEG_MASK (0x70) /* Segment field mask. */
|
#define SEG_MASK (0x70) /* Segment field mask. */
|
||||||
|
|
||||||
static short seg_aend[8] = { 0x1F, 0x3F, 0x7F, 0xFF,
|
static short seg_aend[8] = {0x1F, 0x3F, 0x7F, 0xFF,
|
||||||
0x1FF, 0x3FF, 0x7FF, 0xFFF
|
0x1FF, 0x3FF, 0x7FF, 0xFFF};
|
||||||
};
|
static short seg_uend[8] = {0x3F, 0x7F, 0xFF, 0x1FF,
|
||||||
static short seg_uend[8] = { 0x3F, 0x7F, 0xFF, 0x1FF,
|
0x3FF, 0x7FF, 0xFFF, 0x1FFF};
|
||||||
0x3FF, 0x7FF, 0xFFF, 0x1FFF
|
|
||||||
};
|
|
||||||
|
|
||||||
/* copy from CCITT G.711 specifications */
|
/* copy from CCITT G.711 specifications */
|
||||||
unsigned char _u2a[128] = { /* u- to A-law conversions */
|
unsigned char _u2a[128] = { /* u- to A-law conversions */
|
||||||
1, 1, 2, 2, 3, 3, 4, 4,
|
1, 1, 2, 2, 3, 3, 4, 4,
|
||||||
5, 5, 6, 6, 7, 7, 8, 8,
|
5, 5, 6, 6, 7, 7, 8, 8,
|
||||||
9, 10, 11, 12, 13, 14, 15, 16,
|
9, 10, 11, 12, 13, 14, 15, 16,
|
||||||
17, 18, 19, 20, 21, 22, 23, 24,
|
17, 18, 19, 20, 21, 22, 23, 24,
|
||||||
25, 27, 29, 31, 33, 34, 35, 36,
|
25, 27, 29, 31, 33, 34, 35, 36,
|
||||||
37, 38, 39, 40, 41, 42, 43, 44,
|
37, 38, 39, 40, 41, 42, 43, 44,
|
||||||
46, 48, 49, 50, 51, 52, 53, 54,
|
46, 48, 49, 50, 51, 52, 53, 54,
|
||||||
55, 56, 57, 58, 59, 60, 61, 62,
|
55, 56, 57, 58, 59, 60, 61, 62,
|
||||||
64, 65, 66, 67, 68, 69, 70, 71,
|
64, 65, 66, 67, 68, 69, 70, 71,
|
||||||
72, 73, 74, 75, 76, 77, 78, 79,
|
72, 73, 74, 75, 76, 77, 78, 79,
|
||||||
/* corrected:
|
/* corrected:
|
||||||
81, 82, 83, 84, 85, 86, 87, 88,
|
81, 82, 83, 84, 85, 86, 87, 88,
|
||||||
should be: */
|
should be: */
|
||||||
80, 82, 83, 84, 85, 86, 87, 88,
|
80, 82, 83, 84, 85, 86, 87, 88,
|
||||||
89, 90, 91, 92, 93, 94, 95, 96,
|
89, 90, 91, 92, 93, 94, 95, 96,
|
||||||
97, 98, 99, 100, 101, 102, 103, 104,
|
97, 98, 99, 100, 101, 102, 103, 104,
|
||||||
105, 106, 107, 108, 109, 110, 111, 112,
|
105, 106, 107, 108, 109, 110, 111, 112,
|
||||||
113, 114, 115, 116, 117, 118, 119, 120,
|
113, 114, 115, 116, 117, 118, 119, 120,
|
||||||
121, 122, 123, 124, 125, 126, 127, 128
|
121, 122, 123, 124, 125, 126, 127, 128};
|
||||||
};
|
|
||||||
|
|
||||||
unsigned char _a2u[128] = { /* A- to u-law conversions */
|
unsigned char _a2u[128] = { /* A- to u-law conversions */
|
||||||
1, 3, 5, 7, 9, 11, 13, 15,
|
1, 3, 5, 7, 9, 11, 13, 15,
|
||||||
16, 17, 18, 19, 20, 21, 22, 23,
|
16, 17, 18, 19, 20, 21, 22, 23,
|
||||||
24, 25, 26, 27, 28, 29, 30, 31,
|
24, 25, 26, 27, 28, 29, 30, 31,
|
||||||
32, 32, 33, 33, 34, 34, 35, 35,
|
32, 32, 33, 33, 34, 34, 35, 35,
|
||||||
36, 37, 38, 39, 40, 41, 42, 43,
|
36, 37, 38, 39, 40, 41, 42, 43,
|
||||||
44, 45, 46, 47, 48, 48, 49, 49,
|
44, 45, 46, 47, 48, 48, 49, 49,
|
||||||
50, 51, 52, 53, 54, 55, 56, 57,
|
50, 51, 52, 53, 54, 55, 56, 57,
|
||||||
58, 59, 60, 61, 62, 63, 64, 64,
|
58, 59, 60, 61, 62, 63, 64, 64,
|
||||||
65, 66, 67, 68, 69, 70, 71, 72,
|
65, 66, 67, 68, 69, 70, 71, 72,
|
||||||
/* corrected:
|
/* corrected:
|
||||||
73, 74, 75, 76, 77, 78, 79, 79,
|
73, 74, 75, 76, 77, 78, 79, 79,
|
||||||
should be: */
|
should be: */
|
||||||
73, 74, 75, 76, 77, 78, 79, 80,
|
73, 74, 75, 76, 77, 78, 79, 80,
|
||||||
80, 81, 82, 83, 84, 85, 86, 87,
|
80, 81, 82, 83, 84, 85, 86, 87,
|
||||||
88, 89, 90, 91, 92, 93, 94, 95,
|
88, 89, 90, 91, 92, 93, 94, 95,
|
||||||
96, 97, 98, 99, 100, 101, 102, 103,
|
96, 97, 98, 99, 100, 101, 102, 103,
|
||||||
104, 105, 106, 107, 108, 109, 110, 111,
|
104, 105, 106, 107, 108, 109, 110, 111,
|
||||||
112, 113, 114, 115, 116, 117, 118, 119,
|
112, 113, 114, 115, 116, 117, 118, 119,
|
||||||
120, 121, 122, 123, 124, 125, 126, 127
|
120, 121, 122, 123, 124, 125, 126, 127};
|
||||||
};
|
|
||||||
|
|
||||||
static short search(short val, short *table, short size)
|
static short search(
|
||||||
|
short val,
|
||||||
|
short *table,
|
||||||
|
short size)
|
||||||
{
|
{
|
||||||
short i;
|
short i;
|
||||||
|
|
||||||
for (i = 0; i < size; i++) {
|
for (i = 0; i < size; i++) {
|
||||||
if (val <= *table++)
|
if (val <= *table++)
|
||||||
return (i);
|
return (i);
|
||||||
}
|
}
|
||||||
return (size);
|
return (size);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -133,63 +132,66 @@ static short search(short val, short *table, short size)
|
||||||
* For further information see John C. Bellamy's Digital Telephony, 1982,
|
* For further information see John C. Bellamy's Digital Telephony, 1982,
|
||||||
* John Wiley & Sons, pps 98-111 and 472-476.
|
* John Wiley & Sons, pps 98-111 and 472-476.
|
||||||
*/
|
*/
|
||||||
unsigned char linear2alaw(short pcm_val)
|
unsigned char
|
||||||
{ /* 2's complement (16-bit range) */
|
linear2alaw(short pcm_val) /* 2's complement (16-bit range) */
|
||||||
short mask;
|
{
|
||||||
short seg;
|
short mask;
|
||||||
unsigned char aval;
|
short seg;
|
||||||
|
unsigned char aval;
|
||||||
|
|
||||||
|
pcm_val = pcm_val >> 3;
|
||||||
|
|
||||||
pcm_val = pcm_val >> 3;
|
if (pcm_val >= 0) {
|
||||||
|
mask = 0xD5; /* sign (7th) bit = 1 */
|
||||||
if (pcm_val >= 0) {
|
} else {
|
||||||
mask = 0xD5; /* sign (7th) bit = 1 */
|
mask = 0x55; /* sign bit = 0 */
|
||||||
} else {
|
pcm_val = -pcm_val - 1;
|
||||||
mask = 0x55; /* sign bit = 0 */
|
}
|
||||||
pcm_val = -pcm_val - 1;
|
|
||||||
}
|
/* Convert the scaled magnitude to segment number. */
|
||||||
|
seg = search(pcm_val, seg_aend, 8);
|
||||||
/* Convert the scaled magnitude to segment number. */
|
|
||||||
seg = search(pcm_val, seg_aend, 8);
|
/* Combine the sign, segment, and quantization bits. */
|
||||||
|
|
||||||
/* Combine the sign, segment, and quantization bits. */
|
if (seg >= 8) /* out of range, return maximum value. */
|
||||||
|
return (unsigned char) (0x7F ^ mask);
|
||||||
if (seg >= 8) /* out of range, return maximum value. */
|
else {
|
||||||
return (unsigned char) (0x7F ^ mask);
|
aval = (unsigned char) seg << SEG_SHIFT;
|
||||||
else {
|
if (seg < 2)
|
||||||
aval = (unsigned char) seg << SEG_SHIFT;
|
aval |= (pcm_val >> 1) & QUANT_MASK;
|
||||||
if (seg < 2)
|
else
|
||||||
aval |= (pcm_val >> 1) & QUANT_MASK;
|
aval |= (pcm_val >> seg) & QUANT_MASK;
|
||||||
else
|
return (aval ^ mask);
|
||||||
aval |= (pcm_val >> seg) & QUANT_MASK;
|
}
|
||||||
return (aval ^ mask);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* alaw2linear() - Convert an A-law value to 16-bit linear PCM
|
* alaw2linear() - Convert an A-law value to 16-bit linear PCM
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
short alaw2linear(unsigned char a_val)
|
short
|
||||||
|
alaw2linear(
|
||||||
|
unsigned char a_val)
|
||||||
{
|
{
|
||||||
short t;
|
short t;
|
||||||
short seg;
|
short seg;
|
||||||
|
|
||||||
a_val ^= 0x55;
|
a_val ^= 0x55;
|
||||||
|
|
||||||
t = (a_val & QUANT_MASK) << 4;
|
t = (a_val & QUANT_MASK) << 4;
|
||||||
seg = ((unsigned) a_val & SEG_MASK) >> SEG_SHIFT;
|
seg = ((unsigned)a_val & SEG_MASK) >> SEG_SHIFT;
|
||||||
switch (seg) {
|
switch (seg) {
|
||||||
case 0:
|
case 0:
|
||||||
t += 8;
|
t += 8;
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
t += 0x108;
|
t += 0x108;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
t += 0x108;
|
t += 0x108;
|
||||||
t <<= seg - 1;
|
t <<= seg - 1;
|
||||||
}
|
}
|
||||||
return ((a_val & SIGN_BIT) ? t : -t);
|
return ((a_val & SIGN_BIT) ? t : -t);
|
||||||
}
|
}
|
||||||
|
|
||||||
#define BIAS (0x84) /* Bias for linear code. */
|
#define BIAS (0x84) /* Bias for linear code. */
|
||||||
|
@ -224,38 +226,39 @@ short alaw2linear(unsigned char a_val)
|
||||||
* For further information see John C. Bellamy's Digital Telephony, 1982,
|
* For further information see John C. Bellamy's Digital Telephony, 1982,
|
||||||
* John Wiley & Sons, pps 98-111 and 472-476.
|
* John Wiley & Sons, pps 98-111 and 472-476.
|
||||||
*/
|
*/
|
||||||
unsigned char linear2ulaw(short pcm_val)
|
unsigned char
|
||||||
{ /* 2's complement (16-bit range) */
|
linear2ulaw(
|
||||||
short mask;
|
short pcm_val) /* 2's complement (16-bit range) */
|
||||||
short seg;
|
{
|
||||||
unsigned char uval;
|
short mask;
|
||||||
|
short seg;
|
||||||
/* Get the sign and the magnitude of the value. */
|
unsigned char uval;
|
||||||
pcm_val = pcm_val >> 2;
|
|
||||||
if (pcm_val < 0) {
|
/* Get the sign and the magnitude of the value. */
|
||||||
pcm_val = -pcm_val;
|
pcm_val = pcm_val >> 2;
|
||||||
mask = 0x7F;
|
if (pcm_val < 0) {
|
||||||
} else {
|
pcm_val = -pcm_val;
|
||||||
mask = 0xFF;
|
mask = 0x7F;
|
||||||
}
|
} else {
|
||||||
if (pcm_val > CLIP)
|
mask = 0xFF;
|
||||||
pcm_val = CLIP; /* clip the magnitude */
|
}
|
||||||
pcm_val += (BIAS >> 2);
|
if ( pcm_val > CLIP ) pcm_val = CLIP; /* clip the magnitude */
|
||||||
|
pcm_val += (BIAS >> 2);
|
||||||
/* Convert the scaled magnitude to segment number. */
|
|
||||||
seg = search(pcm_val, seg_uend, 8);
|
/* Convert the scaled magnitude to segment number. */
|
||||||
|
seg = search(pcm_val, seg_uend, 8);
|
||||||
/*
|
|
||||||
* Combine the sign, segment, quantization bits;
|
/*
|
||||||
* and complement the code word.
|
* Combine the sign, segment, quantization bits;
|
||||||
*/
|
* and complement the code word.
|
||||||
if (seg >= 8) /* out of range, return maximum value. */
|
*/
|
||||||
return (unsigned char) (0x7F ^ mask);
|
if (seg >= 8) /* out of range, return maximum value. */
|
||||||
else {
|
return (unsigned char) (0x7F ^ mask);
|
||||||
uval = (unsigned char) (seg << 4) | ((pcm_val >> (seg + 1)) & 0xF);
|
else {
|
||||||
return (uval ^ mask);
|
uval = (unsigned char) (seg << 4) | ((pcm_val >> (seg + 1)) & 0xF);
|
||||||
}
|
return (uval ^ mask);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -267,35 +270,43 @@ unsigned char linear2ulaw(short pcm_val)
|
||||||
* Note that this function expects to be passed the complement of the
|
* Note that this function expects to be passed the complement of the
|
||||||
* original code word. This is in keeping with ISDN conventions.
|
* original code word. This is in keeping with ISDN conventions.
|
||||||
*/
|
*/
|
||||||
short ulaw2linear(unsigned char u_val)
|
short
|
||||||
|
ulaw2linear(
|
||||||
|
unsigned char u_val)
|
||||||
{
|
{
|
||||||
short t;
|
short t;
|
||||||
|
|
||||||
/* Complement to obtain normal u-law value. */
|
/* Complement to obtain normal u-law value. */
|
||||||
u_val = ~u_val;
|
u_val = ~u_val;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Extract and bias the quantization bits. Then
|
* Extract and bias the quantization bits. Then
|
||||||
* shift up by the segment number and subtract out the bias.
|
* shift up by the segment number and subtract out the bias.
|
||||||
*/
|
*/
|
||||||
t = ((u_val & QUANT_MASK) << 3) + BIAS;
|
t = ((u_val & QUANT_MASK) << 3) + BIAS;
|
||||||
t <<= ((unsigned) u_val & SEG_MASK) >> SEG_SHIFT;
|
t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT;
|
||||||
|
|
||||||
return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
|
return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* A-law to u-law conversion */
|
/* A-law to u-law conversion */
|
||||||
unsigned char alaw2ulaw(unsigned char aval)
|
unsigned char
|
||||||
|
alaw2ulaw(
|
||||||
|
unsigned char aval)
|
||||||
{
|
{
|
||||||
aval &= 0xff;
|
aval &= 0xff;
|
||||||
return (unsigned char) ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) : (0x7F ^ _a2u[aval ^ 0x55]));
|
return (unsigned char) ((aval & 0x80) ? (0xFF ^ _a2u[aval ^ 0xD5]) :
|
||||||
|
(0x7F ^ _a2u[aval ^ 0x55]));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* u-law to A-law conversion */
|
/* u-law to A-law conversion */
|
||||||
unsigned char ulaw2alaw(unsigned char uval)
|
unsigned char
|
||||||
|
ulaw2alaw(
|
||||||
|
unsigned char uval)
|
||||||
{
|
{
|
||||||
uval &= 0xff;
|
uval &= 0xff;
|
||||||
return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) : (0x55 ^ (_u2a[0x7F ^ uval] - 1)));
|
return (unsigned char) ((uval & 0x80) ? (0xD5 ^ (_u2a[0xFF ^ uval] - 1)) :
|
||||||
|
(0x55 ^ (_u2a[0x7F ^ uval] - 1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- end of g711.c ----------------------------------------------------- */
|
/* ---------- end of g711.c ----------------------------------------------------- */
|
||||||
|
|
|
@ -36,8 +36,7 @@
|
||||||
static const char modname[] = "mod_g711codec";
|
static const char modname[] = "mod_g711codec";
|
||||||
|
|
||||||
|
|
||||||
static switch_status switch_g711u_init(switch_codec *codec, switch_codec_flag flags,
|
static switch_status switch_g711u_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||||
const struct switch_codec_settings *codec_settings)
|
|
||||||
{
|
{
|
||||||
int encoding, decoding;
|
int encoding, decoding;
|
||||||
|
|
||||||
|
@ -58,7 +57,9 @@ static switch_status switch_g711u_encode(switch_codec *codec,
|
||||||
size_t decoded_data_len,
|
size_t decoded_data_len,
|
||||||
int decoded_rate,
|
int decoded_rate,
|
||||||
void *encoded_data,
|
void *encoded_data,
|
||||||
size_t *encoded_data_len, int *encoded_rate, unsigned int *flag)
|
size_t *encoded_data_len,
|
||||||
|
int *encoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
short *dbuf;
|
short *dbuf;
|
||||||
unsigned char *ebuf;
|
unsigned char *ebuf;
|
||||||
|
@ -82,7 +83,9 @@ static switch_status switch_g711u_decode(switch_codec *codec,
|
||||||
size_t encoded_data_len,
|
size_t encoded_data_len,
|
||||||
int encoded_rate,
|
int encoded_rate,
|
||||||
void *decoded_data,
|
void *decoded_data,
|
||||||
size_t *decoded_data_len, int *decoded_rate, unsigned int *flag)
|
size_t *decoded_data_len,
|
||||||
|
int *decoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
short *dbuf;
|
short *dbuf;
|
||||||
unsigned char *ebuf;
|
unsigned char *ebuf;
|
||||||
|
@ -111,8 +114,7 @@ static switch_status switch_g711u_destroy(switch_codec *codec)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status switch_g711a_init(switch_codec *codec, switch_codec_flag flags,
|
static switch_status switch_g711a_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||||
const struct switch_codec_settings *codec_settings)
|
|
||||||
{
|
{
|
||||||
int encoding, decoding;
|
int encoding, decoding;
|
||||||
|
|
||||||
|
@ -133,7 +135,9 @@ static switch_status switch_g711a_encode(switch_codec *codec,
|
||||||
size_t decoded_data_len,
|
size_t decoded_data_len,
|
||||||
int decoded_rate,
|
int decoded_rate,
|
||||||
void *encoded_data,
|
void *encoded_data,
|
||||||
size_t *encoded_data_len, int *encoded_rate, unsigned int *flag)
|
size_t *encoded_data_len,
|
||||||
|
int *encoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
short *dbuf;
|
short *dbuf;
|
||||||
unsigned char *ebuf;
|
unsigned char *ebuf;
|
||||||
|
@ -157,7 +161,9 @@ static switch_status switch_g711a_decode(switch_codec *codec,
|
||||||
size_t encoded_data_len,
|
size_t encoded_data_len,
|
||||||
int encoded_rate,
|
int encoded_rate,
|
||||||
void *decoded_data,
|
void *decoded_data,
|
||||||
size_t *decoded_data_len, int *decoded_rate, unsigned int *flag)
|
size_t *decoded_data_len,
|
||||||
|
int *decoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
short *dbuf;
|
short *dbuf;
|
||||||
unsigned char *ebuf;
|
unsigned char *ebuf;
|
||||||
|
@ -189,122 +195,126 @@ static switch_status switch_g711a_destroy(switch_codec *codec)
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_implementation g711u_8k_60ms_implementation = {
|
static const switch_codec_implementation g711u_8k_60ms_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second*/ 8000,
|
||||||
/*.bits_per_second */ 19200,
|
/*.bits_per_second*/ 19200,
|
||||||
/*.microseconds_per_frame */ 60000,
|
/*.microseconds_per_frame*/ 60000,
|
||||||
/*.samples_per_frame */ 480,
|
/*.samples_per_frame*/ 480,
|
||||||
/*.bytes_per_frame */ 960,
|
/*.bytes_per_frame*/ 960,
|
||||||
/*.encoded_bytes_per_frame */ 480,
|
/*.encoded_bytes_per_frame*/ 480,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_g711u_init,
|
/*.init*/ switch_g711u_init,
|
||||||
/*.encode */ switch_g711u_encode,
|
/*.encode*/ switch_g711u_encode,
|
||||||
/*.decode */ switch_g711u_decode,
|
/*.decode*/ switch_g711u_decode,
|
||||||
/*.destroy */ switch_g711u_destroy
|
/*.destroy*/ switch_g711u_destroy
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_codec_implementation g711u_8k_30ms_implementation = {
|
static const switch_codec_implementation g711u_8k_30ms_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second*/ 8000,
|
||||||
/*.bits_per_second */ 96000,
|
/*.bits_per_second*/ 96000,
|
||||||
/*.microseconds_per_frame */ 30000,
|
/*.microseconds_per_frame*/ 30000,
|
||||||
/*.samples_per_frame */ 240,
|
/*.samples_per_frame*/ 240,
|
||||||
/*.bytes_per_frame */ 480,
|
/*.bytes_per_frame*/ 480,
|
||||||
/*.encoded_bytes_per_frame */ 240,
|
/*.encoded_bytes_per_frame*/ 240,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_g711u_init,
|
/*.init*/ switch_g711u_init,
|
||||||
/*.encode */ switch_g711u_encode,
|
/*.encode*/ switch_g711u_encode,
|
||||||
/*.decode */ switch_g711u_decode,
|
/*.decode*/ switch_g711u_decode,
|
||||||
/*.destroy */ switch_g711u_destroy,
|
/*.destroy*/ switch_g711u_destroy,
|
||||||
/*.next */ &g711u_8k_60ms_implementation
|
/*.next*/ &g711u_8k_60ms_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_implementation g711u_16k_implementation = {
|
static const switch_codec_implementation g711u_16k_implementation = {
|
||||||
/*.samples_per_second */ 16000,
|
/*.samples_per_second*/ 16000,
|
||||||
/*.bits_per_second */ 128000,
|
/*.bits_per_second*/ 128000,
|
||||||
/*.microseconds_per_frame */ 20000,
|
/*.microseconds_per_frame*/ 20000,
|
||||||
/*.samples_per_frame */ 320,
|
/*.samples_per_frame*/ 320,
|
||||||
/*.bytes_per_frame */ 640,
|
/*.bytes_per_frame*/ 640,
|
||||||
/*.encoded_bytes_per_frame */ 320,
|
/*.encoded_bytes_per_frame*/ 320,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_g711u_init,
|
/*.init*/ switch_g711u_init,
|
||||||
/*.encode */ switch_g711u_encode,
|
/*.encode*/ switch_g711u_encode,
|
||||||
/*.decode */ switch_g711u_decode,
|
/*.decode*/ switch_g711u_decode,
|
||||||
/*.destroy */ switch_g711u_destroy,
|
/*.destroy*/ switch_g711u_destroy,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_codec_implementation g711u_8k_implementation = {
|
static const switch_codec_implementation g711u_8k_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second*/ 8000,
|
||||||
/*.bits_per_second */ 64000,
|
/*.bits_per_second*/ 64000,
|
||||||
/*.microseconds_per_frame */ 20000,
|
/*.microseconds_per_frame*/ 20000,
|
||||||
/*.samples_per_frame */ 160,
|
/*.samples_per_frame*/ 160,
|
||||||
/*.bytes_per_frame */ 320,
|
/*.bytes_per_frame*/ 320,
|
||||||
/*.encoded_bytes_per_frame */ 160,
|
/*.encoded_bytes_per_frame*/ 160,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_g711u_init,
|
/*.init*/ switch_g711u_init,
|
||||||
/*.encode */ switch_g711u_encode,
|
/*.encode*/ switch_g711u_encode,
|
||||||
/*.decode */ switch_g711u_decode,
|
/*.decode*/ switch_g711u_decode,
|
||||||
/*.destroy */ switch_g711u_destroy,
|
/*.destroy*/ switch_g711u_destroy,
|
||||||
/*.next */ &g711u_16k_implementation
|
/*.next*/ &g711u_16k_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_implementation g711a_8k_implementation = {
|
static const switch_codec_implementation g711a_8k_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second*/ 8000,
|
||||||
/*.bits_per_second */ 64000,
|
/*.bits_per_second*/ 64000,
|
||||||
/*.microseconds_per_frame */ 20000,
|
/*.microseconds_per_frame*/ 20000,
|
||||||
/*.samples_per_frame */ 160,
|
/*.samples_per_frame*/ 160,
|
||||||
/*.bytes_per_frame */ 320,
|
/*.bytes_per_frame*/ 320,
|
||||||
/*.encoded_bytes_per_frame */ 160,
|
/*.encoded_bytes_per_frame*/ 160,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_g711a_init,
|
/*.init*/ switch_g711a_init,
|
||||||
/*.encode */ switch_g711a_encode,
|
/*.encode*/ switch_g711a_encode,
|
||||||
/*.decode */ switch_g711a_decode,
|
/*.decode*/ switch_g711a_decode,
|
||||||
/*.destroy */ switch_g711a_destroy
|
/*.destroy*/ switch_g711a_destroy
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_interface g711a_codec_interface = {
|
static const switch_codec_interface g711a_codec_interface = {
|
||||||
/*.interface_name */ "g711 alaw",
|
/*.interface_name*/ "g711 alaw",
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
/*.codec_type*/ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
/*.ianacode */ 8,
|
/*.ianacode*/ 8,
|
||||||
/*.iananame */ "PCMA",
|
/*.iananame*/ "PCMA",
|
||||||
/*.implementations */ &g711a_8k_implementation
|
/*.implementations*/ &g711a_8k_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_codec_interface g711u_codec_interface = {
|
static const switch_codec_interface g711u_codec_interface = {
|
||||||
/*.interface_name */ "g711 ulaw",
|
/*.interface_name*/ "g711 ulaw",
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
/*.codec_type*/ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
/*.ianacode */ 0,
|
/*.ianacode*/ 0,
|
||||||
/*.iananame */ "PCMU",
|
/*.iananame*/ "PCMU",
|
||||||
/*.implementations */ &g711u_8k_implementation,
|
/*.implementations*/ &g711u_8k_implementation,
|
||||||
/*.next */ &g711a_codec_interface
|
/*.next*/ &g711a_codec_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
static switch_loadable_module_interface g711_module_interface = {
|
static switch_loadable_module_interface g711_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ &g711u_codec_interface,
|
/*.codec_interface*/ &g711u_codec_interface,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &g711_module_interface;
|
*interface = &g711_module_interface;
|
||||||
|
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,142 +28,176 @@
|
||||||
*
|
*
|
||||||
* mod_codec_g729.c -- G729 Codec Module
|
* mod_codec_g729.c -- G729 Codec Module
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "switch.h"
|
#include "switch.h"
|
||||||
#include "g729.h"
|
#include "g729.h"
|
||||||
static const char modname[] = "mod_codec_g729";
|
|
||||||
struct g729_context {
|
static const char modname[] = "mod_codec_g729";
|
||||||
struct dec_state decoder_object;
|
|
||||||
struct cod_state encoder_object;
|
struct g729_context {
|
||||||
};
|
struct dec_state decoder_object;
|
||||||
static switch_status switch_g729_init(switch_codec *codec, switch_codec_flag flags,
|
struct cod_state encoder_object;
|
||||||
const struct switch_codec_settings *codec_settings)
|
};
|
||||||
{
|
|
||||||
struct g729_context *context = NULL;
|
static switch_status switch_g729_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||||
int encoding, decoding;
|
{
|
||||||
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
struct g729_context *context = NULL;
|
||||||
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
int encoding, decoding;
|
||||||
if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g729_context))))) {
|
|
||||||
return SWITCH_STATUS_FALSE;
|
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
||||||
} else {
|
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
||||||
if (encoding) {
|
|
||||||
g729_init_coder(&context->encoder_object, 0);
|
if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g729_context))))) {
|
||||||
}
|
return SWITCH_STATUS_FALSE;
|
||||||
if (decoding) {
|
} else {
|
||||||
g729_init_decoder(&context->decoder_object);
|
if (encoding) {
|
||||||
}
|
g729_init_coder(&context->encoder_object, 0);
|
||||||
codec->private = context;
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
if (decoding) {
|
||||||
}
|
g729_init_decoder(&context->decoder_object);
|
||||||
}
|
}
|
||||||
static switch_status switch_g729_destroy(switch_codec *codec)
|
|
||||||
{
|
codec->private = context;
|
||||||
codec->private = NULL;
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
static switch_status switch_g729_encode(switch_codec *codec,
switch_codec *other_codec,
void *decoded_data,
|
}
|
||||||
size_t decoded_data_len,
int decoded_rate,
void *encoded_data,
|
|
||||||
size_t *encoded_data_len,
int *encoded_rate,
unsigned int *flag)
|
static switch_status switch_g729_destroy(switch_codec *codec)
|
||||||
{
|
{
|
||||||
struct g729_context *context = codec->private;
|
codec->private = NULL;
|
||||||
int cbret = 0;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
if (!context) {
|
}
|
||||||
return SWITCH_STATUS_FALSE;
|
|
||||||
}
|
|
||||||
if (decoded_data_len % 160 == 0) {
|
static switch_status switch_g729_encode(switch_codec *codec,
|
||||||
unsigned int new_len = 0;
|
switch_codec *other_codec,
|
||||||
INT16 * ddp = decoded_data;
|
void *decoded_data,
|
||||||
char *edp = encoded_data;
|
size_t decoded_data_len,
|
||||||
int x;
|
int decoded_rate,
|
||||||
int loops = (int) decoded_data_len / 160;
|
void *encoded_data,
|
||||||
for (x = 0; x < loops && new_len < *encoded_data_len; x++) {
|
size_t *encoded_data_len,
|
||||||
g729_coder(&context->encoder_object, ddp, edp, &cbret);
|
int *encoded_rate,
|
||||||
edp += 10;
|
unsigned int *flag)
|
||||||
ddp += 80;
|
{
|
||||||
new_len += 10;
|
struct g729_context *context = codec->private;
|
||||||
}
|
int cbret = 0;
|
||||||
if (new_len <= *encoded_data_len) {
|
|
||||||
*encoded_data_len = new_len;
|
if (!context) {
|
||||||
} else {
|
return SWITCH_STATUS_FALSE;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!! %u >= %u\n", new_len, *encoded_data_len);
|
}
|
||||||
return SWITCH_STATUS_FALSE;
|
if (decoded_data_len % 160 == 0) {
|
||||||
}
|
unsigned int new_len = 0;
|
||||||
}
|
INT16 *ddp = decoded_data;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
char *edp = encoded_data;
|
||||||
}
|
int x;
|
||||||
static switch_status switch_g729_decode(switch_codec *codec,
switch_codec *other_codec,
void *encoded_data,
|
int loops = (int) decoded_data_len / 160;
|
||||||
size_t encoded_data_len,
int encoded_rate,
void *decoded_data,
|
|
||||||
size_t *decoded_data_len,
int *decoded_rate,
unsigned int *flag)
|
for(x = 0; x < loops && new_len < *encoded_data_len; x++) {
|
||||||
{
|
g729_coder(&context->encoder_object, ddp, edp, &cbret);
|
||||||
struct g729_context *context = codec->private;
|
edp += 10;
|
||||||
if (!context) {
|
ddp += 80;
|
||||||
return SWITCH_STATUS_FALSE;
|
new_len += 10;
|
||||||
}
|
}
|
||||||
if (encoded_data_len % 10 == 0) {
|
if( new_len <= *encoded_data_len ) {
|
||||||
int loops = (int) encoded_data_len / 10;
|
*encoded_data_len = new_len;
|
||||||
char *edp = encoded_data;
|
} else {
|
||||||
short *ddp = decoded_data;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!! %u >= %u\n", new_len, *encoded_data_len);
|
||||||
int x;
|
return SWITCH_STATUS_FALSE;
|
||||||
unsigned int new_len = 0;
|
}
|
||||||
for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
|
}
|
||||||
g729_decoder(&context->decoder_object, ddp, edp, 10);
|
return SWITCH_STATUS_SUCCESS;
|
||||||
ddp += 80;
|
}
|
||||||
edp += 10;
|
|
||||||
new_len += 160;
|
|
||||||
}
|
static switch_status switch_g729_decode(switch_codec *codec,
|
||||||
if (new_len <= *decoded_data_len) {
|
switch_codec *other_codec,
|
||||||
*decoded_data_len = new_len;
|
void *encoded_data,
|
||||||
} else {
|
size_t encoded_data_len,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
|
int encoded_rate,
|
||||||
return SWITCH_STATUS_FALSE;
|
void *decoded_data,
|
||||||
}
|
size_t *decoded_data_len,
|
||||||
} else {
|
int *decoded_rate,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
|
unsigned int *flag)
|
||||||
}
|
{
|
||||||
return SWITCH_STATUS_SUCCESS;
|
struct g729_context *context = codec->private;
|
||||||
}
|
|
||||||
|
if (!context) {
|
||||||
|
return SWITCH_STATUS_FALSE;
|
||||||
/* Registration */
|
}
|
||||||
static const switch_codec_implementation g729_8k_implementation = {
|
|
||||||
/*.samples_per_second */ 8000,
|
|
||||||
/*.bits_per_second */ 64000,
|
if (encoded_data_len % 10 == 0) {
|
||||||
/*.microseconds_per_frame */ 20000,
|
int loops = (int) encoded_data_len / 10;
|
||||||
/*.samples_per_frame */ 160,
|
char *edp = encoded_data;
|
||||||
/*.bytes_per_frame */ 320,
|
short *ddp = decoded_data;
|
||||||
/*.encoded_bytes_per_frame */ 20,
|
int x;
|
||||||
/*.number_of_channels */ 1,
|
unsigned int new_len = 0;
|
||||||
/*.pref_frames_per_packet */ 1,
|
for(x = 0; x < loops && new_len < *decoded_data_len; x++) {
|
||||||
/*.max_frames_per_packet */ 24,
|
g729_decoder(&context->decoder_object, ddp, edp, 10);
|
||||||
/*.init */ switch_g729_init,
|
ddp += 80;
|
||||||
/*.encode */ switch_g729_encode,
|
edp += 10;
|
||||||
/*.decode */ switch_g729_decode,
|
new_len += 160;
|
||||||
/*.destroy */ switch_g729_destroy,
|
}
|
||||||
};
|
if (new_len <= *decoded_data_len) {
|
||||||
static const switch_codec_interface g729_codec_interface = {
|
*decoded_data_len = new_len;
|
||||||
/*.interface_name */ "g729",
|
} else {
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
|
||||||
/*.ianacode */ 18,
|
return SWITCH_STATUS_FALSE;
|
||||||
/*.iananame */ "G729",
|
}
|
||||||
/*.implementations */ &g729_8k_implementation,
|
} else {
|
||||||
};
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
|
||||||
static switch_loadable_module_interface g729_module_interface = {
|
}
|
||||||
/*.module_name */ modname,
|
|
||||||
/*.endpoint_interface */ NULL,
|
|
||||||
/*.timer_interface */ NULL,
|
return SWITCH_STATUS_SUCCESS;
|
||||||
/*.dialplan_interface */ NULL,
|
}
|
||||||
/*.codec_interface */ &g729_codec_interface,
|
|
||||||
/*.application_interface */ NULL
|
/* Registration */
|
||||||
};
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface,
|
static const switch_codec_implementation g729_8k_implementation = {
|
||||||
char *filename)
|
/*.samples_per_second*/ 8000,
|
||||||
{
|
/*.bits_per_second*/ 64000,
|
||||||
|
/*.microseconds_per_frame*/ 20000,
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/*.samples_per_frame*/ 160,
|
||||||
*interface = &g729_module_interface;
|
/*.bytes_per_frame*/ 320,
|
||||||
|
/*.encoded_bytes_per_frame*/ 20,
|
||||||
/* indicate that the module should continue to be loaded */
|
/*.number_of_channels*/ 1,
|
||||||
return SWITCH_STATUS_SUCCESS;
|
/*.pref_frames_per_packet*/ 1,
|
||||||
}
|
/*.max_frames_per_packet*/ 24,
|
||||||
|
/*.init*/ switch_g729_init,
|
||||||
|
/*.encode*/ switch_g729_encode,
|
||||||
|
/*.decode*/ switch_g729_decode,
|
||||||
|
/*.destroy*/ switch_g729_destroy,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const switch_codec_interface g729_codec_interface = {
|
||||||
|
/*.interface_name*/ "g729",
|
||||||
|
/*.codec_type*/ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
|
/*.ianacode*/ 18,
|
||||||
|
/*.iananame*/ "G729",
|
||||||
|
/*.implementations*/ &g729_8k_implementation,
|
||||||
|
};
|
||||||
|
|
||||||
|
static switch_loadable_module_interface g729_module_interface = {
|
||||||
|
/*.module_name*/ modname,
|
||||||
|
/*.endpoint_interface*/ NULL,
|
||||||
|
/*.timer_interface*/ NULL,
|
||||||
|
/*.dialplan_interface*/ NULL,
|
||||||
|
/*.codec_interface*/ &g729_codec_interface,
|
||||||
|
/*.application_interface*/ NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
|
*interface = &g729_module_interface;
|
||||||
|
|
||||||
|
/* indicate that the module should continue to be loaded */
|
||||||
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,148 +28,180 @@
|
||||||
*
|
*
|
||||||
* mod_codec_gsm.c -- gsm Codec Module
|
* mod_codec_gsm.c -- gsm Codec Module
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "switch.h"
|
#include "switch.h"
|
||||||
#include "gsm.h"
|
#include "gsm.h"
|
||||||
static const char modname[] = "mod_codec_gsm";
|
|
||||||
struct gsm_context {
|
static const char modname[] = "mod_codec_gsm";
|
||||||
gsm encoder;
|
|
||||||
gsm decoder;
|
struct gsm_context {
|
||||||
};
|
gsm encoder;
|
||||||
static switch_status switch_gsm_init(switch_codec *codec, switch_codec_flag flags,
|
gsm decoder;
|
||||||
const struct switch_codec_settings *codec_settings)
|
};
|
||||||
{
|
|
||||||
struct gsm_context *context;
|
static switch_status switch_gsm_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||||
int encoding, decoding;
|
{
|
||||||
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
struct gsm_context *context;
|
||||||
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
int encoding, decoding;
|
||||||
if (!(encoding || decoding)) {
|
|
||||||
return SWITCH_STATUS_FALSE;
|
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
||||||
} else {
|
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
||||||
context = switch_core_alloc(codec->memory_pool, sizeof(*context));
|
|
||||||
if (encoding)
|
if (!(encoding || decoding)) {
|
||||||
context->encoder = gsm_create();
|
return SWITCH_STATUS_FALSE;
|
||||||
if (decoding)
|
} else {
|
||||||
context->decoder = gsm_create();
|
context = switch_core_alloc(codec->memory_pool, sizeof(*context));
|
||||||
}
|
if (encoding) context->encoder = gsm_create();
|
||||||
codec->private = context;
|
if (decoding) context->decoder = gsm_create();
|
||||||
return SWITCH_STATUS_SUCCESS;
|
}
|
||||||
}
|
|
||||||
static switch_status switch_gsm_destroy(switch_codec *codec)
|
codec->private = context;
|
||||||
{
|
|
||||||
struct gsm_context *context = codec->private;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
int encoding = (codec->flags & SWITCH_CODEC_FLAG_ENCODE);
|
|
||||||
int decoding = (codec->flags & SWITCH_CODEC_FLAG_DECODE);
|
}
|
||||||
if (encoding)
|
|
||||||
gsm_destroy(context->encoder);
|
static switch_status switch_gsm_destroy(switch_codec *codec)
|
||||||
if (decoding)
|
{
|
||||||
gsm_destroy(context->decoder);
|
struct gsm_context *context = codec->private;
|
||||||
codec->private = NULL;
|
int encoding = (codec->flags & SWITCH_CODEC_FLAG_ENCODE);
|
||||||
return SWITCH_STATUS_SUCCESS;
|
int decoding = (codec->flags & SWITCH_CODEC_FLAG_DECODE);
|
||||||
}
|
|
||||||
static switch_status switch_gsm_encode(switch_codec *codec,
switch_codec *other_codec,
void *decoded_data,
|
if (encoding) gsm_destroy(context->encoder);
|
||||||
size_t decoded_data_len,
int decoded_rate,
void *encoded_data,
|
if (decoding) gsm_destroy(context->decoder);
|
||||||
size_t *encoded_data_len,
int *encoded_rate,
unsigned int *flag)
|
|
||||||
{
|
codec->private = NULL;
|
||||||
struct gsm_context *context = codec->private;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
int cbret = 0;
|
}
|
||||||
if (!context) {
|
|
||||||
return SWITCH_STATUS_FALSE;
|
|
||||||
}
|
static switch_status switch_gsm_encode(switch_codec *codec,
|
||||||
if (decoded_data_len % 320 == 0) {
|
switch_codec *other_codec,
|
||||||
unsigned int new_len = 0;
|
void *decoded_data,
|
||||||
gsm_signal * ddp = decoded_data;
|
size_t decoded_data_len,
|
||||||
gsm_byte * edp = encoded_data;
|
int decoded_rate,
|
||||||
int x;
|
void *encoded_data,
|
||||||
int loops = (int) decoded_data_len / 320;
|
size_t *encoded_data_len,
|
||||||
for (x = 0; x < loops && new_len < *encoded_data_len; x++) {
|
int *encoded_rate,
|
||||||
gsm_encode(context->encoder, ddp, edp);
|
unsigned int *flag)
|
||||||
edp += 33;
|
{
|
||||||
ddp += 160;
|
struct gsm_context *context = codec->private;
|
||||||
new_len += 33;
|
int cbret = 0;
|
||||||
}
|
|
||||||
if (new_len <= *encoded_data_len) {
|
if (!context) {
|
||||||
*encoded_data_len = new_len;
|
return SWITCH_STATUS_FALSE;
|
||||||
} else {
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!! %u >= %u\n", new_len, *encoded_data_len);
|
if (decoded_data_len % 320 == 0) {
|
||||||
return SWITCH_STATUS_FALSE;
|
unsigned int new_len = 0;
|
||||||
}
|
gsm_signal *ddp = decoded_data;
|
||||||
}
|
gsm_byte *edp = encoded_data;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
int x;
|
||||||
}
|
int loops = (int) decoded_data_len / 320;
|
||||||
static switch_status switch_gsm_decode(switch_codec *codec,
switch_codec *other_codec,
void *encoded_data,
|
for(x = 0; x < loops && new_len < *encoded_data_len; x++) {
|
||||||
size_t encoded_data_len,
int encoded_rate,
void *decoded_data,
|
gsm_encode(context->encoder, ddp, edp);
|
||||||
size_t *decoded_data_len,
int *decoded_rate,
unsigned int *flag)
|
edp += 33;
|
||||||
{
|
ddp += 160;
|
||||||
struct gsm_context *context = codec->private;
|
new_len += 33;
|
||||||
if (!context) {
|
}
|
||||||
return SWITCH_STATUS_FALSE;
|
if( new_len <= *encoded_data_len ) {
|
||||||
}
|
*encoded_data_len = new_len;
|
||||||
if (encoded_data_len % 33 == 0) {
|
} else {
|
||||||
int loops = (int) encoded_data_len / 33;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!! %u >= %u\n", new_len, *encoded_data_len);
|
||||||
gsm_byte * edp = encoded_data;
|
return SWITCH_STATUS_FALSE;
|
||||||
gsm_signal * ddp = decoded_data;
|
}
|
||||||
int x;
|
}
|
||||||
unsigned int new_len = 0;
|
|
||||||
for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
|
return SWITCH_STATUS_SUCCESS;
|
||||||
gsm_decode(context->decoder, edp, ddp);
|
}
|
||||||
ddp += 160;
|
|
||||||
edp += 33;
|
|
||||||
new_len += 320;
|
static switch_status switch_gsm_decode(switch_codec *codec,
|
||||||
}
|
switch_codec *other_codec,
|
||||||
if (new_len <= *decoded_data_len) {
|
void *encoded_data,
|
||||||
*decoded_data_len = new_len;
|
size_t encoded_data_len,
|
||||||
} else {
|
int encoded_rate,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
|
void *decoded_data,
|
||||||
return SWITCH_STATUS_FALSE;
|
size_t *decoded_data_len,
|
||||||
}
|
int *decoded_rate,
|
||||||
} else {
|
unsigned int *flag)
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
|
{
|
||||||
}
|
struct gsm_context *context = codec->private;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
|
||||||
}
|
if (!context) {
|
||||||
|
return SWITCH_STATUS_FALSE;
|
||||||
|
}
|
||||||
/* Registration */
|
|
||||||
static const switch_codec_implementation gsm_8k_implementation = {
|
|
||||||
/*.samples_per_second */ 8000,
|
if (encoded_data_len % 33 == 0) {
|
||||||
/*.bits_per_second */ 13200,
|
int loops = (int) encoded_data_len / 33;
|
||||||
/*.microseconds_per_frame */ 20000,
|
gsm_byte *edp = encoded_data;
|
||||||
/*.samples_per_frame */ 160,
|
gsm_signal *ddp = decoded_data;
|
||||||
/*.bytes_per_frame */ 320,
|
int x;
|
||||||
/*.encoded_bytes_per_frame */ 33,
|
unsigned int new_len = 0;
|
||||||
/*.number_of_channels */ 1,
|
for(x = 0; x < loops && new_len < *decoded_data_len; x++) {
|
||||||
/*.pref_frames_per_packet */ 1,
|
gsm_decode(context->decoder, edp, ddp);
|
||||||
/*.max_frames_per_packet */ 1,
|
ddp += 160;
|
||||||
/*.init */ switch_gsm_init,
|
edp += 33;
|
||||||
/*.encode */ switch_gsm_encode,
|
new_len += 320;
|
||||||
/*.decode */ switch_gsm_decode,
|
}
|
||||||
/*.destroy */ switch_gsm_destroy,
|
if (new_len <= *decoded_data_len) {
|
||||||
};
|
*decoded_data_len = new_len;
|
||||||
static const switch_codec_interface gsm_codec_interface = {
|
} else {
|
||||||
/*.interface_name */ "gsm",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
return SWITCH_STATUS_FALSE;
|
||||||
/*.ianacode */ 3,
|
}
|
||||||
/*.iananame */ "gsm",
|
} else {
|
||||||
/*.implementations */ &gsm_8k_implementation,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
|
||||||
};
|
}
|
||||||
static switch_loadable_module_interface gsm_module_interface = {
|
|
||||||
/*.module_name */ modname,
|
return SWITCH_STATUS_SUCCESS;
|
||||||
/*.endpoint_interface */ NULL,
|
}
|
||||||
/*.timer_interface */ NULL,
|
|
||||||
/*.dialplan_interface */ NULL,
|
/* Registration */
|
||||||
/*.codec_interface */ &gsm_codec_interface,
|
|
||||||
/*.application_interface */ NULL
|
static const switch_codec_implementation gsm_8k_implementation = {
|
||||||
};
|
/*.samples_per_second*/ 8000,
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface,
|
/*.bits_per_second*/ 13200,
|
||||||
char *filename)
|
/*.microseconds_per_frame*/ 20000,
|
||||||
{
|
/*.samples_per_frame*/ 160,
|
||||||
|
/*.bytes_per_frame*/ 320,
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/*.encoded_bytes_per_frame*/ 33,
|
||||||
*interface = &gsm_module_interface;
|
/*.number_of_channels*/ 1,
|
||||||
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/* indicate that the module should continue to be loaded */
|
/*.max_frames_per_packet*/ 1,
|
||||||
return SWITCH_STATUS_SUCCESS;
|
/*.init*/ switch_gsm_init,
|
||||||
}
|
/*.encode*/ switch_gsm_encode,
|
||||||
|
/*.decode*/ switch_gsm_decode,
|
||||||
|
/*.destroy*/ switch_gsm_destroy,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const switch_codec_interface gsm_codec_interface = {
|
||||||
|
/*.interface_name*/ "gsm",
|
||||||
|
/*.codec_type*/ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
|
/*.ianacode*/ 3,
|
||||||
|
/*.iananame*/ "gsm",
|
||||||
|
/*.implementations*/ &gsm_8k_implementation,
|
||||||
|
};
|
||||||
|
|
||||||
|
static switch_loadable_module_interface gsm_module_interface = {
|
||||||
|
/*.module_name*/ modname,
|
||||||
|
/*.endpoint_interface*/ NULL,
|
||||||
|
/*.timer_interface*/ NULL,
|
||||||
|
/*.dialplan_interface*/ NULL,
|
||||||
|
/*.codec_interface*/ &gsm_codec_interface,
|
||||||
|
/*.application_interface*/ NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
|
*interface = &gsm_module_interface;
|
||||||
|
|
||||||
|
/* indicate that the module should continue to be loaded */
|
||||||
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,7 @@
|
||||||
static const char modname[] = "mod_rawaudio";
|
static const char modname[] = "mod_rawaudio";
|
||||||
|
|
||||||
|
|
||||||
static switch_status switch_raw_init(switch_codec *codec, switch_codec_flag flags,
|
static switch_status switch_raw_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||||
const struct switch_codec_settings *codec_settings)
|
|
||||||
{
|
{
|
||||||
int encoding, decoding;
|
int encoding, decoding;
|
||||||
struct raw_context *context = NULL;
|
struct raw_context *context = NULL;
|
||||||
|
@ -52,15 +51,17 @@ static switch_status switch_raw_init(switch_codec *codec, switch_codec_flag flag
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status switch_raw_encode(switch_codec *codec,
|
static switch_status switch_raw_encode(switch_codec *codec,
|
||||||
switch_codec *other_codec,
|
switch_codec *other_codec,
|
||||||
void *decoded_data,
|
void *decoded_data,
|
||||||
size_t decoded_data_len,
|
size_t decoded_data_len,
|
||||||
int decoded_rate,
|
int decoded_rate,
|
||||||
void *encoded_data,
|
void *encoded_data,
|
||||||
size_t *encoded_data_len, int *encoded_rate, unsigned int *flag)
|
size_t *encoded_data_len,
|
||||||
|
int *encoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
|
|
||||||
/* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */
|
/* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary.*/
|
||||||
if (codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
|
if (codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
|
||||||
memcpy(encoded_data, decoded_data, decoded_data_len);
|
memcpy(encoded_data, decoded_data, decoded_data_len);
|
||||||
*encoded_data_len = decoded_data_len;
|
*encoded_data_len = decoded_data_len;
|
||||||
|
@ -70,12 +71,14 @@ static switch_status switch_raw_encode(switch_codec *codec,
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status switch_raw_decode(switch_codec *codec,
|
static switch_status switch_raw_decode(switch_codec *codec,
|
||||||
switch_codec *other_codec,
|
switch_codec *other_codec,
|
||||||
void *encoded_data,
|
void *encoded_data,
|
||||||
size_t encoded_data_len,
|
size_t encoded_data_len,
|
||||||
int encoded_rate,
|
int encoded_rate,
|
||||||
void *decoded_data,
|
void *decoded_data,
|
||||||
size_t *decoded_data_len, int *decoded_rate, unsigned int *flag)
|
size_t *decoded_data_len,
|
||||||
|
int *decoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
if (codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
|
if (codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
|
||||||
memcpy(decoded_data, encoded_data, encoded_data_len);
|
memcpy(decoded_data, encoded_data, encoded_data_len);
|
||||||
|
@ -88,12 +91,12 @@ static switch_status switch_raw_decode(switch_codec *codec,
|
||||||
|
|
||||||
static switch_status switch_raw_destroy(switch_codec *codec)
|
static switch_status switch_raw_destroy(switch_codec *codec)
|
||||||
{
|
{
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_codec_implementation raw_32k_implementation = {
|
static const switch_codec_implementation raw_32k_implementation = {
|
||||||
/*.samples_per_second = */ 32000,
|
/*.samples_per_second = */ 32000,
|
||||||
/*.bits_per_second = */ 512000,
|
/*.bits_per_second = */ 512000,
|
||||||
/*.microseconds_per_frame = */ 20000,
|
/*.microseconds_per_frame = */ 20000,
|
||||||
/*.samples_per_frame = */ 640,
|
/*.samples_per_frame = */ 640,
|
||||||
|
@ -161,48 +164,52 @@ static const switch_codec_implementation raw_8k_implementation = {
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_implementation raw_8k_30ms_implementation = {
|
static const switch_codec_implementation raw_8k_30ms_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second*/ 8000,
|
||||||
/*.bits_per_second */ 128000,
|
/*.bits_per_second*/ 128000,
|
||||||
/*.microseconds_per_frame */ 30000,
|
/*.microseconds_per_frame*/ 30000,
|
||||||
/*.samples_per_frame */ 240,
|
/*.samples_per_frame*/ 240,
|
||||||
/*.bytes_per_frame */ 480,
|
/*.bytes_per_frame*/ 480,
|
||||||
/*.encoded_bytes_per_frame */ 480,
|
/*.encoded_bytes_per_frame*/ 480,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_raw_init,
|
/*.init*/ switch_raw_init,
|
||||||
/*.encode */ switch_raw_encode,
|
/*.encode*/ switch_raw_encode,
|
||||||
/*.decode */ switch_raw_decode,
|
/*.decode*/ switch_raw_decode,
|
||||||
/*.destroy */ switch_raw_destroy,
|
/*.destroy*/ switch_raw_destroy,
|
||||||
/*.next */ &raw_8k_implementation
|
/*.next*/ &raw_8k_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static const switch_codec_interface raw_codec_interface = {
|
static const switch_codec_interface raw_codec_interface = {
|
||||||
/*.interface_name */ "raw signed linear (16 bit)",
|
/*.interface_name*/ "raw signed linear (16 bit)",
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
/*.codec_type*/ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
/*.ianacode */ 10,
|
/*.ianacode*/ 10,
|
||||||
/*.iananame */ "L16",
|
/*.iananame*/ "L16",
|
||||||
/*.implementations */ &raw_8k_30ms_implementation
|
/*.implementations*/ &raw_8k_30ms_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
static switch_loadable_module_interface raw_module_interface = {
|
static switch_loadable_module_interface raw_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ &raw_codec_interface,
|
/*.codec_interface*/ &raw_codec_interface,
|
||||||
/*.application_interface */ NULL,
|
/*.application_interface*/ NULL,
|
||||||
/*.api_interface */ NULL,
|
/*.api_interface*/ NULL,
|
||||||
///*.file_interface*/ &raw_file_interface
|
///*.file_interface*/ &raw_file_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
|
||||||
*interface = &raw_module_interface;
|
*interface = &raw_module_interface;
|
||||||
|
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -36,22 +36,22 @@
|
||||||
static const char modname[] = "mod_speexcodec";
|
static const char modname[] = "mod_speexcodec";
|
||||||
|
|
||||||
const struct switch_codec_settings default_codec_settings = {
|
const struct switch_codec_settings default_codec_settings = {
|
||||||
/*.quality */ 5,
|
/*.quality*/ 5,
|
||||||
/*.complexity */ 5,
|
/*.complexity*/ 5,
|
||||||
/*.enhancement */ 1,
|
/*.enhancement*/ 1,
|
||||||
/*.vad */ 0,
|
/*.vad*/ 0,
|
||||||
/*.vbr */ 0,
|
/*.vbr*/ 0,
|
||||||
/*.vbr_quality */ 4,
|
/*.vbr_quality*/ 4,
|
||||||
/*.abr */ 0,
|
/*.abr*/ 0,
|
||||||
/*.dtx */ 0,
|
/*.dtx*/ 0,
|
||||||
/*.preproc */ 0,
|
/*.preproc*/ 0,
|
||||||
/*.pp_vad */ 0,
|
/*.pp_vad*/ 0,
|
||||||
/*.pp_agc */ 0,
|
/*.pp_agc*/ 0,
|
||||||
/*.pp_agc_level */ 8000,
|
/*.pp_agc_level*/ 8000,
|
||||||
/*.pp_denoise */ 0,
|
/*.pp_denoise*/ 0,
|
||||||
/*.pp_dereverb */ 0,
|
/*.pp_dereverb*/ 0,
|
||||||
/*.pp_dereverb_decay */ 0.4f,
|
/*.pp_dereverb_decay*/ 0.4f,
|
||||||
/*.pp_dereverb_level */ 0.3f,
|
/*.pp_dereverb_level*/ 0.3f,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct speex_context {
|
struct speex_context {
|
||||||
|
@ -72,12 +72,11 @@ struct speex_context {
|
||||||
int decoder_mode;
|
int decoder_mode;
|
||||||
};
|
};
|
||||||
|
|
||||||
static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag flags,
|
static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag flags, const struct switch_codec_settings *codec_settings)
|
||||||
const struct switch_codec_settings *codec_settings)
|
|
||||||
{
|
{
|
||||||
struct speex_context *context = NULL;
|
struct speex_context *context = NULL;
|
||||||
int encoding, decoding;
|
int encoding, decoding;
|
||||||
|
|
||||||
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
encoding = (flags & SWITCH_CODEC_FLAG_ENCODE);
|
||||||
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
decoding = (flags & SWITCH_CODEC_FLAG_DECODE);
|
||||||
|
|
||||||
|
@ -91,7 +90,7 @@ static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag fl
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
} else {
|
} else {
|
||||||
const SpeexMode *mode = NULL;
|
const SpeexMode *mode = NULL;
|
||||||
|
|
||||||
context->codec = codec;
|
context->codec = codec;
|
||||||
if (codec->implementation->samples_per_second == 8000) {
|
if (codec->implementation->samples_per_second == 8000) {
|
||||||
mode = &speex_nb_mode;
|
mode = &speex_nb_mode;
|
||||||
|
@ -111,17 +110,14 @@ static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag fl
|
||||||
speex_encoder_ctl(context->encoder_state, SPEEX_GET_FRAME_SIZE, &context->encoder_frame_size);
|
speex_encoder_ctl(context->encoder_state, SPEEX_GET_FRAME_SIZE, &context->encoder_frame_size);
|
||||||
speex_encoder_ctl(context->encoder_state, SPEEX_SET_COMPLEXITY, &codec->codec_settings.complexity);
|
speex_encoder_ctl(context->encoder_state, SPEEX_SET_COMPLEXITY, &codec->codec_settings.complexity);
|
||||||
if (codec->codec_settings.preproc) {
|
if (codec->codec_settings.preproc) {
|
||||||
context->pp =
|
context->pp = speex_preprocess_state_init(context->encoder_frame_size, codec->implementation->samples_per_second);
|
||||||
speex_preprocess_state_init(context->encoder_frame_size, codec->implementation->samples_per_second);
|
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_VAD, &codec->codec_settings.pp_vad);
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_VAD, &codec->codec_settings.pp_vad);
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_AGC, &codec->codec_settings.pp_agc);
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_AGC, &codec->codec_settings.pp_agc);
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_AGC_LEVEL, &codec->codec_settings.pp_agc_level);
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_AGC_LEVEL, &codec->codec_settings.pp_agc_level);
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DENOISE, &codec->codec_settings.pp_denoise);
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DENOISE, &codec->codec_settings.pp_denoise);
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DEREVERB, &codec->codec_settings.pp_dereverb);
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DEREVERB, &codec->codec_settings.pp_dereverb);
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DEREVERB_DECAY,
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DEREVERB_DECAY, &codec->codec_settings.pp_dereverb_decay);
|
||||||
&codec->codec_settings.pp_dereverb_decay);
|
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL, &codec->codec_settings.pp_dereverb_level);
|
||||||
speex_preprocess_ctl(context->pp, SPEEX_PREPROCESS_SET_DEREVERB_LEVEL,
|
|
||||||
&codec->codec_settings.pp_dereverb_level);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!codec->codec_settings.abr && !codec->codec_settings.vbr) {
|
if (!codec->codec_settings.abr && !codec->codec_settings.vbr) {
|
||||||
|
@ -138,8 +134,8 @@ static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag fl
|
||||||
speex_encoder_ctl(context->encoder_state, SPEEX_SET_ABR, &codec->codec_settings.abr);
|
speex_encoder_ctl(context->encoder_state, SPEEX_SET_ABR, &codec->codec_settings.abr);
|
||||||
}
|
}
|
||||||
if (codec->codec_settings.dtx) {
|
if (codec->codec_settings.dtx) {
|
||||||
speex_encoder_ctl(context->encoder_state, SPEEX_SET_DTX, &codec->codec_settings.dtx);
|
speex_encoder_ctl(context->encoder_state, SPEEX_SET_DTX, &codec->codec_settings.dtx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (decoding) {
|
if (decoding) {
|
||||||
|
@ -158,12 +154,14 @@ static switch_status switch_speex_init(switch_codec *codec, switch_codec_flag fl
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status switch_speex_encode(switch_codec *codec,
|
static switch_status switch_speex_encode(switch_codec *codec,
|
||||||
switch_codec *other_codec,
|
switch_codec *other_codec,
|
||||||
void *decoded_data,
|
void *decoded_data,
|
||||||
size_t decoded_data_len,
|
size_t decoded_data_len,
|
||||||
int decoded_rate,
|
int decoded_rate,
|
||||||
void *encoded_data,
|
void *encoded_data,
|
||||||
size_t *encoded_data_len, int *encoded_rate, unsigned int *flag)
|
size_t *encoded_data_len,
|
||||||
|
int *encoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
struct speex_context *context = codec->private;
|
struct speex_context *context = codec->private;
|
||||||
short *buf;
|
short *buf;
|
||||||
|
@ -180,8 +178,7 @@ static switch_status switch_speex_encode(switch_codec *codec,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_speech) {
|
if (is_speech) {
|
||||||
is_speech = speex_encode_int(context->encoder_state, buf, &context->encoder_bits)
|
is_speech = speex_encode_int(context->encoder_state, buf, &context->encoder_bits) || ! context->codec->codec_settings.dtx;
|
||||||
|| !context->codec->codec_settings.dtx;
|
|
||||||
} else {
|
} else {
|
||||||
speex_bits_pack(&context->encoder_bits, 0, 5);
|
speex_bits_pack(&context->encoder_bits, 0, 5);
|
||||||
}
|
}
|
||||||
|
@ -205,7 +202,7 @@ static switch_status switch_speex_encode(switch_codec *codec,
|
||||||
|
|
||||||
|
|
||||||
speex_bits_pack(&context->encoder_bits, 15, 5);
|
speex_bits_pack(&context->encoder_bits, 15, 5);
|
||||||
*encoded_data_len = speex_bits_write(&context->encoder_bits, (char *) encoded_data, context->encoder_frame_size);
|
*encoded_data_len = speex_bits_write(&context->encoder_bits, (char *)encoded_data, context->encoder_frame_size);
|
||||||
speex_bits_reset(&context->encoder_bits);
|
speex_bits_reset(&context->encoder_bits);
|
||||||
|
|
||||||
|
|
||||||
|
@ -213,12 +210,14 @@ static switch_status switch_speex_encode(switch_codec *codec,
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status switch_speex_decode(switch_codec *codec,
|
static switch_status switch_speex_decode(switch_codec *codec,
|
||||||
switch_codec *other_codec,
|
switch_codec *other_codec,
|
||||||
void *encoded_data,
|
void *encoded_data,
|
||||||
size_t encoded_data_len,
|
size_t encoded_data_len,
|
||||||
int encoded_rate,
|
int encoded_rate,
|
||||||
void *decoded_data,
|
void *decoded_data,
|
||||||
size_t *decoded_data_len, int *decoded_rate, unsigned int *flag)
|
size_t *decoded_data_len,
|
||||||
|
int *decoded_rate,
|
||||||
|
unsigned int *flag)
|
||||||
{
|
{
|
||||||
struct speex_context *context = codec->private;
|
struct speex_context *context = codec->private;
|
||||||
short *buf;
|
short *buf;
|
||||||
|
@ -231,10 +230,10 @@ static switch_status switch_speex_decode(switch_codec *codec,
|
||||||
if (*flag & SWITCH_CODEC_FLAG_SILENCE) {
|
if (*flag & SWITCH_CODEC_FLAG_SILENCE) {
|
||||||
speex_decode_int(context->decoder_state, NULL, buf);
|
speex_decode_int(context->decoder_state, NULL, buf);
|
||||||
} else {
|
} else {
|
||||||
speex_bits_read_from(&context->decoder_bits, (char *) encoded_data, (int) *decoded_data_len);
|
speex_bits_read_from(&context->decoder_bits, (char *)encoded_data, (int)*decoded_data_len);
|
||||||
speex_decode_int(context->decoder_state, &context->decoder_bits, buf);
|
speex_decode_int(context->decoder_state, &context->decoder_bits, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -262,80 +261,79 @@ static switch_status switch_speex_destroy(switch_codec *codec)
|
||||||
}
|
}
|
||||||
|
|
||||||
codec->private = NULL;
|
codec->private = NULL;
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Registration */
|
/* Registration */
|
||||||
static const switch_codec_implementation speex_32k_implementation = {
|
static const switch_codec_implementation speex_32k_implementation = {
|
||||||
/*.samples_per_second */ 32000,
|
/*.samples_per_second*/ 32000,
|
||||||
/*.bits_per_second */ 512000,
|
/*.bits_per_second*/ 512000,
|
||||||
/*.nanoseconds_per_frame */ 20000,
|
/*.nanoseconds_per_frame*/ 20000,
|
||||||
/*.samples_per_frame */ 640,
|
/*.samples_per_frame*/ 640,
|
||||||
/*.bytes_per_frame */ 1280,
|
/*.bytes_per_frame*/ 1280,
|
||||||
/*.encoded_bytes_per_frame */ 1280,
|
/*.encoded_bytes_per_frame*/ 1280,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_speex_init,
|
/*.init*/ switch_speex_init,
|
||||||
/*.encode */ switch_speex_encode,
|
/*.encode*/ switch_speex_encode,
|
||||||
/*.decode */ switch_speex_decode,
|
/*.decode*/ switch_speex_decode,
|
||||||
/*.destroy */ switch_speex_destroy
|
/*.destroy*/ switch_speex_destroy
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_codec_implementation speex_16k_implementation = {
|
static const switch_codec_implementation speex_16k_implementation = {
|
||||||
/*.samples_per_second */ 16000,
|
/*.samples_per_second*/ 16000,
|
||||||
/*.bits_per_second */ 256000,
|
/*.bits_per_second*/ 256000,
|
||||||
/*.nanoseconds_per_frame */ 20000,
|
/*.nanoseconds_per_frame*/ 20000,
|
||||||
/*.samples_per_frame */ 320,
|
/*.samples_per_frame*/ 320,
|
||||||
/*.bytes_per_frame */ 640,
|
/*.bytes_per_frame*/ 640,
|
||||||
/*.encoded_bytes_per_frame */ 640,
|
/*.encoded_bytes_per_frame*/ 640,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_speex_init,
|
/*.init*/ switch_speex_init,
|
||||||
/*.encode */ switch_speex_encode,
|
/*.encode*/ switch_speex_encode,
|
||||||
/*.decode */ switch_speex_decode,
|
/*.decode*/ switch_speex_decode,
|
||||||
/*.destroy */ switch_speex_destroy,
|
/*.destroy*/ switch_speex_destroy,
|
||||||
/*.next */ &speex_32k_implementation
|
/*.next*/ &speex_32k_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_codec_implementation speex_8k_implementation = {
|
static const switch_codec_implementation speex_8k_implementation = {
|
||||||
/*.samples_per_second */ 8000,
|
/*.samples_per_second*/ 8000,
|
||||||
/*.bits_per_second */ 128000,
|
/*.bits_per_second*/ 128000,
|
||||||
/*.nanoseconds_per_frame */ 20000,
|
/*.nanoseconds_per_frame*/ 20000,
|
||||||
/*.samples_per_frame */ 160,
|
/*.samples_per_frame*/ 160,
|
||||||
/*.bytes_per_frame */ 320,
|
/*.bytes_per_frame*/ 320,
|
||||||
/*.encoded_bytes_per_frame */ 320,
|
/*.encoded_bytes_per_frame*/ 320,
|
||||||
/*.number_of_channels */ 1,
|
/*.number_of_channels*/ 1,
|
||||||
/*.pref_frames_per_packet */ 1,
|
/*.pref_frames_per_packet*/ 1,
|
||||||
/*.max_frames_per_packet */ 1,
|
/*.max_frames_per_packet*/ 1,
|
||||||
/*.init */ switch_speex_init,
|
/*.init*/ switch_speex_init,
|
||||||
/*.encode */ switch_speex_encode,
|
/*.encode*/ switch_speex_encode,
|
||||||
/*.decode */ switch_speex_decode,
|
/*.decode*/ switch_speex_decode,
|
||||||
/*.destroy */ switch_speex_destroy,
|
/*.destroy*/ switch_speex_destroy,
|
||||||
/*.next */ &speex_16k_implementation
|
/*.next*/ &speex_16k_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_codec_interface speex_codec_interface = {
|
static const switch_codec_interface speex_codec_interface = {
|
||||||
/*.interface_name */ "speex",
|
/*.interface_name*/ "speex",
|
||||||
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
|
/*.codec_type*/ SWITCH_CODEC_TYPE_AUDIO,
|
||||||
/*.ianacode */ 98,
|
/*.ianacode*/ 98,
|
||||||
/*.iananame */ "speex",
|
/*.iananame*/ "speex",
|
||||||
/*.implementations */ &speex_8k_implementation
|
/*.implementations*/ &speex_8k_implementation
|
||||||
};
|
};
|
||||||
|
|
||||||
static switch_loadable_module_interface speex_module_interface = {
|
static switch_loadable_module_interface speex_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ &speex_codec_interface,
|
/*.codec_interface*/ &speex_codec_interface,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &speex_module_interface;
|
*interface = &speex_module_interface;
|
||||||
|
|
||||||
|
|
|
@ -52,8 +52,7 @@ switch_caller_extension *demo_dialplan_hunt(switch_core_session *session)
|
||||||
caller_profile = switch_channel_get_caller_profile(channel);
|
caller_profile = switch_channel_get_caller_profile(channel);
|
||||||
//switch_channel_set_variable(channel, "pleasework", "yay");
|
//switch_channel_set_variable(channel, "pleasework", "yay");
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Hello %s You Dialed %s!\n", caller_profile->caller_id_name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Hello %s You Dialed %s!\n", caller_profile->caller_id_name, caller_profile->destination_number);
|
||||||
caller_profile->destination_number);
|
|
||||||
|
|
||||||
if (!switch_config_open_file(&cfg, cf)) {
|
if (!switch_config_open_file(&cfg, cf)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
||||||
|
@ -77,17 +76,14 @@ switch_caller_extension *demo_dialplan_hunt(switch_core_session *session)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!extension) {
|
if (!extension) {
|
||||||
if (!
|
if (!(extension = switch_caller_extension_new(session, caller_profile->destination_number, caller_profile->destination_number))) {
|
||||||
(extension =
|
|
||||||
switch_caller_extension_new(session, caller_profile->destination_number,
|
|
||||||
caller_profile->destination_number))) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "memory error!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "memory error!\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_caller_extension_add_application(session, extension, app, data);
|
switch_caller_extension_add_application(session, extension, app, data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,9 +100,9 @@ switch_caller_extension *demo_dialplan_hunt(switch_core_session *session)
|
||||||
|
|
||||||
|
|
||||||
static const switch_dialplan_interface demo_dialplan_interface = {
|
static const switch_dialplan_interface demo_dialplan_interface = {
|
||||||
/*.interface_name = */ "demo",
|
/*.interface_name =*/ "demo",
|
||||||
/*.hunt_function = */ demo_dialplan_hunt
|
/*.hunt_function = */ demo_dialplan_hunt
|
||||||
/*.next = NULL */
|
/*.next = NULL */
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface demo_dialplan_module_interface = {
|
static const switch_loadable_module_interface demo_dialplan_module_interface = {
|
||||||
|
@ -115,11 +111,10 @@ static const switch_loadable_module_interface demo_dialplan_module_interface = {
|
||||||
/*.timer_interface = */ NULL,
|
/*.timer_interface = */ NULL,
|
||||||
/*.dialplan_interface = */ &demo_dialplan_interface,
|
/*.dialplan_interface = */ &demo_dialplan_interface,
|
||||||
/*.codec_interface = */ NULL,
|
/*.codec_interface = */ NULL,
|
||||||
/*.application_interface = */ NULL
|
/*.application_interface =*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &demo_dialplan_module_interface;
|
*interface = &demo_dialplan_module_interface;
|
||||||
|
|
|
@ -60,8 +60,7 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
caller_profile = switch_channel_get_caller_profile(channel);
|
caller_profile = switch_channel_get_caller_profile(channel);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Processing %s->%s!\n", caller_profile->caller_id_name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Processing %s->%s!\n", caller_profile->caller_id_name, caller_profile->destination_number);
|
||||||
caller_profile->destination_number);
|
|
||||||
|
|
||||||
if (!switch_config_open_file(&cfg, cf)) {
|
if (!switch_config_open_file(&cfg, cf)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
||||||
|
@ -70,23 +69,24 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
}
|
}
|
||||||
|
|
||||||
while (switch_config_next_pair(&cfg, &var, &val)) {
|
while (switch_config_next_pair(&cfg, &var, &val)) {
|
||||||
if (cfg.catno != catno) { /* new category */
|
if (cfg.catno != catno) { /* new category */
|
||||||
catno = cfg.catno;
|
catno = cfg.catno;
|
||||||
exten_name = cfg.category;
|
exten_name = cfg.category;
|
||||||
cleanre();
|
cleanre();
|
||||||
match_count = 0;
|
match_count = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcasecmp(var, "regex")) {
|
if (!strcasecmp(var, "regex")) {
|
||||||
const char *error = NULL;
|
const char *error = NULL;
|
||||||
int erroffset = 0;
|
int erroffset = 0;
|
||||||
|
|
||||||
cleanre();
|
cleanre();
|
||||||
re = pcre_compile(val, /* the pattern */
|
re = pcre_compile(
|
||||||
0, /* default options */
|
val, /* the pattern */
|
||||||
&error, /* for error message */
|
0, /* default options */
|
||||||
&erroffset, /* for error offset */
|
&error, /* for error message */
|
||||||
NULL); /* use default character tables */
|
&erroffset, /* for error offset */
|
||||||
|
NULL); /* use default character tables */
|
||||||
if (error) {
|
if (error) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "COMPILE ERROR: %d [%s]\n", erroffset, error);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "COMPILE ERROR: %d [%s]\n", erroffset, error);
|
||||||
cleanre();
|
cleanre();
|
||||||
|
@ -94,31 +94,31 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
match_count = pcre_exec(re, /* result of pcre_compile() */
|
match_count = pcre_exec(
|
||||||
NULL, /* we didn't study the pattern */
|
re, /* result of pcre_compile() */
|
||||||
caller_profile->destination_number, /* the subject string */
|
NULL, /* we didn't study the pattern */
|
||||||
strlen(caller_profile->destination_number), /* the length of the subject string */
|
caller_profile->destination_number, /* the subject string */
|
||||||
0, /* start at offset 0 in the subject */
|
strlen(caller_profile->destination_number), /* the length of the subject string */
|
||||||
0, /* default options */
|
0, /* start at offset 0 in the subject */
|
||||||
ovector, /* vector of integers for substring information */
|
0, /* default options */
|
||||||
sizeof(ovector) / sizeof(ovector[0])); /* number of elements (NOT size in bytes) */
|
ovector, /* vector of integers for substring information */
|
||||||
|
sizeof(ovector) / sizeof(ovector[0])); /* number of elements (NOT size in bytes) */
|
||||||
} else if (match_count > 0 && !strcasecmp(var, "match")) {
|
} else if (match_count > 0 && !strcasecmp(var, "match")) {
|
||||||
if (!re) {
|
if (!re) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "ERROR: match without regex in %s line %d\n", cfg.path,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "ERROR: match without regex in %s line %d\n", cfg.path, cfg.lineno);
|
||||||
cfg.lineno);
|
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
char newval[1024] = "";
|
char newval[1024] = "";
|
||||||
char index[10] = "";
|
char index[10] = "";
|
||||||
char replace[128] = "";
|
char replace[128] = "";
|
||||||
int x, y = 0, z = 0, num = 0;
|
int x, y=0, z=0, num = 0;
|
||||||
char *data;
|
char *data;
|
||||||
|
|
||||||
for (x = 0; x < sizeof(newval) && x < strlen(val);) {
|
for (x = 0; x < sizeof(newval) && x < strlen(val);) {
|
||||||
if (val[x] == '$') {
|
if (val[x] == '$') {
|
||||||
x++;
|
x++;
|
||||||
|
|
||||||
while (val[x] > 47 && val[x] < 58) {
|
while(val[x] > 47 && val[x] < 58) {
|
||||||
index[z++] = val[x];
|
index[z++] = val[x];
|
||||||
x++;
|
x++;
|
||||||
}
|
}
|
||||||
|
@ -126,11 +126,9 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
z = 0;
|
z = 0;
|
||||||
num = atoi(index);
|
num = atoi(index);
|
||||||
|
|
||||||
if (pcre_copy_substring
|
if (pcre_copy_substring(caller_profile->destination_number, ovector, match_count, num, replace, sizeof(replace)) > 0) {
|
||||||
(caller_profile->destination_number, ovector, match_count, num, replace,
|
|
||||||
sizeof(replace)) > 0) {
|
|
||||||
int r;
|
int r;
|
||||||
for (r = 0; r < strlen(replace); r++) {
|
for(r = 0; r < strlen(replace); r++) {
|
||||||
newval[y++] = replace[r];
|
newval[y++] = replace[r];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -152,11 +150,9 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (!extension) {
|
if (!extension) {
|
||||||
if (!
|
if (!(extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number))) {
|
||||||
(extension =
|
|
||||||
switch_caller_extension_new(session, exten_name, caller_profile->destination_number))) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "memory error!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "memory error!\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -166,7 +162,7 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_config_close_file(&cfg);
|
switch_config_close_file(&cfg);
|
||||||
|
|
||||||
if (extension) {
|
if (extension) {
|
||||||
|
@ -181,9 +177,9 @@ switch_caller_extension *dialplan_hunt(switch_core_session *session)
|
||||||
|
|
||||||
|
|
||||||
static const switch_dialplan_interface dialplan_interface = {
|
static const switch_dialplan_interface dialplan_interface = {
|
||||||
/*.interface_name = */ "pcre",
|
/*.interface_name =*/ "pcre",
|
||||||
/*.hunt_function = */ dialplan_hunt
|
/*.hunt_function = */ dialplan_hunt
|
||||||
/*.next = NULL */
|
/*.next = NULL */
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface dialplan_module_interface = {
|
static const switch_loadable_module_interface dialplan_module_interface = {
|
||||||
|
@ -192,11 +188,10 @@ static const switch_loadable_module_interface dialplan_module_interface = {
|
||||||
/*.timer_interface = */ NULL,
|
/*.timer_interface = */ NULL,
|
||||||
/*.dialplan_interface = */ &dialplan_interface,
|
/*.dialplan_interface = */ &dialplan_interface,
|
||||||
/*.codec_interface = */ NULL,
|
/*.codec_interface = */ NULL,
|
||||||
/*.application_interface = */ NULL
|
/*.application_interface =*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &dialplan_module_interface;
|
*interface = &dialplan_module_interface;
|
||||||
|
|
|
@ -61,7 +61,7 @@ typedef enum {
|
||||||
TFLAG_DTMF = (1 << 3),
|
TFLAG_DTMF = (1 << 3),
|
||||||
TFLAG_READING = (1 << 4),
|
TFLAG_READING = (1 << 4),
|
||||||
TFLAG_WRITING = (1 << 5),
|
TFLAG_WRITING = (1 << 5),
|
||||||
TFLAG_USING_CODEC = (1 << 6),
|
TFLAG_USING_CODEC = (1 << 6),
|
||||||
TFLAG_RTP = (1 << 7),
|
TFLAG_RTP = (1 << 7),
|
||||||
TFLAG_BYE = (1 << 8)
|
TFLAG_BYE = (1 << 8)
|
||||||
} TFLAGS;
|
} TFLAGS;
|
||||||
|
@ -87,7 +87,7 @@ static struct {
|
||||||
} globals;
|
} globals;
|
||||||
|
|
||||||
struct private_object {
|
struct private_object {
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
switch_frame read_frame;
|
switch_frame read_frame;
|
||||||
switch_codec read_codec;
|
switch_codec read_codec;
|
||||||
|
@ -144,14 +144,11 @@ static switch_status exosip_on_init(switch_core_session *session);
|
||||||
static switch_status exosip_on_hangup(switch_core_session *session);
|
static switch_status exosip_on_hangup(switch_core_session *session);
|
||||||
static switch_status exosip_on_loopback(switch_core_session *session);
|
static switch_status exosip_on_loopback(switch_core_session *session);
|
||||||
static switch_status exosip_on_transmit(switch_core_session *session);
|
static switch_status exosip_on_transmit(switch_core_session *session);
|
||||||
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static int config_exosip(int reload);
|
static int config_exosip(int reload);
|
||||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload);
|
static switch_status parse_sdp_media(sdp_media_t *media, char **dname, char **drate, char **dpayload);
|
||||||
static switch_status exosip_kill_channel(switch_core_session *session, int sig);
|
static switch_status exosip_kill_channel(switch_core_session *session, int sig);
|
||||||
static void activate_rtp(struct private_object *tech_pvt);
|
static void activate_rtp(struct private_object *tech_pvt);
|
||||||
static void deactivate_rtp(struct private_object *tech_pvt);
|
static void deactivate_rtp(struct private_object *tech_pvt);
|
||||||
|
@ -193,16 +190,16 @@ static int sdp_add_codec(struct osip_rfc3264 *cnf, int codec_type, int payload,
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (codec_type) {
|
switch (codec_type) {
|
||||||
case SWITCH_CODEC_TYPE_AUDIO:
|
case SWITCH_CODEC_TYPE_AUDIO:
|
||||||
med->m_media = osip_strdup("audio");
|
med->m_media = osip_strdup("audio");
|
||||||
osip_rfc3264_add_audio_media(cnf, med, -1);
|
osip_rfc3264_add_audio_media(cnf, med, -1);
|
||||||
break;
|
break;
|
||||||
case SWITCH_CODEC_TYPE_VIDEO:
|
case SWITCH_CODEC_TYPE_VIDEO:
|
||||||
med->m_media = osip_strdup("video");
|
med->m_media = osip_strdup("video");
|
||||||
osip_rfc3264_add_video_media(cnf, med, -1);
|
osip_rfc3264_add_video_media(cnf, med, -1);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -235,7 +232,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
char *dest_uri;
|
char *dest_uri;
|
||||||
switch_codec_interface *codecs[SWITCH_MAX_CODECS];
|
switch_codec_interface *codecs[SWITCH_MAX_CODECS];
|
||||||
int num_codecs = 0;
|
int num_codecs = 0;
|
||||||
/* do SIP Goodies... */
|
/* do SIP Goodies...*/
|
||||||
|
|
||||||
/* Generate callerid URI */
|
/* Generate callerid URI */
|
||||||
eXosip_guess_localip(AF_INET, localip, 128);
|
eXosip_guess_localip(AF_INET, localip, 128);
|
||||||
|
@ -248,17 +245,14 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
/* Initialize SDP */
|
/* Initialize SDP */
|
||||||
sdp_message_init(&tech_pvt->local_sdp);
|
sdp_message_init(&tech_pvt->local_sdp);
|
||||||
sdp_message_v_version_set(tech_pvt->local_sdp, "0");
|
sdp_message_v_version_set(tech_pvt->local_sdp, "0");
|
||||||
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4",
|
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4", tech_pvt->local_sdp_audio_ip);
|
||||||
tech_pvt->local_sdp_audio_ip);
|
|
||||||
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
||||||
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
||||||
sdp_message_t_time_descr_add(tech_pvt->local_sdp, "0", "0");
|
sdp_message_t_time_descr_add(tech_pvt->local_sdp, "0", "0");
|
||||||
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
||||||
sdp_message_m_media_add(tech_pvt->local_sdp, "audio", port, NULL, "RTP/AVP");
|
sdp_message_m_media_add(tech_pvt->local_sdp, "audio", port, NULL, "RTP/AVP");
|
||||||
/* Add in every codec we support on this outbound call */
|
/* Add in every codec we support on this outbound call */
|
||||||
if ((num_codecs =
|
if ((num_codecs = switch_loadable_module_get_codecs(switch_core_session_get_pool(session), codecs, sizeof(codecs)/sizeof(codecs[0]))) > 0) {
|
||||||
switch_loadable_module_get_codecs(switch_core_session_get_pool(session), codecs,
|
|
||||||
sizeof(codecs) / sizeof(codecs[0]))) > 0) {
|
|
||||||
int i;
|
int i;
|
||||||
static const switch_codec_implementation *imp;
|
static const switch_codec_implementation *imp;
|
||||||
for (i = 0; i < num_codecs; i++) {
|
for (i = 0; i < num_codecs; i++) {
|
||||||
|
@ -266,14 +260,12 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "%i", codecs[i]->ianacode);
|
snprintf(tmp, sizeof(tmp), "%i", codecs[i]->ianacode);
|
||||||
sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp));
|
sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp));
|
||||||
for (imp = codecs[i]->implementations; imp; imp = imp->next) {
|
for (imp = codecs[i]->implementations ; imp ; imp = imp->next) {
|
||||||
/* Add to SDP config */
|
/* Add to SDP config */
|
||||||
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame,
|
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second, x++);
|
||||||
imp->samples_per_second, x++);
|
|
||||||
/* Add to SDP message */
|
/* Add to SDP message */
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "%i %s/%i", codecs[i]->ianacode, codecs[i]->iananame,
|
snprintf(tmp, sizeof(tmp), "%i %s/%i", codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second);
|
||||||
imp->samples_per_second);
|
|
||||||
sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp));
|
sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp));
|
||||||
memset(tmp, 0, sizeof(tmp));
|
memset(tmp, 0, sizeof(tmp));
|
||||||
}
|
}
|
||||||
|
@ -281,9 +273,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
}
|
}
|
||||||
/* Setup our INVITE */
|
/* Setup our INVITE */
|
||||||
eXosip_lock();
|
eXosip_lock();
|
||||||
if (!
|
if (!(dest_uri = (char *) switch_core_session_alloc(session, strlen(tech_pvt->caller_profile->destination_number) + 10))) {
|
||||||
(dest_uri =
|
|
||||||
(char *) switch_core_session_alloc(session, strlen(tech_pvt->caller_profile->destination_number) + 10))) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "AIEEEE!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "AIEEEE!\n");
|
||||||
assert(dest_uri != NULL);
|
assert(dest_uri != NULL);
|
||||||
}
|
}
|
||||||
|
@ -302,7 +292,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
tech_pvt->did = -1;
|
tech_pvt->did = -1;
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Let Media Work */
|
/* Let Media Work */
|
||||||
switch_set_flag(tech_pvt, TFLAG_IO);
|
switch_set_flag(tech_pvt, TFLAG_IO);
|
||||||
|
@ -341,7 +331,7 @@ static switch_status exosip_on_hangup(switch_core_session *session)
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
|
|
||||||
switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
|
switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
|
||||||
|
|
||||||
|
|
||||||
switch_set_flag(tech_pvt, TFLAG_BYE);
|
switch_set_flag(tech_pvt, TFLAG_BYE);
|
||||||
|
@ -356,8 +346,7 @@ static switch_status exosip_on_hangup(switch_core_session *session)
|
||||||
switch_core_codec_destroy(&tech_pvt->write_codec);
|
switch_core_codec_destroy(&tech_pvt->write_codec);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "EXOSIP HANGUP %s %d/%d=%d\n", switch_channel_get_name(channel),
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "EXOSIP HANGUP %s %d/%d=%d\n", switch_channel_get_name(channel), tech_pvt->cid, tech_pvt->did, i);
|
||||||
tech_pvt->cid, tech_pvt->did, i);
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -373,16 +362,14 @@ static switch_status exosip_on_transmit(switch_core_session *session)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel;
|
switch_channel *channel;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
switch_core_session_set_private(*new_session, tech_pvt);
|
switch_core_session_set_private(*new_session, tech_pvt);
|
||||||
|
@ -425,7 +412,7 @@ static void deactivate_rtp(struct private_object *tech_pvt)
|
||||||
if (tech_pvt->rtp_session) {
|
if (tech_pvt->rtp_session) {
|
||||||
switch_mutex_lock(tech_pvt->rtp_lock);
|
switch_mutex_lock(tech_pvt->rtp_lock);
|
||||||
|
|
||||||
while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
|
while(loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
|
||||||
switch_yield(10000);
|
switch_yield(10000);
|
||||||
loops++;
|
loops++;
|
||||||
}
|
}
|
||||||
|
@ -467,20 +454,25 @@ static void activate_rtp(struct private_object *tech_pvt)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activating RTP %s:%d->%s:%d codec: %d ms: %d\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activating RTP %s:%d->%s:%d codec: %d ms: %d\n",
|
||||||
tech_pvt->local_sdp_audio_ip,
|
tech_pvt->local_sdp_audio_ip,
|
||||||
tech_pvt->local_sdp_audio_port,
|
tech_pvt->local_sdp_audio_port,
|
||||||
tech_pvt->remote_sdp_audio_ip,
|
tech_pvt->remote_sdp_audio_ip,
|
||||||
tech_pvt->remote_sdp_audio_port, tech_pvt->read_codec.codec_interface->ianacode, ms);
|
tech_pvt->remote_sdp_audio_port,
|
||||||
|
tech_pvt->read_codec.codec_interface->ianacode,
|
||||||
|
ms
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
tech_pvt->rtp_session = jrtp4c_new(tech_pvt->local_sdp_audio_ip,
|
tech_pvt->rtp_session = jrtp4c_new(
|
||||||
tech_pvt->local_sdp_audio_port,
|
tech_pvt->local_sdp_audio_ip,
|
||||||
tech_pvt->remote_sdp_audio_ip,
|
tech_pvt->local_sdp_audio_port,
|
||||||
tech_pvt->remote_sdp_audio_port,
|
tech_pvt->remote_sdp_audio_ip,
|
||||||
tech_pvt->read_codec.codec_interface->ianacode,
|
tech_pvt->remote_sdp_audio_port,
|
||||||
tech_pvt->read_codec.implementation->samples_per_second, &err);
|
tech_pvt->read_codec.codec_interface->ianacode,
|
||||||
|
tech_pvt->read_codec.implementation->samples_per_second,
|
||||||
|
&err);
|
||||||
|
|
||||||
if (tech_pvt->rtp_session) {
|
if (tech_pvt->rtp_session) {
|
||||||
tech_pvt->ssrc = jrtp4c_get_ssrc(tech_pvt->rtp_session);
|
tech_pvt->ssrc = jrtp4c_get_ssrc(tech_pvt->rtp_session);
|
||||||
|
@ -519,21 +511,20 @@ static switch_status exosip_answer_channel(switch_core_session *session)
|
||||||
sdp_message_to_str(tech_pvt->local_sdp, &buf);
|
sdp_message_to_str(tech_pvt->local_sdp, &buf);
|
||||||
osip_message_set_body(answer, buf, strlen(buf));
|
osip_message_set_body(answer, buf, strlen(buf));
|
||||||
osip_message_set_content_type(answer, "application/sdp");
|
osip_message_set_content_type(answer, "application/sdp");
|
||||||
free(buf);
|
free(buf);
|
||||||
eXosip_call_send_answer(tech_pvt->tid, 200, answer);
|
eXosip_call_send_answer(tech_pvt->tid, 200, answer);
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
size_t bytes = 0, samples = 0, frames = 0, ms = 0;
|
size_t bytes = 0, samples = 0, frames=0, ms=0;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
|
@ -562,18 +553,18 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
assert(tech_pvt->rtp_session != NULL);
|
assert(tech_pvt->rtp_session != NULL);
|
||||||
tech_pvt->read_frame.datalen = 0;
|
tech_pvt->read_frame.datalen = 0;
|
||||||
|
|
||||||
while (!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO)
|
while(!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->read_frame.datalen == 0) {
|
||||||
&& tech_pvt->read_frame.datalen == 0) {
|
tech_pvt->read_frame.datalen = jrtp4c_read(tech_pvt->rtp_session,
|
||||||
tech_pvt->read_frame.datalen =
|
tech_pvt->read_frame.data,
|
||||||
jrtp4c_read(tech_pvt->rtp_session, tech_pvt->read_frame.data, sizeof(tech_pvt->read_buf));
|
sizeof(tech_pvt->read_buf));
|
||||||
|
|
||||||
if (tech_pvt->read_frame.datalen > 0) {
|
if (tech_pvt->read_frame.datalen > 0) {
|
||||||
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
||||||
frames = (tech_pvt->read_frame.datalen / bytes);
|
frames = (tech_pvt->read_frame.datalen / bytes);
|
||||||
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
|
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
|
||||||
ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame;
|
ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame;
|
||||||
tech_pvt->timestamp_recv += (int32_t) samples;
|
tech_pvt->timestamp_recv += (int32_t)samples;
|
||||||
tech_pvt->read_frame.samples = (int) samples;
|
tech_pvt->read_frame.samples = (int)samples;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -607,13 +598,12 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
switch_status status = SWITCH_STATUS_SUCCESS;
|
switch_status status = SWITCH_STATUS_SUCCESS;
|
||||||
int bytes = 0, samples = 0, ms = 0, frames = 0;
|
int bytes=0, samples=0, ms=0, frames=0;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
@ -639,7 +629,7 @@ static switch_status exosip_write_frame(switch_core_session *session, switch_fra
|
||||||
|
|
||||||
if (switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) {
|
if (switch_test_flag(tech_pvt, TFLAG_USING_CODEC)) {
|
||||||
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
||||||
frames = ((int) frame->datalen / bytes);
|
frames = ((int)frame->datalen / bytes);
|
||||||
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
|
samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
|
||||||
ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame / 1000;
|
ms = frames * tech_pvt->read_codec.implementation->microseconds_per_frame / 1000;
|
||||||
} else {
|
} else {
|
||||||
|
@ -650,8 +640,8 @@ static switch_status exosip_write_frame(switch_core_session *session, switch_fra
|
||||||
//printf("%s %s->%s send %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, ms, tech_pvt->timestamp_send);
|
//printf("%s %s->%s send %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, ms, tech_pvt->timestamp_send);
|
||||||
|
|
||||||
|
|
||||||
jrtp4c_write(tech_pvt->rtp_session, frame->data, (int) frame->datalen, samples);
|
jrtp4c_write(tech_pvt->rtp_session, frame->data, (int)frame->datalen, samples);
|
||||||
tech_pvt->timestamp_send += (int) samples;
|
tech_pvt->timestamp_send += (int)samples;
|
||||||
|
|
||||||
switch_clear_flag(tech_pvt, TFLAG_WRITING);
|
switch_clear_flag(tech_pvt, TFLAG_WRITING);
|
||||||
//switch_mutex_unlock(tech_pvt->rtp_lock);
|
//switch_mutex_unlock(tech_pvt->rtp_lock);
|
||||||
|
@ -710,39 +700,39 @@ static switch_status exosip_waitfor_write(switch_core_session *session, int ms,
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_io_routines exosip_io_routines = {
|
static const switch_io_routines exosip_io_routines = {
|
||||||
/*.outgoing_channel */ exosip_outgoing_channel,
|
/*.outgoing_channel*/ exosip_outgoing_channel,
|
||||||
/*.answer_channel */ exosip_answer_channel,
|
/*.answer_channel*/ exosip_answer_channel,
|
||||||
/*.read_frame */ exosip_read_frame,
|
/*.read_frame*/ exosip_read_frame,
|
||||||
/*.write_frame */ exosip_write_frame,
|
/*.write_frame*/ exosip_write_frame,
|
||||||
/*.kill_channel */ exosip_kill_channel,
|
/*.kill_channel*/ exosip_kill_channel,
|
||||||
/*.waitfor_read */ exosip_waitfor_read,
|
/*.waitfor_read*/ exosip_waitfor_read,
|
||||||
/*.waitfor_read */ exosip_waitfor_write
|
/*.waitfor_read*/ exosip_waitfor_write
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_event_handler_table exosip_event_handlers = {
|
static const switch_event_handler_table exosip_event_handlers = {
|
||||||
/*.on_init */ exosip_on_init,
|
/*.on_init*/ exosip_on_init,
|
||||||
/*.on_ring */ exosip_on_ring,
|
/*.on_ring*/ exosip_on_ring,
|
||||||
/*.on_execute */ exosip_on_execute,
|
/*.on_execute*/ exosip_on_execute,
|
||||||
/*.on_hangup */ exosip_on_hangup,
|
/*.on_hangup*/ exosip_on_hangup,
|
||||||
/*.on_loopback */ exosip_on_loopback,
|
/*.on_loopback*/ exosip_on_loopback,
|
||||||
/*.on_transmit */ exosip_on_transmit
|
/*.on_transmit*/ exosip_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface exosip_endpoint_interface = {
|
static const switch_endpoint_interface exosip_endpoint_interface = {
|
||||||
/*.interface_name */ "exosip",
|
/*.interface_name*/ "exosip",
|
||||||
/*.io_routines */ &exosip_io_routines,
|
/*.io_routines*/ &exosip_io_routines,
|
||||||
/*.event_handlers */ &exosip_event_handlers,
|
/*.event_handlers*/ &exosip_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface exosip_module_interface = {
|
static const switch_loadable_module_interface exosip_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &exosip_endpoint_interface,
|
/*.endpoint_interface*/ &exosip_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#if 1
|
#if 1
|
||||||
|
@ -750,15 +740,14 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
{
|
{
|
||||||
if (globals.running) {
|
if (globals.running) {
|
||||||
globals.running = -1;
|
globals.running = -1;
|
||||||
while (globals.running) {
|
while(globals.running) {
|
||||||
switch_yield(100000);
|
switch_yield(100000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
@ -773,7 +762,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status exosip_create_call(eXosip_event_t * event)
|
static switch_status exosip_create_call(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
sdp_message_t *remote_sdp = NULL;
|
sdp_message_t *remote_sdp = NULL;
|
||||||
|
@ -805,12 +794,14 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
globals.dialplan,
|
globals.dialplan,
|
||||||
event->request->from->displayname,
|
event->request->from->displayname,
|
||||||
event->request->from->url->username,
|
event->request->from->url->username,
|
||||||
event->request->from->url->host,
|
event->request->from->url->host,
|
||||||
NULL, NULL, event->request->req_uri->username))) {
|
NULL,
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
NULL,
|
||||||
|
event->request->req_uri->username))) {
|
||||||
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_set_flag(tech_pvt, TFLAG_INBOUND);
|
switch_set_flag(tech_pvt, TFLAG_INBOUND);
|
||||||
|
@ -833,17 +824,14 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
osip_rfc3264_init(&tech_pvt->sdp_config);
|
osip_rfc3264_init(&tech_pvt->sdp_config);
|
||||||
/* Add in what codecs we support locally */
|
/* Add in what codecs we support locally */
|
||||||
|
|
||||||
if ((num_codecs =
|
if ((num_codecs = switch_loadable_module_get_codecs(switch_core_session_get_pool(session), codecs, sizeof(codecs)/sizeof(codecs[0]))) > 0) {
|
||||||
switch_loadable_module_get_codecs(switch_core_session_get_pool(session), codecs,
|
|
||||||
sizeof(codecs) / sizeof(codecs[0]))) > 0) {
|
|
||||||
int i;
|
int i;
|
||||||
static const switch_codec_implementation *imp;
|
static const switch_codec_implementation *imp;
|
||||||
|
|
||||||
for (i = 0; i < num_codecs; i++) {
|
for (i = 0; i < num_codecs; i++) {
|
||||||
int x = 0;
|
int x = 0;
|
||||||
for (imp = codecs[i]->implementations; imp; imp = imp->next) {
|
for (imp = codecs[i]->implementations ; imp ; imp = imp->next) {
|
||||||
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame,
|
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second, x++);
|
||||||
imp->samples_per_second, x++);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -852,18 +840,17 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
sdp_message_parse(tech_pvt->local_sdp, local_sdp_str);
|
sdp_message_parse(tech_pvt->local_sdp, local_sdp_str);
|
||||||
|
|
||||||
sdp_message_to_str(remote_sdp, &remote_sdp_str);
|
sdp_message_to_str(remote_sdp, &remote_sdp_str);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str, remote_sdp_str);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str,remote_sdp_str);
|
||||||
|
|
||||||
mline = 0;
|
mline = 0;
|
||||||
while (0 == osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {
|
while (0==osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {
|
||||||
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) {
|
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) {
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got no compatible codecs!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got no compatible codecs!\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
for (pos = 0; audio_tab[pos] != NULL; pos++) {
|
for (pos=0; audio_tab[pos]!=NULL; pos++) {
|
||||||
osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos],
|
osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos], mline);
|
||||||
mline);
|
|
||||||
if (parse_sdp_media(audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
|
if (parse_sdp_media(audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
|
||||||
tech_pvt->payload_num = atoi(dpayload);
|
tech_pvt->payload_num = atoi(dpayload);
|
||||||
break;
|
break;
|
||||||
|
@ -872,8 +859,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
mline++;
|
mline++;
|
||||||
}
|
}
|
||||||
free(remote_sdp_str);
|
free(remote_sdp_str);
|
||||||
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4",
|
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4", tech_pvt->local_sdp_audio_ip);
|
||||||
tech_pvt->local_sdp_audio_ip);
|
|
||||||
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
||||||
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
||||||
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
||||||
|
@ -886,7 +872,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
tech_pvt->remote_sdp_audio_port = atoi(remote_med->m_port);
|
tech_pvt->remote_sdp_audio_port = atoi(remote_med->m_port);
|
||||||
|
|
||||||
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", event->cid);
|
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", event->cid);
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
|
|
||||||
if (!dname) {
|
if (!dname) {
|
||||||
exosip_on_hangup(session);
|
exosip_on_hangup(session);
|
||||||
|
@ -901,33 +887,34 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
int rate = atoi(drate);
|
int rate = atoi(drate);
|
||||||
|
|
||||||
if (switch_core_codec_init(&tech_pvt->read_codec,
|
if (switch_core_codec_init(&tech_pvt->read_codec,
|
||||||
dname,
|
dname,
|
||||||
rate,
|
rate,
|
||||||
globals.codec_ms,
|
globals.codec_ms,
|
||||||
1,
|
1,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
NULL,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_channel_hangup(channel);
|
|
||||||
return SWITCH_STATUS_FALSE;
|
|
||||||
} else {
|
|
||||||
if (switch_core_codec_init(&tech_pvt->write_codec,
|
|
||||||
dname,
|
|
||||||
rate,
|
|
||||||
globals.codec_ms,
|
|
||||||
1,
|
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
|
||||||
NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
} else {
|
||||||
|
if (switch_core_codec_init(&tech_pvt->write_codec,
|
||||||
|
dname,
|
||||||
|
rate,
|
||||||
|
globals.codec_ms,
|
||||||
|
1,
|
||||||
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
|
NULL,
|
||||||
|
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
|
switch_channel_hangup(channel);
|
||||||
|
return SWITCH_STATUS_FALSE;
|
||||||
} else {
|
} else {
|
||||||
int ms;
|
int ms;
|
||||||
tech_pvt->read_frame.rate = rate;
|
tech_pvt->read_frame.rate = rate;
|
||||||
switch_set_flag(tech_pvt, TFLAG_USING_CODEC);
|
switch_set_flag(tech_pvt, TFLAG_USING_CODEC);
|
||||||
ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000;
|
ms = tech_pvt->write_codec.implementation->microseconds_per_frame / 1000;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Inbound Codec %s/%d %d ms\n", dname, rate,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Inbound Codec %s/%d %d ms\n", dname, rate, ms);
|
||||||
ms);
|
|
||||||
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
||||||
switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
|
switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
|
||||||
switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
|
switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
|
||||||
|
@ -952,14 +939,13 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void destroy_call_by_event(eXosip_event_t * event)
|
static void destroy_call_by_event(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
|
||||||
if (!(tech_pvt = get_pvt_by_call_id(event->cid))) {
|
if (!(tech_pvt = get_pvt_by_call_id(event->cid))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Um in case you are interested, Can't find the pvt [%d]!\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Um in case you are interested, Can't find the pvt [%d]!\n", event->cid);
|
||||||
event->cid);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -972,7 +958,7 @@ static void destroy_call_by_event(eXosip_event_t * event)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload)
|
static switch_status parse_sdp_media(sdp_media_t *media, char **dname, char **drate, char **dpayload)
|
||||||
{
|
{
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
sdp_attribute_t *attr = NULL;
|
sdp_attribute_t *attr = NULL;
|
||||||
|
@ -980,7 +966,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
switch_status status = SWITCH_STATUS_GENERR;
|
switch_status status = SWITCH_STATUS_GENERR;
|
||||||
|
|
||||||
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
||||||
attr = (sdp_attribute_t *) osip_list_get(media->a_attributes, pos);
|
attr = (sdp_attribute_t *)osip_list_get(media->a_attributes, pos);
|
||||||
if (attr != NULL && strcasecmp(attr->a_att_field, "rtpmap") == 0) {
|
if (attr != NULL && strcasecmp(attr->a_att_field, "rtpmap") == 0) {
|
||||||
payload = attr->a_att_value;
|
payload = attr->a_att_value;
|
||||||
if ((name = strchr(payload, ' '))) {
|
if ((name = strchr(payload, ' '))) {
|
||||||
|
@ -1001,8 +987,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
*dname = strdup("L16");
|
*dname = strdup("L16");
|
||||||
*drate = strdup("8000");
|
*drate = strdup("8000");
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Found negotiated codec Payload: %s Name: %s Rate: %s\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Found negotiated codec Payload: %s Name: %s Rate: %s\n", *dpayload, *dname, *drate);
|
||||||
*dpayload, *dname, *drate);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
attr = NULL;
|
attr = NULL;
|
||||||
|
@ -1012,7 +997,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_answer(eXosip_event_t * event)
|
static void handle_answer(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
osip_message_t *ack = NULL;
|
osip_message_t *ack = NULL;
|
||||||
sdp_message_t *remote_sdp = NULL;
|
sdp_message_t *remote_sdp = NULL;
|
||||||
|
@ -1067,27 +1052,28 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_codec_init(&tech_pvt->read_codec,
|
if (switch_core_codec_init(&tech_pvt->read_codec,
|
||||||
dname,
|
dname,
|
||||||
rate,
|
rate,
|
||||||
globals.codec_ms,
|
globals.codec_ms,
|
||||||
1,
|
1,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
NULL,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_channel_hangup(channel);
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
if (switch_core_codec_init(&tech_pvt->write_codec,
|
|
||||||
dname,
|
|
||||||
rate,
|
|
||||||
globals.codec_ms,
|
|
||||||
1,
|
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
|
||||||
NULL,
|
|
||||||
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
|
} else {
|
||||||
|
if (switch_core_codec_init(&tech_pvt->write_codec,
|
||||||
|
dname,
|
||||||
|
rate,
|
||||||
|
globals.codec_ms,
|
||||||
|
1,
|
||||||
|
SWITCH_CODEC_FLAG_ENCODE |SWITCH_CODEC_FLAG_DECODE,
|
||||||
|
NULL,
|
||||||
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
|
switch_channel_hangup(channel);
|
||||||
|
return;
|
||||||
} else {
|
} else {
|
||||||
int ms;
|
int ms;
|
||||||
tech_pvt->read_frame.rate = rate;
|
tech_pvt->read_frame.rate = rate;
|
||||||
|
@ -1121,119 +1107,133 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void log_event(eXosip_event_t * je)
|
static void log_event(eXosip_event_t *je)
|
||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
|
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
if (je->type == EXOSIP_CALL_NOANSWER) {
|
if (je->type == EXOSIP_CALL_NOANSWER) {
|
||||||
snprintf(buf, 99, "<- (%i %i) No answer", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) No answer", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_CALL_CLOSED) {
|
} else if (je->type == EXOSIP_CALL_CLOSED) {
|
||||||
snprintf(buf, 99, "<- (%i %i) Call Closed", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) Call Closed", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_CALL_RELEASED) {
|
} else if (je->type == EXOSIP_CALL_RELEASED) {
|
||||||
snprintf(buf, 99, "<- (%i %i) Call released", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) Call released", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_MESSAGE_NEW && je->request != NULL && MSG_IS_MESSAGE(je->request)) {
|
} else if (je->type == EXOSIP_MESSAGE_NEW
|
||||||
char *tmp = NULL;
|
&& je->request!=NULL && MSG_IS_MESSAGE(je->request)) {
|
||||||
|
char *tmp = NULL;
|
||||||
|
|
||||||
if (je->request != NULL) {
|
if (je->request != NULL) {
|
||||||
osip_body_t *body;
|
osip_body_t *body;
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
|
|
||||||
osip_message_get_body(je->request, 0, &body);
|
osip_message_get_body (je->request, 0, &body);
|
||||||
if (body != NULL && body->body != NULL) {
|
if (body != NULL && body->body != NULL) {
|
||||||
snprintf(buf, 99, "<- (%i) from: %s TEXT: %s", je->tid, tmp, body->body);
|
snprintf (buf, 99, "<- (%i) from: %s TEXT: %s",
|
||||||
|
je->tid, tmp, body->body);
|
||||||
|
}
|
||||||
|
osip_free (tmp);
|
||||||
|
} else {
|
||||||
|
snprintf (buf, 99, "<- (%i) New event for unknown request?", je->tid);
|
||||||
}
|
}
|
||||||
osip_free(tmp);
|
|
||||||
} else {
|
|
||||||
snprintf(buf, 99, "<- (%i) New event for unknown request?", je->tid);
|
|
||||||
}
|
|
||||||
} else if (je->type == EXOSIP_MESSAGE_NEW) {
|
} else if (je->type == EXOSIP_MESSAGE_NEW) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) %s from: %s", je->tid, je->request->sip_method, tmp);
|
snprintf (buf, 99, "<- (%i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->tid, je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->type == EXOSIP_MESSAGE_PROCEEDING
|
} else if (je->type == EXOSIP_MESSAGE_PROCEEDING
|
||||||
|| je->type == EXOSIP_MESSAGE_ANSWERED
|
|| je->type == EXOSIP_MESSAGE_ANSWERED
|
||||||
|| je->type == EXOSIP_MESSAGE_REDIRECTED
|
|| je->type == EXOSIP_MESSAGE_REDIRECTED
|
||||||
|| je->type == EXOSIP_MESSAGE_REQUESTFAILURE
|
|| je->type == EXOSIP_MESSAGE_REQUESTFAILURE
|
||||||
|| je->type == EXOSIP_MESSAGE_SERVERFAILURE || je->type == EXOSIP_MESSAGE_GLOBALFAILURE) {
|
|| je->type == EXOSIP_MESSAGE_SERVERFAILURE
|
||||||
if (je->response != NULL && je->request != NULL) {
|
|| je->type == EXOSIP_MESSAGE_GLOBALFAILURE) {
|
||||||
char *tmp = NULL;
|
if (je->response != NULL && je->request != NULL) {
|
||||||
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_to_to_str(je->request->to, &tmp);
|
osip_to_to_str (je->request->to, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s for %s] to: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s for %s] to: %s",
|
||||||
je->tid, je->response->status_code, je->response->reason_phrase, je->request->sip_method, tmp);
|
je->tid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, je->request->sip_method, tmp);
|
||||||
} else if (je->request != NULL) {
|
osip_free (tmp);
|
||||||
snprintf(buf, 99, "<- (%i) Error for %s request", je->tid, je->request->sip_method);
|
} else if (je->request != NULL) {
|
||||||
} else {
|
snprintf (buf, 99, "<- (%i) Error for %s request",
|
||||||
snprintf(buf, 99, "<- (%i) Error for unknown request", je->tid);
|
je->tid, je->request->sip_method);
|
||||||
}
|
} else {
|
||||||
|
snprintf (buf, 99, "<- (%i) Error for unknown request", je->tid);
|
||||||
|
}
|
||||||
} else if (je->response == NULL && je->request != NULL && je->cid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->cid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i %i) %s from: %s", je->cid, je->did, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i %i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->cid, je->did, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->cid > 0) {
|
} else if (je->response != NULL && je->cid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_to_to_str(je->request->to, &tmp);
|
osip_to_to_str (je->request->to, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i %i) [%i %s] for %s to: %s",
|
snprintf (buf, 99, "<- (%i %i) [%i %s] for %s to: %s",
|
||||||
je->cid, je->did, je->response->status_code,
|
je->cid, je->did, je->response->status_code,
|
||||||
je->response->reason_phrase, je->request->sip_method, tmp);
|
je->response->reason_phrase, je->request->sip_method, tmp);
|
||||||
osip_free(tmp);
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL && je->rid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->rid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) %s from: %s", je->rid, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->rid, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->rid > 0) {
|
} else if (je->response != NULL && je->rid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s] from: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s] from: %s",
|
||||||
je->rid, je->response->status_code, je->response->reason_phrase, tmp);
|
je->rid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL && je->sid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->sid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
char *stat = NULL;
|
char *stat = NULL;
|
||||||
osip_header_t *sub_state;
|
osip_header_t *sub_state;
|
||||||
|
|
||||||
osip_message_header_get_byname(je->request, "subscription-state", 0, &sub_state);
|
osip_message_header_get_byname (je->request, "subscription-state",
|
||||||
|
0, &sub_state);
|
||||||
if (sub_state != NULL && sub_state->hvalue != NULL)
|
if (sub_state != NULL && sub_state->hvalue != NULL)
|
||||||
stat = sub_state->hvalue;
|
stat = sub_state->hvalue;
|
||||||
|
|
||||||
osip_uri_to_str(je->request->from->url, &tmp);
|
osip_uri_to_str (je->request->from->url, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%s] %s from: %s", je->sid, stat, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i) [%s] %s from: %s",
|
||||||
osip_free(tmp);
|
je->sid, stat, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->sid > 0) {
|
} else if (je->response != NULL && je->sid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_uri_to_str(je->request->to->url, &tmp);
|
osip_uri_to_str (je->request->to->url, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s] from: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s] from: %s",
|
||||||
je->sid, je->response->status_code, je->response->reason_phrase, tmp);
|
je->sid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL) {
|
} else if (je->response == NULL && je->request != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) %s from: %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) %s from: %s",
|
||||||
je->cid, je->did, je->sid, je->nid, je->request->sip_method, tmp);
|
je->cid, je->did, je->sid, je->nid,
|
||||||
osip_free(tmp);
|
je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL) {
|
} else if (je->response != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) [%i %s] for %s from: %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) [%i %s] for %s from: %s",
|
||||||
je->cid, je->did, je->sid, je->nid,
|
je->cid, je->did, je->sid, je->nid,
|
||||||
je->response->status_code, je->response->reason_phrase, je->request->sip_method, tmp);
|
je->response->status_code, je->response->reason_phrase,
|
||||||
osip_free(tmp);
|
je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i|t=%i) %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i|t=%i) %s",
|
||||||
je->cid, je->did, je->sid, je->nid, je->tid, je->textinfo);
|
je->cid, je->did, je->sid, je->nid, je->tid, je->textinfo);
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\n%s\n", buf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\n%s\n", buf);
|
||||||
/* Print it out */
|
/* Print it out */
|
||||||
|
@ -1241,7 +1241,7 @@ static void log_event(eXosip_event_t * je)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static int config_exosip(int reload)
|
static int config_exosip(int reload)
|
||||||
{
|
{
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
|
@ -1307,88 +1307,88 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
|
|
||||||
config_exosip(0);
|
config_exosip(0);
|
||||||
|
|
||||||
if (eXosip_init()) {
|
if (eXosip_init ()) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_init initialization failed!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_init initialization failed!\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eXosip_listen_addr(IPPROTO_UDP, NULL, globals.port, AF_INET, 0)) {
|
if (eXosip_listen_addr (IPPROTO_UDP, NULL, globals.port, AF_INET, 0)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_listen_addr failed!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_listen_addr failed!\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
globals.running = 1;
|
globals.running = 1;
|
||||||
while (globals.running > 0) {
|
while (globals.running > 0) {
|
||||||
if (!(event = eXosip_event_wait(0, 100))) {
|
if (!(event = eXosip_event_wait(0,100))) {
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
eXosip_lock();
|
eXosip_lock();
|
||||||
eXosip_automatic_action();
|
eXosip_automatic_action ();
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
|
|
||||||
log_event(event);
|
log_event(event);
|
||||||
|
|
||||||
switch (event->type) {
|
switch(event->type) {
|
||||||
case EXOSIP_CALL_INVITE:
|
case EXOSIP_CALL_INVITE:
|
||||||
exosip_create_call(event);
|
exosip_create_call(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_REINVITE:
|
case EXOSIP_CALL_REINVITE:
|
||||||
/* See what the reinvite is about - on hold or whatever */
|
/* See what the reinvite is about - on hold or whatever */
|
||||||
//handle_reinvite(event);
|
//handle_reinvite(event);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got a reinvite.\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got a reinvite.\n");
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_MESSAGE_NEW:
|
case EXOSIP_CALL_MESSAGE_NEW:
|
||||||
if (event->request != NULL && MSG_IS_REFER(event->request)) {
|
if (event->request != NULL && MSG_IS_REFER(event->request)) {
|
||||||
//handle_call_transfer(event);
|
//handle_call_transfer(event);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_ACK:
|
case EXOSIP_CALL_ACK:
|
||||||
/* If audio is not flowing and this has SDP - fire it up! */
|
/* If audio is not flowing and this has SDP - fire it up! */
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_ANSWERED:
|
case EXOSIP_CALL_ANSWERED:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "The call was answered.\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "The call was answered.\n");
|
||||||
handle_answer(event);
|
handle_answer(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_PROCEEDING:
|
case EXOSIP_CALL_PROCEEDING:
|
||||||
/* This is like a 100 Trying... yeah */
|
/* This is like a 100 Trying... yeah */
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_RINGING:
|
case EXOSIP_CALL_RINGING:
|
||||||
//handle_ringing(event);
|
//handle_ringing(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_REDIRECTED:
|
case EXOSIP_CALL_REDIRECTED:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Call was redirect\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Call was redirect\n");
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_CLOSED:
|
case EXOSIP_CALL_CLOSED:
|
||||||
destroy_call_by_event(event);
|
destroy_call_by_event(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_RELEASED:
|
case EXOSIP_CALL_RELEASED:
|
||||||
destroy_call_by_event(event);
|
destroy_call_by_event(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_NOANSWER:
|
case EXOSIP_CALL_NOANSWER:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "The call was not answered.\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "The call was not answered.\n");
|
||||||
destroy_call_by_event(event);
|
destroy_call_by_event(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_REQUESTFAILURE:
|
case EXOSIP_CALL_REQUESTFAILURE:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Request failure\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Request failure\n");
|
||||||
destroy_call_by_event(event);
|
destroy_call_by_event(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_SERVERFAILURE:
|
case EXOSIP_CALL_SERVERFAILURE:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Server failure\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Server failure\n");
|
||||||
destroy_call_by_event(event);
|
destroy_call_by_event(event);
|
||||||
break;
|
break;
|
||||||
case EXOSIP_CALL_GLOBALFAILURE:
|
case EXOSIP_CALL_GLOBALFAILURE:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Global failure\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Global failure\n");
|
||||||
destroy_call_by_event(event);
|
destroy_call_by_event(event);
|
||||||
break;
|
break;
|
||||||
/* Registration related stuff */
|
/* Registration related stuff */
|
||||||
case EXOSIP_REGISTRATION_NEW:
|
case EXOSIP_REGISTRATION_NEW:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Received registration attempt\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Received registration attempt\n");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
/* Unknown event... casually absorb it for now */
|
/* Unknown event... casually absorb it for now */
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "There was an event (%d) [%s]\n", event->type, event->textinfo);
|
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "There was an event (%d) [%s]\n", event->type, event->textinfo);
|
||||||
|
@ -1399,7 +1399,8 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
eXosip_quit();
|
eXosip_quit();
|
||||||
globals.running = 0;
|
globals.running = 0;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Monitor Thread Exiting\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Monitor Thread Exiting\n");
|
||||||
//switch_sleep(2000000);
|
//switch_sleep(2000000);
|
||||||
|
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ typedef enum {
|
||||||
TFLAG_DTMF = (1 << 3),
|
TFLAG_DTMF = (1 << 3),
|
||||||
TFLAG_READING = (1 << 4),
|
TFLAG_READING = (1 << 4),
|
||||||
TFLAG_WRITING = (1 << 5),
|
TFLAG_WRITING = (1 << 5),
|
||||||
TFLAG_USING_CODEC = (1 << 6),
|
TFLAG_USING_CODEC = (1 << 6),
|
||||||
TFLAG_RTP = (1 << 7),
|
TFLAG_RTP = (1 << 7),
|
||||||
TFLAG_BYE = (1 << 8)
|
TFLAG_BYE = (1 << 8)
|
||||||
} TFLAGS;
|
} TFLAGS;
|
||||||
|
@ -88,7 +88,7 @@ static struct {
|
||||||
} globals;
|
} globals;
|
||||||
|
|
||||||
struct private_object {
|
struct private_object {
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
switch_frame read_frame;
|
switch_frame read_frame;
|
||||||
switch_codec read_codec;
|
switch_codec read_codec;
|
||||||
|
@ -136,7 +136,7 @@ static void set_global_dialplan(char *dialplan)
|
||||||
free(globals.dialplan);
|
free(globals.dialplan);
|
||||||
globals.dialplan = NULL;
|
globals.dialplan = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
globals.dialplan = strdup(dialplan);
|
globals.dialplan = strdup(dialplan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,14 +145,11 @@ static switch_status exosip_on_init(switch_core_session *session);
|
||||||
static switch_status exosip_on_hangup(switch_core_session *session);
|
static switch_status exosip_on_hangup(switch_core_session *session);
|
||||||
static switch_status exosip_on_loopback(switch_core_session *session);
|
static switch_status exosip_on_loopback(switch_core_session *session);
|
||||||
static switch_status exosip_on_transmit(switch_core_session *session);
|
static switch_status exosip_on_transmit(switch_core_session *session);
|
||||||
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags);
|
||||||
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags);
|
||||||
switch_io_flag flags);
|
|
||||||
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
|
||||||
switch_io_flag flags);
|
|
||||||
static int config_exosip(int reload);
|
static int config_exosip(int reload);
|
||||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload);
|
static switch_status parse_sdp_media(sdp_media_t *media, char **dname, char **drate, char **dpayload);
|
||||||
static switch_status exosip_kill_channel(switch_core_session *session, int sig);
|
static switch_status exosip_kill_channel(switch_core_session *session, int sig);
|
||||||
static void activate_rtp(struct private_object *tech_pvt);
|
static void activate_rtp(struct private_object *tech_pvt);
|
||||||
static void deactivate_rtp(struct private_object *tech_pvt);
|
static void deactivate_rtp(struct private_object *tech_pvt);
|
||||||
|
@ -205,7 +202,7 @@ static int sdp_add_codec(struct osip_rfc3264 *cnf, int codec_type, int payload,
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -235,7 +232,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
char *dest_uri;
|
char *dest_uri;
|
||||||
switch_codec_interface *codecs[512];
|
switch_codec_interface *codecs[512];
|
||||||
int num_codecs = 0;
|
int num_codecs = 0;
|
||||||
/* do SIP Goodies... */
|
/* do SIP Goodies...*/
|
||||||
|
|
||||||
/* Generate callerid URI */
|
/* Generate callerid URI */
|
||||||
eXosip_guess_localip(AF_INET, localip, 128);
|
eXosip_guess_localip(AF_INET, localip, 128);
|
||||||
|
@ -248,17 +245,14 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
/* Initialize SDP */
|
/* Initialize SDP */
|
||||||
sdp_message_init(&tech_pvt->local_sdp);
|
sdp_message_init(&tech_pvt->local_sdp);
|
||||||
sdp_message_v_version_set(tech_pvt->local_sdp, "0");
|
sdp_message_v_version_set(tech_pvt->local_sdp, "0");
|
||||||
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4",
|
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4", tech_pvt->local_sdp_audio_ip);
|
||||||
tech_pvt->local_sdp_audio_ip);
|
|
||||||
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
||||||
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
||||||
sdp_message_t_time_descr_add(tech_pvt->local_sdp, "0", "0");
|
sdp_message_t_time_descr_add(tech_pvt->local_sdp, "0", "0");
|
||||||
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
||||||
sdp_message_m_media_add(tech_pvt->local_sdp, "audio", port, NULL, "RTP/AVP");
|
sdp_message_m_media_add(tech_pvt->local_sdp, "audio", port, NULL, "RTP/AVP");
|
||||||
/* Add in every codec we support on this outbound call */
|
/* Add in every codec we support on this outbound call */
|
||||||
if ((num_codecs =
|
if ((num_codecs = loadable_module_get_codecs(switch_core_session_get_pool(session), codecs, sizeof(codecs)/sizeof(codecs[0]))) > 0) {
|
||||||
loadable_module_get_codecs(switch_core_session_get_pool(session), codecs,
|
|
||||||
sizeof(codecs) / sizeof(codecs[0]))) > 0) {
|
|
||||||
int i;
|
int i;
|
||||||
static const switch_codec_implementation *imp;
|
static const switch_codec_implementation *imp;
|
||||||
for (i = 0; i < num_codecs; i++) {
|
for (i = 0; i < num_codecs; i++) {
|
||||||
|
@ -266,14 +260,12 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "%i", codecs[i]->ianacode);
|
snprintf(tmp, sizeof(tmp), "%i", codecs[i]->ianacode);
|
||||||
sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp));
|
sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp));
|
||||||
for (imp = codecs[i]->implementations; imp; imp = imp->next) {
|
for (imp = codecs[i]->implementations ; imp ; imp = imp->next) {
|
||||||
/* Add to SDP config */
|
/* Add to SDP config */
|
||||||
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame,
|
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second, x++);
|
||||||
imp->samples_per_second, x++);
|
|
||||||
/* Add to SDP message */
|
/* Add to SDP message */
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "%i %s/%i", codecs[i]->ianacode, codecs[i]->iananame,
|
snprintf(tmp, sizeof(tmp), "%i %s/%i", codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second);
|
||||||
imp->samples_per_second);
|
|
||||||
sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp));
|
sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp));
|
||||||
memset(tmp, 0, sizeof(tmp));
|
memset(tmp, 0, sizeof(tmp));
|
||||||
}
|
}
|
||||||
|
@ -281,9 +273,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
}
|
}
|
||||||
/* Setup our INVITE */
|
/* Setup our INVITE */
|
||||||
eXosip_lock();
|
eXosip_lock();
|
||||||
if (!
|
if (!(dest_uri = (char *) switch_core_session_alloc(session, strlen(tech_pvt->caller_profile->destination_number) + 10))) {
|
||||||
(dest_uri =
|
|
||||||
(char *) switch_core_session_alloc(session, strlen(tech_pvt->caller_profile->destination_number) + 10))) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "AIEEEE!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "AIEEEE!\n");
|
||||||
assert(dest_uri != NULL);
|
assert(dest_uri != NULL);
|
||||||
}
|
}
|
||||||
|
@ -302,7 +292,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
tech_pvt->did = -1;
|
tech_pvt->did = -1;
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Let Media Work */
|
/* Let Media Work */
|
||||||
switch_set_flag(tech_pvt, TFLAG_IO);
|
switch_set_flag(tech_pvt, TFLAG_IO);
|
||||||
|
@ -341,8 +331,8 @@ static switch_status exosip_on_hangup(switch_core_session *session)
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
|
|
||||||
switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
|
switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
|
||||||
|
|
||||||
|
|
||||||
switch_set_flag(tech_pvt, TFLAG_BYE);
|
switch_set_flag(tech_pvt, TFLAG_BYE);
|
||||||
switch_clear_flag(tech_pvt, TFLAG_IO);
|
switch_clear_flag(tech_pvt, TFLAG_IO);
|
||||||
|
@ -356,8 +346,7 @@ static switch_status exosip_on_hangup(switch_core_session *session)
|
||||||
switch_core_codec_destroy(&tech_pvt->write_codec);
|
switch_core_codec_destroy(&tech_pvt->write_codec);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "EXOSIP HANGUP %s %d/%d=%d\n", switch_channel_get_name(channel),
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "EXOSIP HANGUP %s %d/%d=%d\n", switch_channel_get_name(channel), tech_pvt->cid, tech_pvt->did, i);
|
||||||
tech_pvt->cid, tech_pvt->did, i);
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -373,8 +362,7 @@ static switch_status exosip_on_transmit(switch_core_session *session)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
|
@ -382,8 +370,7 @@ static switch_status exosip_outgoing_channel(switch_core_session *session, switc
|
||||||
switch_caller_profile *caller_profile, *originator_caller_profile = NULL;
|
switch_caller_profile *caller_profile, *originator_caller_profile = NULL;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
switch_core_session_set_private(*new_session, tech_pvt);
|
switch_core_session_set_private(*new_session, tech_pvt);
|
||||||
|
@ -417,7 +404,7 @@ static switch_status exosip_outgoing_channel(switch_core_session *session, switc
|
||||||
switch_channel_set_originator_caller_profile(channel, cloned_profile);
|
switch_channel_set_originator_caller_profile(channel, cloned_profile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_channel_set_flag(channel, CF_OUTBOUND);
|
switch_channel_set_flag(channel, CF_OUTBOUND);
|
||||||
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
||||||
switch_channel_set_state(channel, CS_INIT);
|
switch_channel_set_state(channel, CS_INIT);
|
||||||
|
@ -434,7 +421,7 @@ static void deactivate_rtp(struct private_object *tech_pvt)
|
||||||
if (tech_pvt->rtp_session) {
|
if (tech_pvt->rtp_session) {
|
||||||
//switch_mutex_lock(tech_pvt->rtp_lock);
|
//switch_mutex_lock(tech_pvt->rtp_lock);
|
||||||
|
|
||||||
while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
|
while(loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
|
||||||
switch_yield(10000);
|
switch_yield(10000);
|
||||||
loops++;
|
loops++;
|
||||||
}
|
}
|
||||||
|
@ -470,16 +457,22 @@ static void activate_rtp(struct private_object *tech_pvt)
|
||||||
tech_pvt->local_sdp_audio_ip,
|
tech_pvt->local_sdp_audio_ip,
|
||||||
tech_pvt->local_sdp_audio_port,
|
tech_pvt->local_sdp_audio_port,
|
||||||
tech_pvt->remote_sdp_audio_ip,
|
tech_pvt->remote_sdp_audio_ip,
|
||||||
tech_pvt->remote_sdp_audio_port, tech_pvt->read_codec.codec_interface->ianacode, ms);
|
tech_pvt->remote_sdp_audio_port,
|
||||||
|
tech_pvt->read_codec.codec_interface->ianacode,
|
||||||
|
ms
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
tech_pvt->rtp_session = ccrtp4c_new(tech_pvt->local_sdp_audio_ip,
|
tech_pvt->rtp_session = ccrtp4c_new(
|
||||||
|
tech_pvt->local_sdp_audio_ip,
|
||||||
tech_pvt->local_sdp_audio_port,
|
tech_pvt->local_sdp_audio_port,
|
||||||
tech_pvt->remote_sdp_audio_ip,
|
tech_pvt->remote_sdp_audio_ip,
|
||||||
tech_pvt->remote_sdp_audio_port,
|
tech_pvt->remote_sdp_audio_port,
|
||||||
tech_pvt->read_codec.codec_interface->ianacode, ms, ms * 15);
|
tech_pvt->read_codec.codec_interface->ianacode,
|
||||||
|
ms,
|
||||||
|
ms * 15);
|
||||||
|
|
||||||
if (tech_pvt->rtp_session) {
|
if (tech_pvt->rtp_session) {
|
||||||
tech_pvt->ssrc = ccrtp4c_get_ssrc(tech_pvt->rtp_session);
|
tech_pvt->ssrc = ccrtp4c_get_ssrc(tech_pvt->rtp_session);
|
||||||
|
@ -514,21 +507,20 @@ static switch_status exosip_answer_channel(switch_core_session *session)
|
||||||
sdp_message_to_str(tech_pvt->local_sdp, &buf);
|
sdp_message_to_str(tech_pvt->local_sdp, &buf);
|
||||||
osip_message_set_body(answer, buf, strlen(buf));
|
osip_message_set_body(answer, buf, strlen(buf));
|
||||||
osip_message_set_content_type(answer, "application/sdp");
|
osip_message_set_content_type(answer, "application/sdp");
|
||||||
free(buf);
|
free(buf);
|
||||||
eXosip_call_send_answer(tech_pvt->tid, 200, answer);
|
eXosip_call_send_answer(tech_pvt->tid, 200, answer);
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags)
|
||||||
switch_io_flag flags)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
size_t bytes = 0, samples = 0, frames = 0, ms = 0;
|
size_t bytes = 0, samples = 0, frames=0, ms=0;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
|
@ -554,11 +546,12 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
|
|
||||||
assert(tech_pvt->rtp_session != NULL);
|
assert(tech_pvt->rtp_session != NULL);
|
||||||
tech_pvt->read_frame.datalen = 0;
|
tech_pvt->read_frame.datalen = 0;
|
||||||
|
|
||||||
while (!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO)
|
while(!switch_test_flag(tech_pvt, TFLAG_BYE) && switch_test_flag(tech_pvt, TFLAG_IO) && tech_pvt->read_frame.datalen == 0) {
|
||||||
&& tech_pvt->read_frame.datalen == 0) {
|
if ((tech_pvt->read_frame.datalen =
|
||||||
if ((tech_pvt->read_frame.datalen =
|
ccrtp4c_read(tech_pvt->rtp_session,
|
||||||
ccrtp4c_read(tech_pvt->rtp_session, tech_pvt->read_frame.data, sizeof(tech_pvt->read_buf),
|
tech_pvt->read_frame.data,
|
||||||
|
sizeof(tech_pvt->read_buf),
|
||||||
&tech_pvt->timestamp_recv))) {
|
&tech_pvt->timestamp_recv))) {
|
||||||
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
||||||
frames = (tech_pvt->read_frame.datalen / bytes);
|
frames = (tech_pvt->read_frame.datalen / bytes);
|
||||||
|
@ -569,9 +562,9 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
}
|
}
|
||||||
switch_yield(100);
|
switch_yield(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
//printf("%s %s->%s recv %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->local_sdp_audio_ip, tech_pvt->read_frame.datalen, samples, frames, ms, tech_pvt->timestamp_recv);
|
//printf("%s %s->%s recv %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->local_sdp_audio_ip, tech_pvt->read_frame.datalen, samples, frames, ms, tech_pvt->timestamp_recv);
|
||||||
|
|
||||||
|
|
||||||
//switch_mutex_unlock(tech_pvt->rtp_lock);
|
//switch_mutex_unlock(tech_pvt->rtp_lock);
|
||||||
|
|
||||||
|
@ -589,25 +582,24 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
|
|
||||||
*frame = &tech_pvt->read_frame;
|
*frame = &tech_pvt->read_frame;
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags)
|
||||||
switch_io_flag flags)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
switch_status status = SWITCH_STATUS_SUCCESS;
|
switch_status status = SWITCH_STATUS_SUCCESS;
|
||||||
int bytes = 0, samples = 0, ms = 0, frames = 0;
|
int bytes=0, samples=0, ms=0, frames=0;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
if (!switch_test_flag(tech_pvt, TFLAG_RTP)) {
|
if (!switch_test_flag(tech_pvt, TFLAG_RTP)) {
|
||||||
activate_rtp(tech_pvt);
|
activate_rtp(tech_pvt);
|
||||||
}
|
}
|
||||||
|
@ -632,14 +624,14 @@ static switch_status exosip_write_frame(switch_core_session *session, switch_fra
|
||||||
} else {
|
} else {
|
||||||
assert(0);
|
assert(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//printf("%s %s->%s send %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, ms, tech_pvt->timestamp_send);
|
//printf("%s %s->%s send %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, ms, tech_pvt->timestamp_send);
|
||||||
|
|
||||||
tech_pvt->timestamp_send += (int) samples;
|
tech_pvt->timestamp_send += (int)samples;
|
||||||
ccrtp4c_write(tech_pvt->rtp_session, frame->data, frame->datalen, &tech_pvt->timestamp_send);
|
ccrtp4c_write(tech_pvt->rtp_session, frame->data, frame->datalen, &tech_pvt->timestamp_send);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
switch_clear_flag(tech_pvt, TFLAG_WRITING);
|
switch_clear_flag(tech_pvt, TFLAG_WRITING);
|
||||||
|
@ -663,7 +655,7 @@ static switch_status exosip_kill_channel(switch_core_session *session, int sig)
|
||||||
|
|
||||||
switch_clear_flag(tech_pvt, TFLAG_IO);
|
switch_clear_flag(tech_pvt, TFLAG_IO);
|
||||||
switch_set_flag(tech_pvt, TFLAG_BYE);
|
switch_set_flag(tech_pvt, TFLAG_BYE);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -693,45 +685,45 @@ static switch_status exosip_waitfor_write(switch_core_session *session, int ms)
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_io_routines exosip_io_routines = {
|
static const switch_io_routines exosip_io_routines = {
|
||||||
/*.outgoing_channel */ exosip_outgoing_channel,
|
/*.outgoing_channel*/ exosip_outgoing_channel,
|
||||||
/*.answer_channel */ exosip_answer_channel,
|
/*.answer_channel*/ exosip_answer_channel,
|
||||||
/*.read_frame */ exosip_read_frame,
|
/*.read_frame*/ exosip_read_frame,
|
||||||
/*.write_frame */ exosip_write_frame,
|
/*.write_frame*/ exosip_write_frame,
|
||||||
/*.kill_channel */ exosip_kill_channel,
|
/*.kill_channel*/ exosip_kill_channel,
|
||||||
/*.waitfor_read */ exosip_waitfor_read,
|
/*.waitfor_read*/ exosip_waitfor_read,
|
||||||
/*.waitfor_read */ exosip_waitfor_write
|
/*.waitfor_read*/ exosip_waitfor_write
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_event_handler_table exosip_event_handlers = {
|
static const switch_event_handler_table exosip_event_handlers = {
|
||||||
/*.on_init */ exosip_on_init,
|
/*.on_init*/ exosip_on_init,
|
||||||
/*.on_ring */ exosip_on_ring,
|
/*.on_ring*/ exosip_on_ring,
|
||||||
/*.on_execute */ exosip_on_execute,
|
/*.on_execute*/ exosip_on_execute,
|
||||||
/*.on_hangup */ exosip_on_hangup,
|
/*.on_hangup*/ exosip_on_hangup,
|
||||||
/*.on_loopback */ exosip_on_loopback,
|
/*.on_loopback*/ exosip_on_loopback,
|
||||||
/*.on_transmit */ exosip_on_transmit
|
/*.on_transmit*/ exosip_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface exosip_endpoint_interface = {
|
static const switch_endpoint_interface exosip_endpoint_interface = {
|
||||||
/*.interface_name */ "exosip",
|
/*.interface_name*/ "exosip",
|
||||||
/*.io_routines */ &exosip_io_routines,
|
/*.io_routines*/ &exosip_io_routines,
|
||||||
/*.event_handlers */ &exosip_event_handlers,
|
/*.event_handlers*/ &exosip_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface exosip_module_interface = {
|
static const switch_loadable_module_interface exosip_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &exosip_endpoint_interface,
|
/*.endpoint_interface*/ &exosip_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -739,7 +731,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
{
|
{
|
||||||
if (globals.running) {
|
if (globals.running) {
|
||||||
globals.running = -1;
|
globals.running = -1;
|
||||||
while (globals.running) {
|
while(globals.running) {
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -747,15 +739,14 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &exosip_module_interface;
|
*interface = &exosip_module_interface;
|
||||||
|
|
||||||
|
@ -763,7 +754,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status exosip_create_call(eXosip_event_t * event)
|
static switch_status exosip_create_call(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
sdp_message_t *remote_sdp = NULL;
|
sdp_message_t *remote_sdp = NULL;
|
||||||
|
@ -793,13 +784,14 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
switch_core_session_destroy(&session);
|
switch_core_session_destroy(&session);
|
||||||
return SWITCH_STATUS_MEMERR;
|
return SWITCH_STATUS_MEMERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
globals.dialplan,
|
globals.dialplan,
|
||||||
event->request->from->displayname,
|
event->request->from->displayname,
|
||||||
event->request->from->url->username,
|
event->request->from->url->username,
|
||||||
event->request->from->url->username,
|
event->request->from->url->username,
|
||||||
NULL, event->request->req_uri->username))) {
|
NULL,
|
||||||
|
event->request->req_uri->username))) {
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -810,7 +802,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "Exosip/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
|
snprintf(name, sizeof(name), "Exosip/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
|
||||||
switch_channel_set_name(channel, name);
|
switch_channel_set_name(channel, name);
|
||||||
|
|
||||||
if (!(remote_sdp = eXosip_get_sdp_info(event->request))) {
|
if (!(remote_sdp = eXosip_get_sdp_info(event->request))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Find Remote SDP!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Find Remote SDP!\n");
|
||||||
exosip_on_hangup(session);
|
exosip_on_hangup(session);
|
||||||
|
@ -822,18 +814,15 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
tech_pvt->local_sdp_audio_port = next_rtp_port();
|
tech_pvt->local_sdp_audio_port = next_rtp_port();
|
||||||
osip_rfc3264_init(&tech_pvt->sdp_config);
|
osip_rfc3264_init(&tech_pvt->sdp_config);
|
||||||
/* Add in what codecs we support locally */
|
/* Add in what codecs we support locally */
|
||||||
|
|
||||||
if ((num_codecs =
|
if ((num_codecs = loadable_module_get_codecs(switch_core_session_get_pool(session), codecs, sizeof(codecs)/sizeof(codecs[0]))) > 0) {
|
||||||
loadable_module_get_codecs(switch_core_session_get_pool(session), codecs,
|
|
||||||
sizeof(codecs) / sizeof(codecs[0]))) > 0) {
|
|
||||||
int i;
|
int i;
|
||||||
static const switch_codec_implementation *imp;
|
static const switch_codec_implementation *imp;
|
||||||
|
|
||||||
for (i = 0; i < num_codecs; i++) {
|
for (i = 0; i < num_codecs; i++) {
|
||||||
int x = 0;
|
int x = 0;
|
||||||
for (imp = codecs[i]->implementations; imp; imp = imp->next) {
|
for (imp = codecs[i]->implementations ; imp ; imp = imp->next) {
|
||||||
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame,
|
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second, x++);
|
||||||
imp->samples_per_second, x++);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -842,18 +831,17 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
sdp_message_parse(tech_pvt->local_sdp, local_sdp_str);
|
sdp_message_parse(tech_pvt->local_sdp, local_sdp_str);
|
||||||
|
|
||||||
sdp_message_to_str(remote_sdp, &remote_sdp_str);
|
sdp_message_to_str(remote_sdp, &remote_sdp_str);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str, remote_sdp_str);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str,remote_sdp_str);
|
||||||
|
|
||||||
mline = 0;
|
mline = 0;
|
||||||
while (0 == osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {
|
while (0==osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {
|
||||||
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) {
|
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) {
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got no compatible codecs!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got no compatible codecs!\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
for (pos = 0; audio_tab[pos] != NULL; pos++) {
|
for (pos=0; audio_tab[pos]!=NULL; pos++) {
|
||||||
osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos],
|
osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos], mline);
|
||||||
mline);
|
|
||||||
if (parse_sdp_media(audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
|
if (parse_sdp_media(audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
|
||||||
tech_pvt->payload_num = atoi(dpayload);
|
tech_pvt->payload_num = atoi(dpayload);
|
||||||
break;
|
break;
|
||||||
|
@ -862,8 +850,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
mline++;
|
mline++;
|
||||||
}
|
}
|
||||||
free(remote_sdp_str);
|
free(remote_sdp_str);
|
||||||
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4",
|
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4", tech_pvt->local_sdp_audio_ip);
|
||||||
tech_pvt->local_sdp_audio_ip);
|
|
||||||
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
||||||
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
||||||
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
||||||
|
@ -874,9 +861,9 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
snprintf(tech_pvt->remote_sdp_audio_ip, 50, conn->c_addr);
|
snprintf(tech_pvt->remote_sdp_audio_ip, 50, conn->c_addr);
|
||||||
|
|
||||||
tech_pvt->remote_sdp_audio_port = atoi(remote_med->m_port);
|
tech_pvt->remote_sdp_audio_port = atoi(remote_med->m_port);
|
||||||
|
|
||||||
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", event->cid);
|
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", event->cid);
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
|
|
||||||
if (!dname) {
|
if (!dname) {
|
||||||
exosip_on_hangup(session);
|
exosip_on_hangup(session);
|
||||||
|
@ -891,21 +878,21 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
int rate = atoi(drate);
|
int rate = atoi(drate);
|
||||||
|
|
||||||
if (switch_core_codec_init(&tech_pvt->read_codec,
|
if (switch_core_codec_init(&tech_pvt->read_codec,
|
||||||
dname,
|
dname,
|
||||||
rate,
|
rate,
|
||||||
globals.codec_ms,
|
globals.codec_ms,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL) != SWITCH_STATUS_SUCCESS) {
|
NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
} else {
|
} else {
|
||||||
if (switch_core_codec_init(&tech_pvt->write_codec,
|
if (switch_core_codec_init(&tech_pvt->write_codec,
|
||||||
dname,
|
dname,
|
||||||
rate,
|
rate,
|
||||||
globals.codec_ms,
|
globals.codec_ms,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL) != SWITCH_STATUS_SUCCESS) {
|
NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
@ -913,15 +900,14 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
int ms;
|
int ms;
|
||||||
switch_set_flag(tech_pvt, TFLAG_USING_CODEC);
|
switch_set_flag(tech_pvt, TFLAG_USING_CODEC);
|
||||||
ms = tech_pvt->write_codec.implementation->nanoseconds_per_frame / 1000;
|
ms = tech_pvt->write_codec.implementation->nanoseconds_per_frame / 1000;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Inbound Codec %s/%d %d ms\n", dname, rate,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Inbound Codec %s/%d %d ms\n", dname, rate, ms);
|
||||||
ms);
|
|
||||||
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
||||||
switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
|
switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
|
||||||
switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
|
switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_core_session_thread_launch(session);
|
switch_core_session_thread_launch(session);
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Create new Inbound Channel!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Create new Inbound Channel!\n");
|
||||||
|
@ -934,14 +920,13 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void destroy_call_by_event(eXosip_event_t * event)
|
static void destroy_call_by_event(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
|
||||||
if (!(tech_pvt = get_pvt_by_call_id(event->cid))) {
|
if (!(tech_pvt = get_pvt_by_call_id(event->cid))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Um in case you are interested, Can't find the pvt [%d]!\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Um in case you are interested, Can't find the pvt [%d]!\n", event->cid);
|
||||||
event->cid);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -951,10 +936,10 @@ static void destroy_call_by_event(eXosip_event_t * event)
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "destroy %s\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "destroy %s\n", switch_channel_get_name(channel));
|
||||||
exosip_kill_channel(tech_pvt->session, SWITCH_SIG_KILL);
|
exosip_kill_channel(tech_pvt->session, SWITCH_SIG_KILL);
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload)
|
static switch_status parse_sdp_media(sdp_media_t *media, char **dname, char **drate, char **dpayload)
|
||||||
{
|
{
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
sdp_attribute_t *attr = NULL;
|
sdp_attribute_t *attr = NULL;
|
||||||
|
@ -962,7 +947,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
switch_status status = SWITCH_STATUS_GENERR;
|
switch_status status = SWITCH_STATUS_GENERR;
|
||||||
|
|
||||||
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
||||||
attr = (sdp_attribute_t *) osip_list_get(media->a_attributes, pos);
|
attr = (sdp_attribute_t *)osip_list_get(media->a_attributes, pos);
|
||||||
if (attr != NULL && strcasecmp(attr->a_att_field, "rtpmap") == 0) {
|
if (attr != NULL && strcasecmp(attr->a_att_field, "rtpmap") == 0) {
|
||||||
payload = attr->a_att_value;
|
payload = attr->a_att_value;
|
||||||
if ((name = strchr(payload, ' '))) {
|
if ((name = strchr(payload, ' '))) {
|
||||||
|
@ -983,8 +968,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
*dname = strdup("L16");
|
*dname = strdup("L16");
|
||||||
*drate = strdup("8000");
|
*drate = strdup("8000");
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Found negotiated codec Payload: %s Name: %s Rate: %s\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Found negotiated codec Payload: %s Name: %s Rate: %s\n", *dpayload, *dname, *drate);
|
||||||
*dpayload, *dname, *drate);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
attr = NULL;
|
attr = NULL;
|
||||||
|
@ -994,7 +978,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_answer(eXosip_event_t * event)
|
static void handle_answer(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
osip_message_t *ack = NULL;
|
osip_message_t *ack = NULL;
|
||||||
sdp_message_t *remote_sdp = NULL;
|
sdp_message_t *remote_sdp = NULL;
|
||||||
|
@ -1042,22 +1026,18 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
/* Assign them thar IDs */
|
/* Assign them thar IDs */
|
||||||
tech_pvt->did = event->did;
|
tech_pvt->did = event->did;
|
||||||
tech_pvt->tid = event->tid;
|
tech_pvt->tid = event->tid;
|
||||||
|
|
||||||
|
|
||||||
if (1) {
|
if (1) {
|
||||||
int rate = atoi(drate);
|
int rate = atoi(drate);
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_codec_init
|
if (switch_core_codec_init(&tech_pvt->read_codec, dname, rate, globals.codec_ms, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
(&tech_pvt->read_codec, dname, rate, globals.codec_ms, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
|
||||||
NULL) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
if (switch_core_codec_init
|
if (switch_core_codec_init(&tech_pvt->write_codec, dname, rate, globals.codec_ms, SWITCH_CODEC_FLAG_ENCODE |SWITCH_CODEC_FLAG_DECODE, NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
(&tech_pvt->write_codec, dname, rate, globals.codec_ms,
|
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
|
@ -1078,7 +1058,7 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
eXosip_call_build_ack(event->did, &ack);
|
eXosip_call_build_ack(event->did, &ack);
|
||||||
eXosip_call_send_ack(event->did, ack);
|
eXosip_call_send_ack(event->did, ack);
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
|
|
||||||
free(dname);
|
free(dname);
|
||||||
free(drate);
|
free(drate);
|
||||||
free(dpayload);
|
free(dpayload);
|
||||||
|
@ -1092,119 +1072,133 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void log_event(eXosip_event_t * je)
|
static void log_event(eXosip_event_t *je)
|
||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
|
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
if (je->type == EXOSIP_CALL_NOANSWER) {
|
if (je->type == EXOSIP_CALL_NOANSWER) {
|
||||||
snprintf(buf, 99, "<- (%i %i) No answer", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) No answer", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_CALL_CLOSED) {
|
} else if (je->type == EXOSIP_CALL_CLOSED) {
|
||||||
snprintf(buf, 99, "<- (%i %i) Call Closed", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) Call Closed", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_CALL_RELEASED) {
|
} else if (je->type == EXOSIP_CALL_RELEASED) {
|
||||||
snprintf(buf, 99, "<- (%i %i) Call released", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) Call released", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_MESSAGE_NEW && je->request != NULL && MSG_IS_MESSAGE(je->request)) {
|
} else if (je->type == EXOSIP_MESSAGE_NEW
|
||||||
|
&& je->request!=NULL && MSG_IS_MESSAGE(je->request)) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
if (je->request != NULL) {
|
if (je->request != NULL) {
|
||||||
osip_body_t *body;
|
osip_body_t *body;
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
|
|
||||||
osip_message_get_body(je->request, 0, &body);
|
osip_message_get_body (je->request, 0, &body);
|
||||||
if (body != NULL && body->body != NULL) {
|
if (body != NULL && body->body != NULL) {
|
||||||
snprintf(buf, 99, "<- (%i) from: %s TEXT: %s", je->tid, tmp, body->body);
|
snprintf (buf, 99, "<- (%i) from: %s TEXT: %s",
|
||||||
|
je->tid, tmp, body->body);
|
||||||
}
|
}
|
||||||
osip_free(tmp);
|
osip_free (tmp);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (%i) New event for unknown request?", je->tid);
|
snprintf (buf, 99, "<- (%i) New event for unknown request?", je->tid);
|
||||||
}
|
}
|
||||||
} else if (je->type == EXOSIP_MESSAGE_NEW) {
|
} else if (je->type == EXOSIP_MESSAGE_NEW) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) %s from: %s", je->tid, je->request->sip_method, tmp);
|
snprintf (buf, 99, "<- (%i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->tid, je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->type == EXOSIP_MESSAGE_PROCEEDING
|
} else if (je->type == EXOSIP_MESSAGE_PROCEEDING
|
||||||
|| je->type == EXOSIP_MESSAGE_ANSWERED
|
|| je->type == EXOSIP_MESSAGE_ANSWERED
|
||||||
|| je->type == EXOSIP_MESSAGE_REDIRECTED
|
|| je->type == EXOSIP_MESSAGE_REDIRECTED
|
||||||
|| je->type == EXOSIP_MESSAGE_REQUESTFAILURE
|
|| je->type == EXOSIP_MESSAGE_REQUESTFAILURE
|
||||||
|| je->type == EXOSIP_MESSAGE_SERVERFAILURE || je->type == EXOSIP_MESSAGE_GLOBALFAILURE) {
|
|| je->type == EXOSIP_MESSAGE_SERVERFAILURE
|
||||||
|
|| je->type == EXOSIP_MESSAGE_GLOBALFAILURE) {
|
||||||
if (je->response != NULL && je->request != NULL) {
|
if (je->response != NULL && je->request != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_to_to_str(je->request->to, &tmp);
|
osip_to_to_str (je->request->to, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s for %s] to: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s for %s] to: %s",
|
||||||
je->tid, je->response->status_code, je->response->reason_phrase, je->request->sip_method, tmp);
|
je->tid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->request != NULL) {
|
} else if (je->request != NULL) {
|
||||||
snprintf(buf, 99, "<- (%i) Error for %s request", je->tid, je->request->sip_method);
|
snprintf (buf, 99, "<- (%i) Error for %s request",
|
||||||
|
je->tid, je->request->sip_method);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (%i) Error for unknown request", je->tid);
|
snprintf (buf, 99, "<- (%i) Error for unknown request", je->tid);
|
||||||
}
|
}
|
||||||
} else if (je->response == NULL && je->request != NULL && je->cid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->cid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i %i) %s from: %s", je->cid, je->did, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i %i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->cid, je->did, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->cid > 0) {
|
} else if (je->response != NULL && je->cid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_to_to_str(je->request->to, &tmp);
|
osip_to_to_str (je->request->to, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i %i) [%i %s] for %s to: %s",
|
snprintf (buf, 99, "<- (%i %i) [%i %s] for %s to: %s",
|
||||||
je->cid, je->did, je->response->status_code,
|
je->cid, je->did, je->response->status_code,
|
||||||
je->response->reason_phrase, je->request->sip_method, tmp);
|
je->response->reason_phrase, je->request->sip_method, tmp);
|
||||||
osip_free(tmp);
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL && je->rid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->rid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) %s from: %s", je->rid, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->rid, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->rid > 0) {
|
} else if (je->response != NULL && je->rid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s] from: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s] from: %s",
|
||||||
je->rid, je->response->status_code, je->response->reason_phrase, tmp);
|
je->rid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL && je->sid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->sid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
char *stat = NULL;
|
char *stat = NULL;
|
||||||
osip_header_t *sub_state;
|
osip_header_t *sub_state;
|
||||||
|
|
||||||
osip_message_header_get_byname(je->request, "subscription-state", 0, &sub_state);
|
osip_message_header_get_byname (je->request, "subscription-state",
|
||||||
|
0, &sub_state);
|
||||||
if (sub_state != NULL && sub_state->hvalue != NULL)
|
if (sub_state != NULL && sub_state->hvalue != NULL)
|
||||||
stat = sub_state->hvalue;
|
stat = sub_state->hvalue;
|
||||||
|
|
||||||
osip_uri_to_str(je->request->from->url, &tmp);
|
osip_uri_to_str (je->request->from->url, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%s] %s from: %s", je->sid, stat, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i) [%s] %s from: %s",
|
||||||
osip_free(tmp);
|
je->sid, stat, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->sid > 0) {
|
} else if (je->response != NULL && je->sid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_uri_to_str(je->request->to->url, &tmp);
|
osip_uri_to_str (je->request->to->url, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s] from: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s] from: %s",
|
||||||
je->sid, je->response->status_code, je->response->reason_phrase, tmp);
|
je->sid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL) {
|
} else if (je->response == NULL && je->request != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) %s from: %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) %s from: %s",
|
||||||
je->cid, je->did, je->sid, je->nid, je->request->sip_method, tmp);
|
je->cid, je->did, je->sid, je->nid,
|
||||||
osip_free(tmp);
|
je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL) {
|
} else if (je->response != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) [%i %s] for %s from: %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) [%i %s] for %s from: %s",
|
||||||
je->cid, je->did, je->sid, je->nid,
|
je->cid, je->did, je->sid, je->nid,
|
||||||
je->response->status_code, je->response->reason_phrase, je->request->sip_method, tmp);
|
je->response->status_code, je->response->reason_phrase,
|
||||||
osip_free(tmp);
|
je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i|t=%i) %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i|t=%i) %s",
|
||||||
je->cid, je->did, je->sid, je->nid, je->tid, je->textinfo);
|
je->cid, je->did, je->sid, je->nid, je->tid, je->textinfo);
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\n%s\n", buf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\n%s\n", buf);
|
||||||
/* Print it out */
|
/* Print it out */
|
||||||
|
@ -1215,21 +1209,21 @@ static void log_event(eXosip_event_t * je)
|
||||||
static void *monitor_thread_run(void)
|
static void *monitor_thread_run(void)
|
||||||
{
|
{
|
||||||
eXosip_event_t *event = NULL;
|
eXosip_event_t *event = NULL;
|
||||||
|
|
||||||
globals.running = 1;
|
globals.running = 1;
|
||||||
while (globals.running > 0) {
|
while (globals.running > 0) {
|
||||||
if (!(event = eXosip_event_wait(0, 100))) {
|
if (!(event = eXosip_event_wait(0,100))) {
|
||||||
switch_yield(100);
|
switch_yield(100);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
eXosip_lock();
|
eXosip_lock();
|
||||||
eXosip_automatic_action();
|
eXosip_automatic_action ();
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
|
|
||||||
log_event(event);
|
log_event(event);
|
||||||
|
|
||||||
switch (event->type) {
|
switch(event->type) {
|
||||||
case EXOSIP_CALL_INVITE:
|
case EXOSIP_CALL_INVITE:
|
||||||
exosip_create_call(event);
|
exosip_create_call(event);
|
||||||
break;
|
break;
|
||||||
|
@ -1301,7 +1295,7 @@ static void *monitor_thread_run(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int config_exosip(int reload)
|
static int config_exosip(int reload)
|
||||||
{
|
{
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
|
@ -1335,7 +1329,7 @@ static int config_exosip(int reload)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!globals.codec_ms) {
|
if (!globals.codec_ms) {
|
||||||
globals.codec_ms = 20;
|
globals.codec_ms = 20;
|
||||||
}
|
}
|
||||||
|
@ -1350,11 +1344,11 @@ static int config_exosip(int reload)
|
||||||
set_global_dialplan("default");
|
set_global_dialplan("default");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eXosip_init()) {
|
if (eXosip_init ()) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_init initialization failed!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_init initialization failed!\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
if (eXosip_listen_addr(IPPROTO_UDP, NULL, globals.port, AF_INET, 0)) {
|
if (eXosip_listen_addr (IPPROTO_UDP, NULL, globals.port, AF_INET, 0)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_listen_addr failed!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_listen_addr failed!\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
@ -1377,3 +1371,4 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
config_exosip(0);
|
config_exosip(0);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -77,7 +77,7 @@ typedef enum {
|
||||||
TFLAG_DTMF = (1 << 3),
|
TFLAG_DTMF = (1 << 3),
|
||||||
TFLAG_READING = (1 << 4),
|
TFLAG_READING = (1 << 4),
|
||||||
TFLAG_WRITING = (1 << 5),
|
TFLAG_WRITING = (1 << 5),
|
||||||
TFLAG_USING_CODEC = (1 << 6),
|
TFLAG_USING_CODEC = (1 << 6),
|
||||||
TFLAG_RTP = (1 << 7),
|
TFLAG_RTP = (1 << 7),
|
||||||
TFLAG_BYE = (1 << 8)
|
TFLAG_BYE = (1 << 8)
|
||||||
} TFLAGS;
|
} TFLAGS;
|
||||||
|
@ -103,7 +103,7 @@ static struct {
|
||||||
} globals;
|
} globals;
|
||||||
|
|
||||||
struct private_object {
|
struct private_object {
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
switch_frame read_frame;
|
switch_frame read_frame;
|
||||||
switch_codec read_codec;
|
switch_codec read_codec;
|
||||||
|
@ -116,7 +116,7 @@ struct private_object {
|
||||||
int32_t timestamp_send;
|
int32_t timestamp_send;
|
||||||
int32_t timestamp_recv;
|
int32_t timestamp_recv;
|
||||||
int payload_num;
|
int payload_num;
|
||||||
struct rtp *rtp_session;
|
struct rtp *rtp_session;
|
||||||
struct osip_rfc3264 *sdp_config;
|
struct osip_rfc3264 *sdp_config;
|
||||||
sdp_message_t *remote_sdp;
|
sdp_message_t *remote_sdp;
|
||||||
sdp_message_t *local_sdp;
|
sdp_message_t *local_sdp;
|
||||||
|
@ -151,7 +151,7 @@ static void set_global_dialplan(char *dialplan)
|
||||||
free(globals.dialplan);
|
free(globals.dialplan);
|
||||||
globals.dialplan = NULL;
|
globals.dialplan = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
globals.dialplan = strdup(dialplan);
|
globals.dialplan = strdup(dialplan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,14 +160,11 @@ static switch_status exosip_on_init(switch_core_session *session);
|
||||||
static switch_status exosip_on_hangup(switch_core_session *session);
|
static switch_status exosip_on_hangup(switch_core_session *session);
|
||||||
static switch_status exosip_on_loopback(switch_core_session *session);
|
static switch_status exosip_on_loopback(switch_core_session *session);
|
||||||
static switch_status exosip_on_transmit(switch_core_session *session);
|
static switch_status exosip_on_transmit(switch_core_session *session);
|
||||||
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags);
|
||||||
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags);
|
||||||
switch_io_flag flags);
|
|
||||||
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
|
||||||
switch_io_flag flags);
|
|
||||||
static int config_exosip(int reload);
|
static int config_exosip(int reload);
|
||||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload);
|
static switch_status parse_sdp_media(sdp_media_t *media, char **dname, char **drate, char **dpayload);
|
||||||
static switch_status exosip_kill_channel(switch_core_session *session, int sig);
|
static switch_status exosip_kill_channel(switch_core_session *session, int sig);
|
||||||
static void activate_rtp(struct private_object *tech_pvt);
|
static void activate_rtp(struct private_object *tech_pvt);
|
||||||
static void deactivate_rtp(struct private_object *tech_pvt);
|
static void deactivate_rtp(struct private_object *tech_pvt);
|
||||||
|
@ -220,7 +217,7 @@ static int sdp_add_codec(struct osip_rfc3264 *cnf, int codec_type, int payload,
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -250,7 +247,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
char *dest_uri;
|
char *dest_uri;
|
||||||
switch_codec_interface *codecs[512];
|
switch_codec_interface *codecs[512];
|
||||||
int num_codecs = 0;
|
int num_codecs = 0;
|
||||||
/* do SIP Goodies... */
|
/* do SIP Goodies...*/
|
||||||
|
|
||||||
/* Generate callerid URI */
|
/* Generate callerid URI */
|
||||||
eXosip_guess_localip(AF_INET, localip, 128);
|
eXosip_guess_localip(AF_INET, localip, 128);
|
||||||
|
@ -263,17 +260,14 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
/* Initialize SDP */
|
/* Initialize SDP */
|
||||||
sdp_message_init(&tech_pvt->local_sdp);
|
sdp_message_init(&tech_pvt->local_sdp);
|
||||||
sdp_message_v_version_set(tech_pvt->local_sdp, "0");
|
sdp_message_v_version_set(tech_pvt->local_sdp, "0");
|
||||||
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4",
|
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4", tech_pvt->local_sdp_audio_ip);
|
||||||
tech_pvt->local_sdp_audio_ip);
|
|
||||||
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
||||||
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
||||||
sdp_message_t_time_descr_add(tech_pvt->local_sdp, "0", "0");
|
sdp_message_t_time_descr_add(tech_pvt->local_sdp, "0", "0");
|
||||||
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
||||||
sdp_message_m_media_add(tech_pvt->local_sdp, "audio", port, NULL, "RTP/AVP");
|
sdp_message_m_media_add(tech_pvt->local_sdp, "audio", port, NULL, "RTP/AVP");
|
||||||
/* Add in every codec we support on this outbound call */
|
/* Add in every codec we support on this outbound call */
|
||||||
if ((num_codecs =
|
if ((num_codecs = loadable_module_get_codecs(switch_core_session_get_pool(session), codecs, sizeof(codecs)/sizeof(codecs[0]))) > 0) {
|
||||||
loadable_module_get_codecs(switch_core_session_get_pool(session), codecs,
|
|
||||||
sizeof(codecs) / sizeof(codecs[0]))) > 0) {
|
|
||||||
int i;
|
int i;
|
||||||
static const switch_codec_implementation *imp;
|
static const switch_codec_implementation *imp;
|
||||||
for (i = 0; i < num_codecs; i++) {
|
for (i = 0; i < num_codecs; i++) {
|
||||||
|
@ -281,14 +275,12 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "%i", codecs[i]->ianacode);
|
snprintf(tmp, sizeof(tmp), "%i", codecs[i]->ianacode);
|
||||||
sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp));
|
sdp_message_m_payload_add(tech_pvt->local_sdp, 0, osip_strdup(tmp));
|
||||||
for (imp = codecs[i]->implementations; imp; imp = imp->next) {
|
for (imp = codecs[i]->implementations ; imp ; imp = imp->next) {
|
||||||
/* Add to SDP config */
|
/* Add to SDP config */
|
||||||
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame,
|
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second, x++);
|
||||||
imp->samples_per_second, x++);
|
|
||||||
/* Add to SDP message */
|
/* Add to SDP message */
|
||||||
|
|
||||||
snprintf(tmp, sizeof(tmp), "%i %s/%i", codecs[i]->ianacode, codecs[i]->iananame,
|
snprintf(tmp, sizeof(tmp), "%i %s/%i", codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second);
|
||||||
imp->samples_per_second);
|
|
||||||
sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp));
|
sdp_message_a_attribute_add(tech_pvt->local_sdp, 0, "rtpmap", osip_strdup(tmp));
|
||||||
memset(tmp, 0, sizeof(tmp));
|
memset(tmp, 0, sizeof(tmp));
|
||||||
}
|
}
|
||||||
|
@ -296,9 +288,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
}
|
}
|
||||||
/* Setup our INVITE */
|
/* Setup our INVITE */
|
||||||
eXosip_lock();
|
eXosip_lock();
|
||||||
if (!
|
if (!(dest_uri = (char *) switch_core_session_alloc(session, strlen(tech_pvt->caller_profile->destination_number) + 10))) {
|
||||||
(dest_uri =
|
|
||||||
(char *) switch_core_session_alloc(session, strlen(tech_pvt->caller_profile->destination_number) + 10))) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "AIEEEE!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "AIEEEE!\n");
|
||||||
assert(dest_uri != NULL);
|
assert(dest_uri != NULL);
|
||||||
}
|
}
|
||||||
|
@ -317,7 +307,7 @@ static switch_status exosip_on_init(switch_core_session *session)
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
tech_pvt->did = -1;
|
tech_pvt->did = -1;
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Let Media Work */
|
/* Let Media Work */
|
||||||
|
@ -357,8 +347,8 @@ static switch_status exosip_on_hangup(switch_core_session *session)
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
|
|
||||||
switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
|
switch_core_hash_delete(globals.call_hash, tech_pvt->call_id);
|
||||||
|
|
||||||
|
|
||||||
switch_set_flag(tech_pvt, TFLAG_BYE);
|
switch_set_flag(tech_pvt, TFLAG_BYE);
|
||||||
switch_clear_flag(tech_pvt, TFLAG_IO);
|
switch_clear_flag(tech_pvt, TFLAG_IO);
|
||||||
|
@ -372,8 +362,7 @@ static switch_status exosip_on_hangup(switch_core_session *session)
|
||||||
switch_core_codec_destroy(&tech_pvt->write_codec);
|
switch_core_codec_destroy(&tech_pvt->write_codec);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "EXOSIP HANGUP %s %d/%d=%d\n", switch_channel_get_name(channel),
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "EXOSIP HANGUP %s %d/%d=%d\n", switch_channel_get_name(channel), tech_pvt->cid, tech_pvt->did, i);
|
||||||
tech_pvt->cid, tech_pvt->did, i);
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -389,8 +378,7 @@ static switch_status exosip_on_transmit(switch_core_session *session)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status exosip_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&exosip_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
|
@ -398,8 +386,7 @@ static switch_status exosip_outgoing_channel(switch_core_session *session, switc
|
||||||
switch_caller_profile *caller_profile, *originator_caller_profile = NULL;
|
switch_caller_profile *caller_profile, *originator_caller_profile = NULL;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
switch_core_session_set_private(*new_session, tech_pvt);
|
switch_core_session_set_private(*new_session, tech_pvt);
|
||||||
|
@ -433,7 +420,7 @@ static switch_status exosip_outgoing_channel(switch_core_session *session, switc
|
||||||
switch_channel_set_originator_caller_profile(channel, cloned_profile);
|
switch_channel_set_originator_caller_profile(channel, cloned_profile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_channel_set_flag(channel, CF_OUTBOUND);
|
switch_channel_set_flag(channel, CF_OUTBOUND);
|
||||||
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
||||||
switch_channel_set_state(channel, CS_INIT);
|
switch_channel_set_state(channel, CS_INIT);
|
||||||
|
@ -446,7 +433,7 @@ static switch_status exosip_outgoing_channel(switch_core_session *session, switc
|
||||||
#if 0
|
#if 0
|
||||||
static const char *event_names[] = {
|
static const char *event_names[] = {
|
||||||
"RX_RTP",
|
"RX_RTP",
|
||||||
"RX_SR",
|
"RX_SR",
|
||||||
"RX_RR",
|
"RX_RR",
|
||||||
"RX_SDES",
|
"RX_SDES",
|
||||||
"RX_BYE",
|
"RX_BYE",
|
||||||
|
@ -460,29 +447,30 @@ static const char *event_names[] = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void rtp_event_handler(struct rtp *session, rtp_event * event)
|
static void rtp_event_handler(struct rtp *session, rtp_event *event)
|
||||||
{
|
{
|
||||||
rtp_packet *packet;
|
rtp_packet *packet;
|
||||||
struct private_object *tech_pvt = (struct private_object *) rtp_get_userdata(session);
|
struct private_object *tech_pvt = (struct private_object *) rtp_get_userdata(session);
|
||||||
|
|
||||||
if (!session) {
|
if (!session) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "RTP EVENT (%s)\n", event_names[event->type]);
|
|
||||||
|
|
||||||
switch (event->type) {
|
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "RTP EVENT (%s)\n", event_names[event->type]);
|
||||||
|
|
||||||
|
switch(event->type) {
|
||||||
case RX_RTP:
|
case RX_RTP:
|
||||||
if ((packet = (rtp_packet *) event->data)) {
|
if((packet = (rtp_packet *) event->data)) {
|
||||||
if (packet->data_len < 10000) {
|
if (packet->data_len < 10000) {
|
||||||
memcpy(tech_pvt->read_buf, packet->data, packet->data_len);
|
memcpy(tech_pvt->read_buf, packet->data, packet->data_len);
|
||||||
tech_pvt->read_frame.datalen = packet->data_len;
|
tech_pvt->read_frame.datalen = packet->data_len;
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WTF PACKET LEN %d\n", packet->data_len);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WTF PACKET LEN %d\n", packet->data_len);
|
||||||
}
|
}
|
||||||
free(packet); /* xfree() is mandatory to release RTP packet data */
|
free(packet); /* xfree() is mandatory to release RTP packet data */
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case RR_TIMEOUT:
|
case RR_TIMEOUT:
|
||||||
case RX_BYE:
|
case RX_BYE:
|
||||||
switch_set_flag(tech_pvt, TFLAG_BYE);
|
switch_set_flag(tech_pvt, TFLAG_BYE);
|
||||||
|
@ -497,7 +485,7 @@ static void deactivate_rtp(struct private_object *tech_pvt)
|
||||||
if (tech_pvt->rtp_session) {
|
if (tech_pvt->rtp_session) {
|
||||||
//switch_mutex_lock(tech_pvt->rtp_lock);
|
//switch_mutex_lock(tech_pvt->rtp_lock);
|
||||||
|
|
||||||
while (loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
|
while(loops < 10 && (switch_test_flag(tech_pvt, TFLAG_READING) || switch_test_flag(tech_pvt, TFLAG_WRITING))) {
|
||||||
switch_yield(10000);
|
switch_yield(10000);
|
||||||
loops++;
|
loops++;
|
||||||
}
|
}
|
||||||
|
@ -519,8 +507,9 @@ static void activate_rtp(struct private_object *tech_pvt)
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activating RTP %d->%s:%d\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activating RTP %d->%s:%d\n",
|
||||||
tech_pvt->local_sdp_audio_port,
|
tech_pvt->local_sdp_audio_port,
|
||||||
tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
|
tech_pvt->remote_sdp_audio_ip,
|
||||||
|
tech_pvt->remote_sdp_audio_port);
|
||||||
|
|
||||||
|
|
||||||
//switch_mutex_lock(tech_pvt->rtp_lock);
|
//switch_mutex_lock(tech_pvt->rtp_lock);
|
||||||
|
@ -532,13 +521,13 @@ static void activate_rtp(struct private_object *tech_pvt)
|
||||||
bw *= 8;
|
bw *= 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
tech_pvt->rtp_session = rtp_init(tech_pvt->remote_sdp_audio_ip, /* Host/Group IP address */
|
tech_pvt->rtp_session = rtp_init(tech_pvt->remote_sdp_audio_ip, /* Host/Group IP address */
|
||||||
tech_pvt->local_sdp_audio_port, /* receive port */
|
tech_pvt->local_sdp_audio_port, /* receive port */
|
||||||
tech_pvt->remote_sdp_audio_port, /* transmit port */
|
tech_pvt->remote_sdp_audio_port, /* transmit port */
|
||||||
ms * 2, /* time-to-live */
|
ms * 2, /* time-to-live */
|
||||||
bw, /* B/W estimate */
|
bw, /* B/W estimate */
|
||||||
rtp_event_handler, /* RTP event callback */
|
rtp_event_handler, /* RTP event callback */
|
||||||
(void *) tech_pvt); /* App. specific data */
|
(void *) tech_pvt); /* App. specific data */
|
||||||
|
|
||||||
|
|
||||||
if (tech_pvt->rtp_session) {
|
if (tech_pvt->rtp_session) {
|
||||||
|
@ -548,7 +537,7 @@ static void activate_rtp(struct private_object *tech_pvt)
|
||||||
rtp_set_sdes(tech_pvt->rtp_session, tech_pvt->ssrc, RTCP_SDES_NAME, "test", 4);
|
rtp_set_sdes(tech_pvt->rtp_session, tech_pvt->ssrc, RTCP_SDES_NAME, "test", 4);
|
||||||
rtp_set_sdes(tech_pvt->rtp_session, tech_pvt->ssrc, RTCP_SDES_PHONE, "test", 4);
|
rtp_set_sdes(tech_pvt->rtp_session, tech_pvt->ssrc, RTCP_SDES_PHONE, "test", 4);
|
||||||
rtp_set_sdes(tech_pvt->rtp_session, tech_pvt->ssrc, RTCP_SDES_TOOL, "test", 4);
|
rtp_set_sdes(tech_pvt->rtp_session, tech_pvt->ssrc, RTCP_SDES_TOOL, "test", 4);
|
||||||
switch_set_flag(tech_pvt, TFLAG_RTP);
|
switch_set_flag(tech_pvt, TFLAG_RTP);
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Oh oh is your port even?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Oh oh is your port even?\n");
|
||||||
}
|
}
|
||||||
|
@ -577,23 +566,22 @@ static switch_status exosip_answer_channel(switch_core_session *session)
|
||||||
sdp_message_to_str(tech_pvt->local_sdp, &buf);
|
sdp_message_to_str(tech_pvt->local_sdp, &buf);
|
||||||
osip_message_set_body(answer, buf, strlen(buf));
|
osip_message_set_body(answer, buf, strlen(buf));
|
||||||
osip_message_set_content_type(answer, "application/sdp");
|
osip_message_set_content_type(answer, "application/sdp");
|
||||||
free(buf);
|
free(buf);
|
||||||
eXosip_call_send_answer(tech_pvt->tid, 200, answer);
|
eXosip_call_send_answer(tech_pvt->tid, 200, answer);
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status exosip_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags)
|
||||||
switch_io_flag flags)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
size_t bytes = 0, samples = 0, frames, ms, x;
|
size_t bytes = 0, samples = 0, frames, ms, x;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
int ns = 0;
|
int ns=0;
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
|
@ -628,9 +616,9 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
//switch_mutex_lock(tech_pvt->rtp_lock);
|
//switch_mutex_lock(tech_pvt->rtp_lock);
|
||||||
tv.tv_sec = 0;
|
tv.tv_sec = 0;
|
||||||
tv.tv_usec = ns;
|
tv.tv_usec = ns;
|
||||||
while (switch_test_flag(tech_pvt, TFLAG_IO) && !switch_test_flag(tech_pvt, TFLAG_BYE)) {
|
while(switch_test_flag(tech_pvt, TFLAG_IO) && !switch_test_flag(tech_pvt, TFLAG_BYE)) {
|
||||||
x = rtp_recv(tech_pvt->rtp_session, &tv, tech_pvt->timestamp_recv);
|
x = rtp_recv(tech_pvt->rtp_session, &tv, tech_pvt->timestamp_recv);
|
||||||
if (x < 0) {
|
if(x < 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (tech_pvt->read_frame.datalen) {
|
if (tech_pvt->read_frame.datalen) {
|
||||||
|
@ -641,7 +629,7 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tech_pvt->timestamp_recv += (int) samples;
|
tech_pvt->timestamp_recv += (int)samples;
|
||||||
//printf("%s\trecv %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->read_frame.datalen, samples, frames, ms, tech_pvt->timestamp_recv);
|
//printf("%s\trecv %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->read_frame.datalen, samples, frames, ms, tech_pvt->timestamp_recv);
|
||||||
//switch_mutex_unlock(tech_pvt->rtp_lock);
|
//switch_mutex_unlock(tech_pvt->rtp_lock);
|
||||||
|
|
||||||
|
@ -663,8 +651,7 @@ static switch_status exosip_read_frame(switch_core_session *session, switch_fram
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status exosip_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags)
|
||||||
switch_io_flag flags)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
@ -676,7 +663,7 @@ static switch_status exosip_write_frame(switch_core_session *session, switch_fra
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
if (!switch_test_flag(tech_pvt, TFLAG_RTP)) {
|
if (!switch_test_flag(tech_pvt, TFLAG_RTP)) {
|
||||||
activate_rtp(tech_pvt);
|
activate_rtp(tech_pvt);
|
||||||
}
|
}
|
||||||
|
@ -701,14 +688,16 @@ static switch_status exosip_write_frame(switch_core_session *session, switch_fra
|
||||||
} else {
|
} else {
|
||||||
assert(0);
|
assert(0);
|
||||||
}
|
}
|
||||||
tech_pvt->timestamp_send += (int) samples;
|
tech_pvt->timestamp_send += (int)samples;
|
||||||
|
|
||||||
|
|
||||||
//printf("%s %s->%s send %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, ms, tech_pvt->timestamp_recv);
|
//printf("%s %s->%s send %d bytes %d samples in %d frames taking up %d ms ts=%d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, tech_pvt->remote_sdp_audio_ip, frame->datalen, samples, frames, ms, tech_pvt->timestamp_recv);
|
||||||
|
|
||||||
rtp_send_ctrl(tech_pvt->rtp_session, tech_pvt->timestamp_send, NULL);
|
rtp_send_ctrl(tech_pvt->rtp_session, tech_pvt->timestamp_send, NULL);
|
||||||
x = rtp_send_data(tech_pvt->rtp_session, tech_pvt->timestamp_send, tech_pvt->payload_num,
|
x = rtp_send_data(tech_pvt->rtp_session, tech_pvt->timestamp_send, tech_pvt->payload_num,
|
||||||
0, 0, 0, (char *) frame->data, (int) frame->datalen, 0, 0, 0);
|
0, 0, 0,
|
||||||
|
(char *)frame->data, (int)frame->datalen,
|
||||||
|
0, 0, 0);
|
||||||
|
|
||||||
|
|
||||||
switch_clear_flag(tech_pvt, TFLAG_WRITING);
|
switch_clear_flag(tech_pvt, TFLAG_WRITING);
|
||||||
|
@ -763,45 +752,45 @@ static switch_status exosip_waitfor_write(switch_core_session *session, int ms)
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_io_routines exosip_io_routines = {
|
static const switch_io_routines exosip_io_routines = {
|
||||||
/*.outgoing_channel */ exosip_outgoing_channel,
|
/*.outgoing_channel*/ exosip_outgoing_channel,
|
||||||
/*.answer_channel */ exosip_answer_channel,
|
/*.answer_channel*/ exosip_answer_channel,
|
||||||
/*.read_frame */ exosip_read_frame,
|
/*.read_frame*/ exosip_read_frame,
|
||||||
/*.write_frame */ exosip_write_frame,
|
/*.write_frame*/ exosip_write_frame,
|
||||||
/*.kill_channel */ exosip_kill_channel,
|
/*.kill_channel*/ exosip_kill_channel,
|
||||||
/*.waitfor_read */ exosip_waitfor_read,
|
/*.waitfor_read*/ exosip_waitfor_read,
|
||||||
/*.waitfor_read */ exosip_waitfor_write
|
/*.waitfor_read*/ exosip_waitfor_write
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_event_handler_table exosip_event_handlers = {
|
static const switch_event_handler_table exosip_event_handlers = {
|
||||||
/*.on_init */ exosip_on_init,
|
/*.on_init*/ exosip_on_init,
|
||||||
/*.on_ring */ exosip_on_ring,
|
/*.on_ring*/ exosip_on_ring,
|
||||||
/*.on_execute */ exosip_on_execute,
|
/*.on_execute*/ exosip_on_execute,
|
||||||
/*.on_hangup */ exosip_on_hangup,
|
/*.on_hangup*/ exosip_on_hangup,
|
||||||
/*.on_loopback */ exosip_on_loopback,
|
/*.on_loopback*/ exosip_on_loopback,
|
||||||
/*.on_transmit */ exosip_on_transmit
|
/*.on_transmit*/ exosip_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface exosip_endpoint_interface = {
|
static const switch_endpoint_interface exosip_endpoint_interface = {
|
||||||
/*.interface_name */ "exosip",
|
/*.interface_name*/ "exosip",
|
||||||
/*.io_routines */ &exosip_io_routines,
|
/*.io_routines*/ &exosip_io_routines,
|
||||||
/*.event_handlers */ &exosip_event_handlers,
|
/*.event_handlers*/ &exosip_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface exosip_module_interface = {
|
static const switch_loadable_module_interface exosip_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &exosip_endpoint_interface,
|
/*.endpoint_interface*/ &exosip_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -809,7 +798,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
{
|
{
|
||||||
if (globals.running) {
|
if (globals.running) {
|
||||||
globals.running = -1;
|
globals.running = -1;
|
||||||
while (globals.running) {
|
while(globals.running) {
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -817,16 +806,14 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **_interface,
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **_interface, char *filename) {
|
||||||
char *filename)
|
|
||||||
{
|
|
||||||
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
/* NOTE: **interface is **_interface because the common lib redefines interface to struct in some situations */
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*_interface = &exosip_module_interface;
|
*_interface = &exosip_module_interface;
|
||||||
|
|
||||||
|
@ -834,7 +821,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status exosip_create_call(eXosip_event_t * event)
|
static switch_status exosip_create_call(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
sdp_message_t *remote_sdp = NULL;
|
sdp_message_t *remote_sdp = NULL;
|
||||||
|
@ -864,13 +851,14 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
switch_core_session_destroy(&session);
|
switch_core_session_destroy(&session);
|
||||||
return SWITCH_STATUS_MEMERR;
|
return SWITCH_STATUS_MEMERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
globals.dialplan,
|
globals.dialplan,
|
||||||
event->request->from->displayname,
|
event->request->from->displayname,
|
||||||
event->request->from->url->username,
|
event->request->from->url->username,
|
||||||
event->request->from->url->username,
|
event->request->from->url->username,
|
||||||
NULL, event->request->req_uri->username))) {
|
NULL,
|
||||||
|
event->request->req_uri->username))) {
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -881,7 +869,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "Exosip/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
|
snprintf(name, sizeof(name), "Exosip/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
|
||||||
switch_channel_set_name(channel, name);
|
switch_channel_set_name(channel, name);
|
||||||
|
|
||||||
if (!(remote_sdp = eXosip_get_sdp_info(event->request))) {
|
if (!(remote_sdp = eXosip_get_sdp_info(event->request))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Find Remote SDP!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Find Remote SDP!\n");
|
||||||
exosip_on_hangup(session);
|
exosip_on_hangup(session);
|
||||||
|
@ -893,18 +881,15 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
tech_pvt->local_sdp_audio_port = next_rtp_port();
|
tech_pvt->local_sdp_audio_port = next_rtp_port();
|
||||||
osip_rfc3264_init(&tech_pvt->sdp_config);
|
osip_rfc3264_init(&tech_pvt->sdp_config);
|
||||||
/* Add in what codecs we support locally */
|
/* Add in what codecs we support locally */
|
||||||
|
|
||||||
if ((num_codecs =
|
if ((num_codecs = loadable_module_get_codecs(switch_core_session_get_pool(session), codecs, sizeof(codecs)/sizeof(codecs[0]))) > 0) {
|
||||||
loadable_module_get_codecs(switch_core_session_get_pool(session), codecs,
|
|
||||||
sizeof(codecs) / sizeof(codecs[0]))) > 0) {
|
|
||||||
int i;
|
int i;
|
||||||
static const switch_codec_implementation *imp;
|
static const switch_codec_implementation *imp;
|
||||||
|
|
||||||
for (i = 0; i < num_codecs; i++) {
|
for (i = 0; i < num_codecs; i++) {
|
||||||
int x = 0;
|
int x = 0;
|
||||||
for (imp = codecs[i]->implementations; imp; imp = imp->next) {
|
for (imp = codecs[i]->implementations ; imp ; imp = imp->next) {
|
||||||
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame,
|
sdp_add_codec(tech_pvt->sdp_config, codecs[i]->codec_type, codecs[i]->ianacode, codecs[i]->iananame, imp->samples_per_second, x++);
|
||||||
imp->samples_per_second, x++);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -913,18 +898,17 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
sdp_message_parse(tech_pvt->local_sdp, local_sdp_str);
|
sdp_message_parse(tech_pvt->local_sdp, local_sdp_str);
|
||||||
|
|
||||||
sdp_message_to_str(remote_sdp, &remote_sdp_str);
|
sdp_message_to_str(remote_sdp, &remote_sdp_str);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str, remote_sdp_str);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "LOCAL SDP:\n%s\nREMOTE SDP:\n%s", local_sdp_str,remote_sdp_str);
|
||||||
|
|
||||||
mline = 0;
|
mline = 0;
|
||||||
while (0 == osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {
|
while (0==osip_rfc3264_match(tech_pvt->sdp_config, remote_sdp, audio_tab, video_tab, t38_tab, app_tab, mline)) {
|
||||||
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) {
|
if (audio_tab[0] == NULL && video_tab[0] == NULL && t38_tab[0] == NULL && app_tab[0] == NULL) {
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got no compatible codecs!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Got no compatible codecs!\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
for (pos = 0; audio_tab[pos] != NULL; pos++) {
|
for (pos=0; audio_tab[pos]!=NULL; pos++) {
|
||||||
osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos],
|
osip_rfc3264_complete_answer(tech_pvt->sdp_config, remote_sdp, tech_pvt->local_sdp, audio_tab[pos], mline);
|
||||||
mline);
|
|
||||||
if (parse_sdp_media(audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
|
if (parse_sdp_media(audio_tab[pos], &dname, &drate, &dpayload) == SWITCH_STATUS_SUCCESS) {
|
||||||
tech_pvt->payload_num = atoi(dpayload);
|
tech_pvt->payload_num = atoi(dpayload);
|
||||||
break;
|
break;
|
||||||
|
@ -933,8 +917,7 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
mline++;
|
mline++;
|
||||||
}
|
}
|
||||||
free(remote_sdp_str);
|
free(remote_sdp_str);
|
||||||
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4",
|
sdp_message_o_origin_set(tech_pvt->local_sdp, "OpenSWITCH2", "0", "0", "IN", "IP4", tech_pvt->local_sdp_audio_ip);
|
||||||
tech_pvt->local_sdp_audio_ip);
|
|
||||||
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
sdp_message_s_name_set(tech_pvt->local_sdp, "SIP Call");
|
||||||
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
sdp_message_c_connection_add(tech_pvt->local_sdp, -1, "IN", "IP4", tech_pvt->local_sdp_audio_ip, NULL, NULL);
|
||||||
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
snprintf(port, sizeof(port), "%i", tech_pvt->local_sdp_audio_port);
|
||||||
|
@ -945,9 +928,9 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
snprintf(tech_pvt->remote_sdp_audio_ip, 50, conn->c_addr);
|
snprintf(tech_pvt->remote_sdp_audio_ip, 50, conn->c_addr);
|
||||||
|
|
||||||
tech_pvt->remote_sdp_audio_port = atoi(remote_med->m_port);
|
tech_pvt->remote_sdp_audio_port = atoi(remote_med->m_port);
|
||||||
|
|
||||||
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", event->cid);
|
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", event->cid);
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
|
|
||||||
if (!dname) {
|
if (!dname) {
|
||||||
exosip_on_hangup(session);
|
exosip_on_hangup(session);
|
||||||
|
@ -962,21 +945,21 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
int rate = atoi(drate);
|
int rate = atoi(drate);
|
||||||
|
|
||||||
if (switch_core_codec_init(&tech_pvt->read_codec,
|
if (switch_core_codec_init(&tech_pvt->read_codec,
|
||||||
dname,
|
dname,
|
||||||
rate,
|
rate,
|
||||||
globals.codec_ms,
|
globals.codec_ms,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL) != SWITCH_STATUS_SUCCESS) {
|
NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
} else {
|
} else {
|
||||||
if (switch_core_codec_init(&tech_pvt->write_codec,
|
if (switch_core_codec_init(&tech_pvt->write_codec,
|
||||||
dname,
|
dname,
|
||||||
rate,
|
rate,
|
||||||
globals.codec_ms,
|
globals.codec_ms,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL) != SWITCH_STATUS_SUCCESS) {
|
NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
@ -984,15 +967,14 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
int ms;
|
int ms;
|
||||||
switch_set_flag(tech_pvt, TFLAG_USING_CODEC);
|
switch_set_flag(tech_pvt, TFLAG_USING_CODEC);
|
||||||
ms = tech_pvt->write_codec.implementation->nanoseconds_per_frame / 1000;
|
ms = tech_pvt->write_codec.implementation->nanoseconds_per_frame / 1000;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Inbound Codec %s/%d %d ms\n", dname, rate,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Inbound Codec %s/%d %d ms\n", dname, rate, ms);
|
||||||
ms);
|
|
||||||
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
||||||
switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
|
switch_core_session_set_read_codec(session, &tech_pvt->read_codec);
|
||||||
switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
|
switch_core_session_set_write_codec(session, &tech_pvt->write_codec);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_core_session_thread_launch(session);
|
switch_core_session_thread_launch(session);
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Create new Inbound Channel!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Cannot Create new Inbound Channel!\n");
|
||||||
|
@ -1005,14 +987,13 @@ static switch_status exosip_create_call(eXosip_event_t * event)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void destroy_call_by_event(eXosip_event_t * event)
|
static void destroy_call_by_event(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
|
||||||
if (!(tech_pvt = get_pvt_by_call_id(event->cid))) {
|
if (!(tech_pvt = get_pvt_by_call_id(event->cid))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Um in case you are interested, Can't find the pvt [%d]!\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Um in case you are interested, Can't find the pvt [%d]!\n", event->cid);
|
||||||
event->cid);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1022,10 +1003,10 @@ static void destroy_call_by_event(eXosip_event_t * event)
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "destroy %s\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "destroy %s\n", switch_channel_get_name(channel));
|
||||||
exosip_kill_channel(tech_pvt->session, SWITCH_SIG_KILL);
|
exosip_kill_channel(tech_pvt->session, SWITCH_SIG_KILL);
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **drate, char **dpayload)
|
static switch_status parse_sdp_media(sdp_media_t *media, char **dname, char **drate, char **dpayload)
|
||||||
{
|
{
|
||||||
int pos = 0;
|
int pos = 0;
|
||||||
sdp_attribute_t *attr = NULL;
|
sdp_attribute_t *attr = NULL;
|
||||||
|
@ -1033,7 +1014,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
switch_status status = SWITCH_STATUS_GENERR;
|
switch_status status = SWITCH_STATUS_GENERR;
|
||||||
|
|
||||||
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
while (osip_list_eol(media->a_attributes, pos) == 0) {
|
||||||
attr = (sdp_attribute_t *) osip_list_get(media->a_attributes, pos);
|
attr = (sdp_attribute_t *)osip_list_get(media->a_attributes, pos);
|
||||||
if (attr != NULL && strcasecmp(attr->a_att_field, "rtpmap") == 0) {
|
if (attr != NULL && strcasecmp(attr->a_att_field, "rtpmap") == 0) {
|
||||||
payload = attr->a_att_value;
|
payload = attr->a_att_value;
|
||||||
if ((name = strchr(payload, ' '))) {
|
if ((name = strchr(payload, ' '))) {
|
||||||
|
@ -1054,8 +1035,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
*dname = strdup("L16");
|
*dname = strdup("L16");
|
||||||
*drate = strdup("8000");
|
*drate = strdup("8000");
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Found negotiated codec Payload: %s Name: %s Rate: %s\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Found negotiated codec Payload: %s Name: %s Rate: %s\n", *dpayload, *dname, *drate);
|
||||||
*dpayload, *dname, *drate);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
attr = NULL;
|
attr = NULL;
|
||||||
|
@ -1065,7 +1045,7 @@ static switch_status parse_sdp_media(sdp_media_t * media, char **dname, char **d
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void handle_answer(eXosip_event_t * event)
|
static void handle_answer(eXosip_event_t *event)
|
||||||
{
|
{
|
||||||
osip_message_t *ack = NULL;
|
osip_message_t *ack = NULL;
|
||||||
sdp_message_t *remote_sdp = NULL;
|
sdp_message_t *remote_sdp = NULL;
|
||||||
|
@ -1113,22 +1093,18 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
/* Assign them thar IDs */
|
/* Assign them thar IDs */
|
||||||
tech_pvt->did = event->did;
|
tech_pvt->did = event->did;
|
||||||
tech_pvt->tid = event->tid;
|
tech_pvt->tid = event->tid;
|
||||||
|
|
||||||
|
|
||||||
if (1) {
|
if (1) {
|
||||||
int rate = atoi(drate);
|
int rate = atoi(drate);
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_codec_init
|
if (switch_core_codec_init(&tech_pvt->read_codec, dname, rate, globals.codec_ms, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
(&tech_pvt->read_codec, dname, rate, globals.codec_ms, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
|
||||||
NULL) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
if (switch_core_codec_init
|
if (switch_core_codec_init(&tech_pvt->write_codec, dname, rate, globals.codec_ms, SWITCH_CODEC_FLAG_ENCODE |SWITCH_CODEC_FLAG_DECODE, NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
(&tech_pvt->write_codec, dname, rate, globals.codec_ms,
|
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return;
|
return;
|
||||||
|
@ -1149,7 +1125,7 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
eXosip_call_build_ack(event->did, &ack);
|
eXosip_call_build_ack(event->did, &ack);
|
||||||
eXosip_call_send_ack(event->did, ack);
|
eXosip_call_send_ack(event->did, ack);
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
|
|
||||||
free(dname);
|
free(dname);
|
||||||
free(drate);
|
free(drate);
|
||||||
free(dpayload);
|
free(dpayload);
|
||||||
|
@ -1161,119 +1137,133 @@ static void handle_answer(eXosip_event_t * event)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void log_event(eXosip_event_t * je)
|
static void log_event(eXosip_event_t *je)
|
||||||
{
|
{
|
||||||
char buf[100];
|
char buf[100];
|
||||||
|
|
||||||
buf[0] = '\0';
|
buf[0] = '\0';
|
||||||
if (je->type == EXOSIP_CALL_NOANSWER) {
|
if (je->type == EXOSIP_CALL_NOANSWER) {
|
||||||
snprintf(buf, 99, "<- (%i %i) No answer", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) No answer", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_CALL_CLOSED) {
|
} else if (je->type == EXOSIP_CALL_CLOSED) {
|
||||||
snprintf(buf, 99, "<- (%i %i) Call Closed", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) Call Closed", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_CALL_RELEASED) {
|
} else if (je->type == EXOSIP_CALL_RELEASED) {
|
||||||
snprintf(buf, 99, "<- (%i %i) Call released", je->cid, je->did);
|
snprintf (buf, 99, "<- (%i %i) Call released", je->cid, je->did);
|
||||||
} else if (je->type == EXOSIP_MESSAGE_NEW && je->request != NULL && MSG_IS_MESSAGE(je->request)) {
|
} else if (je->type == EXOSIP_MESSAGE_NEW
|
||||||
|
&& je->request!=NULL && MSG_IS_MESSAGE(je->request)) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
if (je->request != NULL) {
|
if (je->request != NULL) {
|
||||||
osip_body_t *body;
|
osip_body_t *body;
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
|
|
||||||
osip_message_get_body(je->request, 0, &body);
|
osip_message_get_body (je->request, 0, &body);
|
||||||
if (body != NULL && body->body != NULL) {
|
if (body != NULL && body->body != NULL) {
|
||||||
snprintf(buf, 99, "<- (%i) from: %s TEXT: %s", je->tid, tmp, body->body);
|
snprintf (buf, 99, "<- (%i) from: %s TEXT: %s",
|
||||||
|
je->tid, tmp, body->body);
|
||||||
}
|
}
|
||||||
osip_free(tmp);
|
osip_free (tmp);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (%i) New event for unknown request?", je->tid);
|
snprintf (buf, 99, "<- (%i) New event for unknown request?", je->tid);
|
||||||
}
|
}
|
||||||
} else if (je->type == EXOSIP_MESSAGE_NEW) {
|
} else if (je->type == EXOSIP_MESSAGE_NEW) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) %s from: %s", je->tid, je->request->sip_method, tmp);
|
snprintf (buf, 99, "<- (%i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->tid, je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->type == EXOSIP_MESSAGE_PROCEEDING
|
} else if (je->type == EXOSIP_MESSAGE_PROCEEDING
|
||||||
|| je->type == EXOSIP_MESSAGE_ANSWERED
|
|| je->type == EXOSIP_MESSAGE_ANSWERED
|
||||||
|| je->type == EXOSIP_MESSAGE_REDIRECTED
|
|| je->type == EXOSIP_MESSAGE_REDIRECTED
|
||||||
|| je->type == EXOSIP_MESSAGE_REQUESTFAILURE
|
|| je->type == EXOSIP_MESSAGE_REQUESTFAILURE
|
||||||
|| je->type == EXOSIP_MESSAGE_SERVERFAILURE || je->type == EXOSIP_MESSAGE_GLOBALFAILURE) {
|
|| je->type == EXOSIP_MESSAGE_SERVERFAILURE
|
||||||
|
|| je->type == EXOSIP_MESSAGE_GLOBALFAILURE) {
|
||||||
if (je->response != NULL && je->request != NULL) {
|
if (je->response != NULL && je->request != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_to_to_str(je->request->to, &tmp);
|
osip_to_to_str (je->request->to, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s for %s] to: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s for %s] to: %s",
|
||||||
je->tid, je->response->status_code, je->response->reason_phrase, je->request->sip_method, tmp);
|
je->tid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->request != NULL) {
|
} else if (je->request != NULL) {
|
||||||
snprintf(buf, 99, "<- (%i) Error for %s request", je->tid, je->request->sip_method);
|
snprintf (buf, 99, "<- (%i) Error for %s request",
|
||||||
|
je->tid, je->request->sip_method);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (%i) Error for unknown request", je->tid);
|
snprintf (buf, 99, "<- (%i) Error for unknown request", je->tid);
|
||||||
}
|
}
|
||||||
} else if (je->response == NULL && je->request != NULL && je->cid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->cid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i %i) %s from: %s", je->cid, je->did, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i %i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->cid, je->did, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->cid > 0) {
|
} else if (je->response != NULL && je->cid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_to_to_str(je->request->to, &tmp);
|
osip_to_to_str (je->request->to, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i %i) [%i %s] for %s to: %s",
|
snprintf (buf, 99, "<- (%i %i) [%i %s] for %s to: %s",
|
||||||
je->cid, je->did, je->response->status_code,
|
je->cid, je->did, je->response->status_code,
|
||||||
je->response->reason_phrase, je->request->sip_method, tmp);
|
je->response->reason_phrase, je->request->sip_method, tmp);
|
||||||
osip_free(tmp);
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL && je->rid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->rid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) %s from: %s", je->rid, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i) %s from: %s",
|
||||||
osip_free(tmp);
|
je->rid, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->rid > 0) {
|
} else if (je->response != NULL && je->rid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s] from: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s] from: %s",
|
||||||
je->rid, je->response->status_code, je->response->reason_phrase, tmp);
|
je->rid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL && je->sid > 0) {
|
} else if (je->response == NULL && je->request != NULL && je->sid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
char *stat = NULL;
|
char *stat = NULL;
|
||||||
osip_header_t *sub_state;
|
osip_header_t *sub_state;
|
||||||
|
|
||||||
osip_message_header_get_byname(je->request, "subscription-state", 0, &sub_state);
|
osip_message_header_get_byname (je->request, "subscription-state",
|
||||||
|
0, &sub_state);
|
||||||
if (sub_state != NULL && sub_state->hvalue != NULL)
|
if (sub_state != NULL && sub_state->hvalue != NULL)
|
||||||
stat = sub_state->hvalue;
|
stat = sub_state->hvalue;
|
||||||
|
|
||||||
osip_uri_to_str(je->request->from->url, &tmp);
|
osip_uri_to_str (je->request->from->url, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%s] %s from: %s", je->sid, stat, je->request->cseq->method, tmp);
|
snprintf (buf, 99, "<- (%i) [%s] %s from: %s",
|
||||||
osip_free(tmp);
|
je->sid, stat, je->request->cseq->method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL && je->sid > 0) {
|
} else if (je->response != NULL && je->sid > 0) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_uri_to_str(je->request->to->url, &tmp);
|
osip_uri_to_str (je->request->to->url, &tmp);
|
||||||
snprintf(buf, 99, "<- (%i) [%i %s] from: %s",
|
snprintf (buf, 99, "<- (%i) [%i %s] from: %s",
|
||||||
je->sid, je->response->status_code, je->response->reason_phrase, tmp);
|
je->sid, je->response->status_code,
|
||||||
osip_free(tmp);
|
je->response->reason_phrase, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response == NULL && je->request != NULL) {
|
} else if (je->response == NULL && je->request != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) %s from: %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) %s from: %s",
|
||||||
je->cid, je->did, je->sid, je->nid, je->request->sip_method, tmp);
|
je->cid, je->did, je->sid, je->nid,
|
||||||
osip_free(tmp);
|
je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else if (je->response != NULL) {
|
} else if (je->response != NULL) {
|
||||||
char *tmp = NULL;
|
char *tmp = NULL;
|
||||||
|
|
||||||
osip_from_to_str(je->request->from, &tmp);
|
osip_from_to_str (je->request->from, &tmp);
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) [%i %s] for %s from: %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i) [%i %s] for %s from: %s",
|
||||||
je->cid, je->did, je->sid, je->nid,
|
je->cid, je->did, je->sid, je->nid,
|
||||||
je->response->status_code, je->response->reason_phrase, je->request->sip_method, tmp);
|
je->response->status_code, je->response->reason_phrase,
|
||||||
osip_free(tmp);
|
je->request->sip_method, tmp);
|
||||||
|
osip_free (tmp);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf, 99, "<- (c=%i|d=%i|s=%i|n=%i|t=%i) %s",
|
snprintf (buf, 99, "<- (c=%i|d=%i|s=%i|n=%i|t=%i) %s",
|
||||||
je->cid, je->did, je->sid, je->nid, je->tid, je->textinfo);
|
je->cid, je->did, je->sid, je->nid, je->tid, je->textinfo);
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\n%s\n", buf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\n%s\n", buf);
|
||||||
/* Print it out */
|
/* Print it out */
|
||||||
|
@ -1284,21 +1274,21 @@ static void log_event(eXosip_event_t * je)
|
||||||
static void *monitor_thread_run(void)
|
static void *monitor_thread_run(void)
|
||||||
{
|
{
|
||||||
eXosip_event_t *event = NULL;
|
eXosip_event_t *event = NULL;
|
||||||
|
|
||||||
globals.running = 1;
|
globals.running = 1;
|
||||||
while (globals.running > 0) {
|
while (globals.running > 0) {
|
||||||
if (!(event = eXosip_event_wait(0, 100))) {
|
if (!(event = eXosip_event_wait(0,100))) {
|
||||||
switch_yield(100);
|
switch_yield(100);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
eXosip_lock();
|
eXosip_lock();
|
||||||
eXosip_automatic_action();
|
eXosip_automatic_action ();
|
||||||
eXosip_unlock();
|
eXosip_unlock();
|
||||||
|
|
||||||
log_event(event);
|
log_event(event);
|
||||||
|
|
||||||
switch (event->type) {
|
switch(event->type) {
|
||||||
case EXOSIP_CALL_INVITE:
|
case EXOSIP_CALL_INVITE:
|
||||||
exosip_create_call(event);
|
exosip_create_call(event);
|
||||||
break;
|
break;
|
||||||
|
@ -1370,7 +1360,7 @@ static void *monitor_thread_run(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int config_exosip(int reload)
|
static int config_exosip(int reload)
|
||||||
{
|
{
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
|
@ -1404,7 +1394,7 @@ static int config_exosip(int reload)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!globals.codec_ms) {
|
if (!globals.codec_ms) {
|
||||||
globals.codec_ms = 20;
|
globals.codec_ms = 20;
|
||||||
}
|
}
|
||||||
|
@ -1419,11 +1409,11 @@ static int config_exosip(int reload)
|
||||||
set_global_dialplan("default");
|
set_global_dialplan("default");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (eXosip_init()) {
|
if (eXosip_init ()) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_init initialization failed!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_init initialization failed!\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
if (eXosip_listen_addr(IPPROTO_UDP, NULL, globals.port, AF_INET, 0)) {
|
if (eXosip_listen_addr (IPPROTO_UDP, NULL, globals.port, AF_INET, 0)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_listen_addr failed!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "eXosip_listen_addr failed!\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
@ -1446,3 +1436,4 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
config_exosip(0);
|
config_exosip(0);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,7 +83,7 @@ struct private_object {
|
||||||
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
struct iax_session *iax_session;
|
struct iax_session *iax_session;
|
||||||
switch_caller_profile *caller_profile;
|
switch_caller_profile *caller_profile;
|
||||||
unsigned int codec;
|
unsigned int codec;
|
||||||
unsigned int codecs;
|
unsigned int codecs;
|
||||||
unsigned short samprate;
|
unsigned short samprate;
|
||||||
|
@ -92,21 +92,19 @@ struct private_object {
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, globals.codec_string)
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_rates_string, globals.codec_rates_string)
|
||||||
|
|
||||||
|
|
||||||
static char *IAXNAMES[] =
|
static char *IAXNAMES[] = {"IAX_EVENT_CONNECT","IAX_EVENT_ACCEPT","IAX_EVENT_HANGUP","IAX_EVENT_REJECT","IAX_EVENT_VOICE",
|
||||||
{ "IAX_EVENT_CONNECT", "IAX_EVENT_ACCEPT", "IAX_EVENT_HANGUP", "IAX_EVENT_REJECT", "IAX_EVENT_VOICE",
|
"IAX_EVENT_DTMF","IAX_EVENT_TIMEOUT","IAX_EVENT_LAGRQ","IAX_EVENT_LAGRP","IAX_EVENT_RINGA",
|
||||||
"IAX_EVENT_DTMF", "IAX_EVENT_TIMEOUT", "IAX_EVENT_LAGRQ", "IAX_EVENT_LAGRP", "IAX_EVENT_RINGA",
|
"IAX_EVENT_PING","IAX_EVENT_PONG","IAX_EVENT_BUSY","IAX_EVENT_ANSWER","IAX_EVENT_IMAGE",
|
||||||
"IAX_EVENT_PING", "IAX_EVENT_PONG", "IAX_EVENT_BUSY", "IAX_EVENT_ANSWER", "IAX_EVENT_IMAGE",
|
"IAX_EVENT_AUTHRQ","IAX_EVENT_AUTHRP","IAX_EVENT_REGREQ","IAX_EVENT_REGACK",
|
||||||
"IAX_EVENT_AUTHRQ", "IAX_EVENT_AUTHRP", "IAX_EVENT_REGREQ", "IAX_EVENT_REGACK",
|
"IAX_EVENT_URL","IAX_EVENT_LDCOMPLETE","IAX_EVENT_TRANSFER","IAX_EVENT_DPREQ",
|
||||||
"IAX_EVENT_URL", "IAX_EVENT_LDCOMPLETE", "IAX_EVENT_TRANSFER", "IAX_EVENT_DPREQ",
|
"IAX_EVENT_DPREP","IAX_EVENT_DIAL","IAX_EVENT_QUELCH","IAX_EVENT_UNQUELCH",
|
||||||
"IAX_EVENT_DPREP", "IAX_EVENT_DIAL", "IAX_EVENT_QUELCH", "IAX_EVENT_UNQUELCH",
|
"IAX_EVENT_UNLINK","IAX_EVENT_LINKREJECT","IAX_EVENT_TEXT","IAX_EVENT_REGREJ",
|
||||||
"IAX_EVENT_UNLINK", "IAX_EVENT_LINKREJECT", "IAX_EVENT_TEXT", "IAX_EVENT_REGREJ",
|
"IAX_EVENT_LINKURL","IAX_EVENT_CNG","IAX_EVENT_REREQUEST","IAX_EVENT_TXREPLY",
|
||||||
"IAX_EVENT_LINKURL", "IAX_EVENT_CNG", "IAX_EVENT_REREQUEST", "IAX_EVENT_TXREPLY",
|
"IAX_EVENT_TXREJECT","IAX_EVENT_TXACCEPT","IAX_EVENT_TXREADY"};
|
||||||
"IAX_EVENT_TXREJECT", "IAX_EVENT_TXACCEPT", "IAX_EVENT_TXREADY"
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
struct ast_iana {
|
struct ast_iana {
|
||||||
|
@ -116,30 +114,31 @@ struct ast_iana {
|
||||||
};
|
};
|
||||||
|
|
||||||
//999 means it's wrong nad i dont know the real one
|
//999 means it's wrong nad i dont know the real one
|
||||||
static struct ast_iana AST_IANA[] = { {AST_FORMAT_G723_1, 4, "g723.1"},
|
static struct ast_iana AST_IANA[] =
|
||||||
{AST_FORMAT_GSM, 3, "gsm"},
|
{{AST_FORMAT_G723_1, 4, "g723.1"},
|
||||||
{AST_FORMAT_ULAW, 0, "ulaw"},
|
{AST_FORMAT_GSM, 3, "gsm"},
|
||||||
{AST_FORMAT_ALAW, 8, "alaw"},
|
{AST_FORMAT_ULAW, 0, "ulaw"},
|
||||||
{AST_FORMAT_G726, 999, "g726"},
|
{AST_FORMAT_ALAW, 8, "alaw"},
|
||||||
{AST_FORMAT_ADPCM, 999, "adpcm"},
|
{AST_FORMAT_G726, 999, "g726"},
|
||||||
{AST_FORMAT_SLINEAR, 10, "slinear"},
|
{AST_FORMAT_ADPCM, 999, "adpcm"},
|
||||||
{AST_FORMAT_LPC10, 7, "lpc10"},
|
{AST_FORMAT_SLINEAR, 10, "slinear"},
|
||||||
{AST_FORMAT_G729A, 18, "g729"},
|
{AST_FORMAT_LPC10, 7, "lpc10"},
|
||||||
{AST_FORMAT_SPEEX, 98, "speex"},
|
{AST_FORMAT_G729A, 18, "g729"},
|
||||||
{AST_FORMAT_ILBC, 999, "ilbc"},
|
{AST_FORMAT_SPEEX, 98, "speex"},
|
||||||
{AST_FORMAT_MAX_AUDIO, 999, ""},
|
{AST_FORMAT_ILBC, 999, "ilbc"},
|
||||||
{AST_FORMAT_JPEG, 999, ""},
|
{AST_FORMAT_MAX_AUDIO, 999, ""},
|
||||||
{AST_FORMAT_PNG, 999, ""},
|
{AST_FORMAT_JPEG, 999, ""},
|
||||||
{AST_FORMAT_H261, 999, ""},
|
{AST_FORMAT_PNG, 999, ""},
|
||||||
{AST_FORMAT_H263, 999, ""},
|
{AST_FORMAT_H261, 999, ""},
|
||||||
{AST_FORMAT_MAX_VIDEO, 999, ""},
|
{AST_FORMAT_H263, 999, ""},
|
||||||
{0, 0}
|
{AST_FORMAT_MAX_VIDEO, 999, ""},
|
||||||
};
|
{0,0}
|
||||||
|
};
|
||||||
|
|
||||||
static char *ast2str(unsigned int ast)
|
static char *ast2str(unsigned int ast)
|
||||||
{
|
{
|
||||||
int x;
|
int x;
|
||||||
for (x = 0; x < 32; x++) {
|
for(x = 0; x < 32; x++) {
|
||||||
if ((1 << x) == ast) {
|
if ((1 << x) == ast) {
|
||||||
return AST_IANA[x].name;
|
return AST_IANA[x].name;
|
||||||
}
|
}
|
||||||
|
@ -152,7 +151,7 @@ static unsigned int iana2ast(int iana)
|
||||||
int x = 0;
|
int x = 0;
|
||||||
unsigned int ast = 0;
|
unsigned int ast = 0;
|
||||||
|
|
||||||
for (x = 0; AST_IANA[x].ast; x++) {
|
for(x = 0; AST_IANA[x].ast; x++) {
|
||||||
if (AST_IANA[x].iana == iana) {
|
if (AST_IANA[x].iana == iana) {
|
||||||
ast = AST_IANA[x].ast;
|
ast = AST_IANA[x].ast;
|
||||||
break;
|
break;
|
||||||
|
@ -162,11 +161,11 @@ static unsigned int iana2ast(int iana)
|
||||||
return ast;
|
return ast;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned short iax_build_codec_rates(void)
|
static unsigned short iax_build_codec_rates(void)
|
||||||
{
|
{
|
||||||
int x;
|
int x;
|
||||||
unsigned short samples = 0;
|
unsigned short samples = 0;
|
||||||
|
|
||||||
for (x = 0; x < globals.codec_rates_last; x++) {
|
for (x = 0; x < globals.codec_rates_last; x++) {
|
||||||
int rate = atoi(globals.codec_rates[x]);
|
int rate = atoi(globals.codec_rates[x]);
|
||||||
switch (rate) {
|
switch (rate) {
|
||||||
|
@ -201,9 +200,7 @@ typedef enum {
|
||||||
IAX_QUERY = 2
|
IAX_QUERY = 2
|
||||||
} iax_io_t;
|
} iax_io_t;
|
||||||
|
|
||||||
static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_session *iax_session,
|
static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_session *iax_session, unsigned int *format, unsigned int *cababilities, unsigned short *samprate, iax_io_t io)
|
||||||
unsigned int *format, unsigned int *cababilities, unsigned short *samprate,
|
|
||||||
iax_io_t io)
|
|
||||||
{
|
{
|
||||||
char *dname = NULL;
|
char *dname = NULL;
|
||||||
//int rate = 8000;
|
//int rate = 8000;
|
||||||
|
@ -216,18 +213,14 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
|
|
||||||
if (globals.codec_string) {
|
if (globals.codec_string) {
|
||||||
if (!(num_codecs = switch_loadable_module_get_codecs_sorted(switch_core_session_get_pool(tech_pvt->session),
|
if (!(num_codecs = switch_loadable_module_get_codecs_sorted(switch_core_session_get_pool(tech_pvt->session),
|
||||||
codecs,
|
codecs,
|
||||||
SWITCH_MAX_CODECS,
|
SWITCH_MAX_CODECS,
|
||||||
globals.codec_order,
|
globals.codec_order,
|
||||||
globals.codec_order_last)) > 0) {
|
globals.codec_order_last)) > 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NO codecs?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NO codecs?\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
} else
|
} else if (!(num_codecs = switch_loadable_module_get_codecs(switch_core_session_get_pool(tech_pvt->session), codecs, SWITCH_MAX_CODECS)) > 0) {
|
||||||
if (!
|
|
||||||
(num_codecs =
|
|
||||||
switch_loadable_module_get_codecs(switch_core_session_get_pool(tech_pvt->session), codecs,
|
|
||||||
SWITCH_MAX_CODECS)) > 0) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NO codecs?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NO codecs?\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
@ -267,7 +260,7 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
len = iax_pref_codec_get(iax_session, prefs, sizeof(prefs));
|
len = iax_pref_codec_get(iax_session, prefs, sizeof(prefs));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len) { /*they sent us a pref and we don't want to be codec master */
|
if (len) { /*they sent us a pref and we don't want to be codec master*/
|
||||||
char pref_str[256] = "(";
|
char pref_str[256] = "(";
|
||||||
|
|
||||||
for (x = 0; x < len; x++) {
|
for (x = 0; x < len; x++) {
|
||||||
|
@ -290,7 +283,7 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (*format & mixed_cap) { /* is the one we asked for here? */
|
if (*format & mixed_cap) { /* is the one we asked for here? */
|
||||||
chosen = *format;
|
chosen = *format;
|
||||||
for (x = 0; x < num_codecs; x++) {
|
for (x = 0; x < num_codecs; x++) {
|
||||||
unsigned int cap = iana2ast(codecs[x]->ianacode);
|
unsigned int cap = iana2ast(codecs[x]->ianacode);
|
||||||
|
@ -298,7 +291,7 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
dname = codecs[x]->iananame;
|
dname = codecs[x]->iananame;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else { /* c'mon there has to be SOMETHING... */
|
} else { /* c'mon there has to be SOMETHING...*/
|
||||||
for (x = 0; x < num_codecs; x++) {
|
for (x = 0; x < num_codecs; x++) {
|
||||||
unsigned int cap = iana2ast(codecs[x]->ianacode);
|
unsigned int cap = iana2ast(codecs[x]->ianacode);
|
||||||
if (cap & mixed_cap) {
|
if (cap & mixed_cap) {
|
||||||
|
@ -325,7 +318,7 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
|
|
||||||
//printf("\n\n******WTF %u %u %u\n******\n", *samprate, samples, mixed);
|
//printf("\n\n******WTF %u %u %u\n******\n", *samprate, samples, mixed);
|
||||||
srate = 8000;
|
srate = 8000;
|
||||||
|
|
||||||
if (mixed & IAX_RATE_16KHZ) {
|
if (mixed & IAX_RATE_16KHZ) {
|
||||||
srate = 16000;
|
srate = 16000;
|
||||||
}
|
}
|
||||||
|
@ -351,8 +344,9 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
srate,
|
srate,
|
||||||
0,
|
0,
|
||||||
1,
|
1,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
NULL,
|
||||||
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
} else {
|
} else {
|
||||||
|
@ -361,10 +355,11 @@ static switch_status iax_set_codec(struct private_object *tech_pvt, struct iax_s
|
||||||
srate,
|
srate,
|
||||||
0,
|
0,
|
||||||
1,
|
1,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE |SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
NULL,
|
||||||
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_core_codec_destroy(&tech_pvt->read_codec);
|
switch_core_codec_destroy(&tech_pvt->read_codec);
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
} else {
|
} else {
|
||||||
int ms;
|
int ms;
|
||||||
|
@ -397,12 +392,9 @@ static switch_status channel_on_hangup(switch_core_session *session);
|
||||||
static switch_status channel_on_ring(switch_core_session *session);
|
static switch_status channel_on_ring(switch_core_session *session);
|
||||||
static switch_status channel_on_loopback(switch_core_session *session);
|
static switch_status channel_on_loopback(switch_core_session *session);
|
||||||
static switch_status channel_on_transmit(switch_core_session *session);
|
static switch_status channel_on_transmit(switch_core_session *session);
|
||||||
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status channel_kill_channel(switch_core_session *session, int sig);
|
static switch_status channel_kill_channel(switch_core_session *session, int sig);
|
||||||
|
|
||||||
|
|
||||||
|
@ -442,7 +434,7 @@ static switch_status channel_on_init(switch_core_session *session)
|
||||||
switch_set_flag(tech_pvt, TFLAG_IO);
|
switch_set_flag(tech_pvt, TFLAG_IO);
|
||||||
|
|
||||||
switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
|
switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
|
||||||
//switch_thread_cond_create(&tech_pvt->cond, switch_core_session_get_pool(session));
|
//switch_thread_cond_create(&tech_pvt->cond, switch_core_session_get_pool(session));
|
||||||
//switch_mutex_lock(tech_pvt->mutex);
|
//switch_mutex_lock(tech_pvt->mutex);
|
||||||
|
|
||||||
/* Move Channel's State Machine to RING */
|
/* Move Channel's State Machine to RING */
|
||||||
|
@ -559,8 +551,7 @@ static switch_status channel_on_transmit(switch_core_session *session)
|
||||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||||
*/
|
*/
|
||||||
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
|
@ -570,8 +561,7 @@ static switch_status channel_outgoing_channel(switch_core_session *session, swit
|
||||||
unsigned short samprate = 0;
|
unsigned short samprate = 0;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
switch_core_session_set_private(*new_session, tech_pvt);
|
switch_core_session_set_private(*new_session, tech_pvt);
|
||||||
|
@ -611,8 +601,10 @@ static switch_status channel_outgoing_channel(switch_core_session *session, swit
|
||||||
}
|
}
|
||||||
|
|
||||||
iax_call(tech_pvt->iax_session,
|
iax_call(tech_pvt->iax_session,
|
||||||
caller_profile->caller_id_number,
|
caller_profile->caller_id_number,
|
||||||
caller_profile->caller_id_name, caller_profile->destination_number, NULL, 0, req, cap);
|
caller_profile->caller_id_name,
|
||||||
|
caller_profile->destination_number,
|
||||||
|
NULL, 0, req, cap);
|
||||||
|
|
||||||
switch_channel_set_flag(channel, CF_OUTBOUND);
|
switch_channel_set_flag(channel, CF_OUTBOUND);
|
||||||
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
||||||
|
@ -653,7 +645,7 @@ static switch_status channel_send_dtmf(switch_core_session *session, char *dtmf)
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
if (tech_pvt->iax_session) {
|
if (tech_pvt->iax_session) {
|
||||||
for (digit = dtmf; *digit; digit++) {
|
for(digit = dtmf; *digit; digit++) {
|
||||||
iax_send_dtmf(tech_pvt->iax_session, *digit);
|
iax_send_dtmf(tech_pvt->iax_session, *digit);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -661,8 +653,7 @@ static switch_status channel_send_dtmf(switch_core_session *session, char *dtmf)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -677,27 +668,26 @@ static switch_status channel_read_frame(switch_core_session *session, switch_fra
|
||||||
while (switch_test_flag(tech_pvt, TFLAG_IO)) {
|
while (switch_test_flag(tech_pvt, TFLAG_IO)) {
|
||||||
//switch_thread_cond_wait(tech_pvt->cond, tech_pvt->mutex);
|
//switch_thread_cond_wait(tech_pvt->cond, tech_pvt->mutex);
|
||||||
if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
|
if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
|
if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) {
|
||||||
switch_clear_flag(tech_pvt, TFLAG_VOICE);
|
switch_clear_flag(tech_pvt, TFLAG_VOICE);
|
||||||
if (!tech_pvt->read_frame.datalen) {
|
if(!tech_pvt->read_frame.datalen) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
*frame = &tech_pvt->read_frame;
|
*frame = &tech_pvt->read_frame;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -709,16 +699,16 @@ static switch_status channel_write_frame(switch_core_session *session, switch_fr
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
|
if(!switch_test_flag(tech_pvt, TFLAG_IO)) {
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef BIGENDIAN
|
#ifndef BIGENDIAN
|
||||||
if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
|
if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
|
||||||
switch_swap_linear(frame->data, (int) frame->datalen / 2);
|
switch_swap_linear(frame->data, (int)frame->datalen / 2);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
iax_send_voice(tech_pvt->iax_session, tech_pvt->codec, frame->data, (int) frame->datalen,
|
iax_send_voice(tech_pvt->iax_session, tech_pvt->codec, frame->data, (int)frame->datalen, tech_pvt->write_codec.implementation->samples_per_frame);
|
||||||
tech_pvt->write_codec.implementation->samples_per_frame);
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
|
@ -742,45 +732,44 @@ static switch_status channel_answer_channel(switch_core_session *session)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_event_handler_table channel_event_handlers = {
|
static const switch_event_handler_table channel_event_handlers = {
|
||||||
/*.on_init */ channel_on_init,
|
/*.on_init*/ channel_on_init,
|
||||||
/*.on_ring */ channel_on_ring,
|
/*.on_ring*/ channel_on_ring,
|
||||||
/*.on_execute */ channel_on_execute,
|
/*.on_execute*/ channel_on_execute,
|
||||||
/*.on_hangup */ channel_on_hangup,
|
/*.on_hangup*/ channel_on_hangup,
|
||||||
/*.on_loopback */ channel_on_loopback,
|
/*.on_loopback*/ channel_on_loopback,
|
||||||
/*.on_transmit */ channel_on_transmit
|
/*.on_transmit*/ channel_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_io_routines channel_io_routines = {
|
static const switch_io_routines channel_io_routines = {
|
||||||
/*.outgoing_channel */ channel_outgoing_channel,
|
/*.outgoing_channel*/ channel_outgoing_channel,
|
||||||
/*.answer_channel */ channel_answer_channel,
|
/*.answer_channel*/ channel_answer_channel,
|
||||||
/*.read_frame */ channel_read_frame,
|
/*.read_frame*/ channel_read_frame,
|
||||||
/*.write_frame */ channel_write_frame,
|
/*.write_frame*/ channel_write_frame,
|
||||||
/*.kill_channel */ channel_kill_channel,
|
/*.kill_channel*/ channel_kill_channel,
|
||||||
/*.waitfor_read */ channel_waitfor_read,
|
/*.waitfor_read*/ channel_waitfor_read,
|
||||||
/*.waitfor_write */ channel_waitfor_write,
|
/*.waitfor_write*/ channel_waitfor_write,
|
||||||
/*.send_dtmf */ channel_send_dtmf
|
/*.send_dtmf*/ channel_send_dtmf
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface channel_endpoint_interface = {
|
static const switch_endpoint_interface channel_endpoint_interface = {
|
||||||
/*.interface_name */ "iax",
|
/*.interface_name*/ "iax",
|
||||||
/*.io_routines */ &channel_io_routines,
|
/*.io_routines*/ &channel_io_routines,
|
||||||
/*.event_handlers */ &channel_event_handlers,
|
/*.event_handlers*/ &channel_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface channel_module_interface = {
|
static const switch_loadable_module_interface channel_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &channel_endpoint_interface,
|
/*.endpoint_interface*/ &channel_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
|
@ -831,12 +820,10 @@ static switch_status load_config(void)
|
||||||
set_global_dialplan(val);
|
set_global_dialplan(val);
|
||||||
} else if (!strcmp(var, "codec_prefs")) {
|
} else if (!strcmp(var, "codec_prefs")) {
|
||||||
set_global_codec_string(val);
|
set_global_codec_string(val);
|
||||||
globals.codec_order_last =
|
globals.codec_order_last = switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
|
||||||
switch_separate_string(globals.codec_string, ',', globals.codec_order, SWITCH_MAX_CODECS);
|
|
||||||
} else if (!strcmp(var, "codec_rates")) {
|
} else if (!strcmp(var, "codec_rates")) {
|
||||||
set_global_codec_rates_string(val);
|
set_global_codec_rates_string(val);
|
||||||
globals.codec_rates_last =
|
globals.codec_rates_last = switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
|
||||||
switch_separate_string(globals.codec_rates_string, ',', globals.codec_rates, SWITCH_MAX_CODECS);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -873,17 +860,17 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
|
|
||||||
iax_set_error(iax_err_cb);
|
iax_set_error(iax_err_cb);
|
||||||
iax_set_output(iax_out_cb);
|
iax_set_output(iax_out_cb);
|
||||||
netfd = iax_get_fd();
|
netfd = iax_get_fd();
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "IAX Ready Port %d\n", globals.port);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "IAX Ready Port %d\n", globals.port);
|
||||||
|
|
||||||
for (;;) {
|
for(;;) {
|
||||||
|
|
||||||
if (running == -1) {
|
if (running == -1) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Wait for an event. */
|
/* Wait for an event.*/
|
||||||
if ((iaxevent = iax_get_event(0)) == NULL) {
|
if ((iaxevent = iax_get_event(0)) == NULL) {
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
continue;
|
continue;
|
||||||
|
@ -892,182 +879,173 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
|
|
||||||
if (globals.debug && iaxevent->etype != IAX_EVENT_VOICE) {
|
if (globals.debug && iaxevent->etype != IAX_EVENT_VOICE) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Event %d [%s]!\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Event %d [%s]!\n",
|
||||||
iaxevent->etype, IAXNAMES[iaxevent->etype]);
|
iaxevent->etype, IAXNAMES[iaxevent->etype]);
|
||||||
}
|
}
|
||||||
switch (iaxevent->etype) {
|
switch (iaxevent->etype) {
|
||||||
case IAX_EVENT_REGACK:
|
case IAX_EVENT_REGACK:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Registration completed successfully.\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Registration completed successfully.\n");
|
||||||
if (iaxevent->ies.refresh)
|
if (iaxevent->ies.refresh) refresh = iaxevent->ies.refresh;
|
||||||
refresh = iaxevent->ies.refresh;
|
break;
|
||||||
break;
|
case IAX_EVENT_REGREJ:
|
||||||
case IAX_EVENT_REGREJ:
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Registration failed.\n");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Registration failed.\n");
|
break;
|
||||||
break;
|
case IAX_EVENT_TIMEOUT:
|
||||||
case IAX_EVENT_TIMEOUT:
|
break;
|
||||||
break;
|
case IAX_EVENT_ACCEPT:
|
||||||
case IAX_EVENT_ACCEPT:
|
if (tech_pvt) {
|
||||||
if (tech_pvt) {
|
unsigned int cap = iax_session_get_capability(iaxevent->session);
|
||||||
unsigned int cap = iax_session_get_capability(iaxevent->session);
|
unsigned int format = iaxevent->ies.format;
|
||||||
unsigned int format = iaxevent->ies.format;
|
|
||||||
|
|
||||||
if (iax_set_codec(tech_pvt, iaxevent->session, &format, &cap, &iaxevent->ies.samprate, IAX_SET) !=
|
if (iax_set_codec(tech_pvt, iaxevent->session, &format, &cap, &iaxevent->ies.samprate, IAX_SET) != SWITCH_STATUS_SUCCESS) {
|
||||||
SWITCH_STATUS_SUCCESS) {
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WTF? %d %d\n",iaxevent->ies.format, iaxevent->ies.capability);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WTF? %d %d\n", iaxevent->ies.format,
|
|
||||||
iaxevent->ies.capability);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Call accepted.\n");
|
|
||||||
break;
|
|
||||||
case IAX_EVENT_RINGA:
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Ringing heard.\n");
|
|
||||||
break;
|
|
||||||
case IAX_EVENT_PONG:
|
|
||||||
// informative only
|
|
||||||
break;
|
|
||||||
case IAX_EVENT_ANSWER:
|
|
||||||
// the other side answered our call
|
|
||||||
if (tech_pvt) {
|
|
||||||
switch_channel *channel;
|
|
||||||
if ((channel = switch_core_session_get_channel(tech_pvt->session))) {
|
|
||||||
if (switch_channel_test_flag(channel, CF_ANSWERED)) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WTF Mutiple Answer %s?\n",
|
|
||||||
switch_channel_get_name(channel));
|
|
||||||
} else {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Answer %s\n",
|
|
||||||
switch_channel_get_name(channel));
|
|
||||||
switch_channel_answer(channel);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
case IAX_EVENT_CONNECT:
|
|
||||||
// incoming call detected
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
|
||||||
"Incoming call connected %s, %s, %s %d/%d\n",
|
|
||||||
iaxevent->ies.called_number,
|
|
||||||
iaxevent->ies.calling_number,
|
|
||||||
iaxevent->ies.calling_name, iaxevent->ies.format, iaxevent->ies.capability);
|
|
||||||
|
|
||||||
if (iaxevent) {
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Call accepted.\n");
|
||||||
switch_core_session *session;
|
break;
|
||||||
|
case IAX_EVENT_RINGA:
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Ringing heard.\n");
|
||||||
|
break;
|
||||||
|
case IAX_EVENT_PONG:
|
||||||
|
// informative only
|
||||||
|
break;
|
||||||
|
case IAX_EVENT_ANSWER:
|
||||||
|
// the other side answered our call
|
||||||
|
if (tech_pvt) {
|
||||||
|
switch_channel *channel;
|
||||||
|
if ((channel = switch_core_session_get_channel(tech_pvt->session))) {
|
||||||
|
if (switch_channel_test_flag(channel, CF_ANSWERED)) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WTF Mutiple Answer %s?\n", switch_channel_get_name(channel));
|
||||||
|
} else {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Answer %s\n", switch_channel_get_name(channel));
|
||||||
|
switch_channel_answer(channel);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "New Inbound Channel %s!\n",
|
break;
|
||||||
iaxevent->ies.calling_name);
|
case IAX_EVENT_CONNECT:
|
||||||
if ((session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
// incoming call detected
|
||||||
struct private_object *tech_pvt;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
||||||
|
"Incoming call connected %s, %s, %s %d/%d\n",
|
||||||
|
iaxevent->ies.called_number,
|
||||||
|
iaxevent->ies.calling_number,
|
||||||
|
iaxevent->ies.calling_name,
|
||||||
|
iaxevent->ies.format,
|
||||||
|
iaxevent->ies.capability);
|
||||||
|
|
||||||
|
if (iaxevent) {
|
||||||
|
switch_core_session *session;
|
||||||
|
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "New Inbound Channel %s!\n", iaxevent->ies.calling_name);
|
||||||
|
if ((session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
||||||
|
struct private_object *tech_pvt;
|
||||||
|
switch_channel *channel;
|
||||||
|
|
||||||
|
switch_core_session_add_stream(session, NULL);
|
||||||
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object)))) {
|
||||||
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
|
channel = switch_core_session_get_channel(session);
|
||||||
|
switch_core_session_set_private(session, tech_pvt);
|
||||||
|
tech_pvt->session = session;
|
||||||
|
} else {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Hey where is my memory pool?\n");
|
||||||
|
switch_core_session_destroy(&session);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
|
globals.dialplan,
|
||||||
|
iaxevent->ies.calling_name,
|
||||||
|
iaxevent->ies.calling_number,
|
||||||
|
iax_get_peer_ip(iaxevent->session),
|
||||||
|
iaxevent->ies.calling_ani,
|
||||||
|
NULL,
|
||||||
|
iaxevent->ies.called_number))) {
|
||||||
|
char name[128];
|
||||||
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
|
snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
|
||||||
|
switch_channel_set_name(channel, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (iax_set_codec(tech_pvt, iaxevent->session,
|
||||||
|
&iaxevent->ies.format,
|
||||||
|
&iaxevent->ies.capability,
|
||||||
|
&iaxevent->ies.samprate,
|
||||||
|
IAX_SET) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
iax_reject(iaxevent->session, "Codec Error!");
|
||||||
|
switch_core_session_destroy(&session);
|
||||||
|
} else {
|
||||||
|
tech_pvt->iax_session = iaxevent->session;
|
||||||
|
tech_pvt->session = session;
|
||||||
|
iax_accept(tech_pvt->iax_session, tech_pvt->codec);
|
||||||
|
iax_ring_announce(tech_pvt->iax_session);
|
||||||
|
switch_channel_set_state(channel, CS_INIT);
|
||||||
|
switch_core_session_thread_launch(session);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case IAX_EVENT_REJECT:
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Rejected call.\n");
|
||||||
|
case IAX_EVENT_BUSY:
|
||||||
|
case IAX_EVENT_HANGUP:
|
||||||
|
if (tech_pvt) {
|
||||||
switch_channel *channel;
|
switch_channel *channel;
|
||||||
|
|
||||||
switch_core_session_add_stream(session, NULL);
|
switch_clear_flag(tech_pvt, TFLAG_IO);
|
||||||
if ((tech_pvt =
|
switch_clear_flag(tech_pvt, TFLAG_VOICE);
|
||||||
(struct private_object *) switch_core_session_alloc(session,
|
if ((channel = switch_core_session_get_channel(tech_pvt->session))) {
|
||||||
sizeof(struct private_object)))) {
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Hangup %s\n", switch_channel_get_name(channel));
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
switch_set_flag(tech_pvt, TFLAG_HANGUP);
|
||||||
channel = switch_core_session_get_channel(session);
|
switch_channel_hangup(channel);
|
||||||
switch_core_session_set_private(session, tech_pvt);
|
//switch_thread_cond_signal(tech_pvt->cond);
|
||||||
tech_pvt->session = session;
|
iaxevent->session = NULL;
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Hey where is my memory pool?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "No Session? %s\n", switch_test_flag(tech_pvt, TFLAG_VOICE) ? "yes" : "no");
|
||||||
switch_core_session_destroy(&session);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
|
||||||
globals.dialplan,
|
|
||||||
iaxevent->ies.calling_name,
|
|
||||||
iaxevent->ies.calling_number,
|
|
||||||
iax_get_peer_ip(iaxevent->session),
|
|
||||||
iaxevent->ies.calling_ani,
|
|
||||||
NULL, iaxevent->ies.called_number))) {
|
|
||||||
char name[128];
|
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
|
||||||
snprintf(name, sizeof(name), "IAX/%s-%04x", tech_pvt->caller_profile->destination_number,
|
|
||||||
rand() & 0xffff);
|
|
||||||
switch_channel_set_name(channel, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (iax_set_codec(tech_pvt, iaxevent->session,
|
|
||||||
&iaxevent->ies.format,
|
|
||||||
&iaxevent->ies.capability,
|
|
||||||
&iaxevent->ies.samprate, IAX_SET) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
iax_reject(iaxevent->session, "Codec Error!");
|
|
||||||
switch_core_session_destroy(&session);
|
|
||||||
} else {
|
|
||||||
tech_pvt->iax_session = iaxevent->session;
|
|
||||||
tech_pvt->session = session;
|
|
||||||
iax_accept(tech_pvt->iax_session, tech_pvt->codec);
|
|
||||||
iax_ring_announce(tech_pvt->iax_session);
|
|
||||||
switch_channel_set_state(channel, CS_INIT);
|
|
||||||
switch_core_session_thread_launch(session);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
break;
|
||||||
break;
|
case IAX_EVENT_CNG:
|
||||||
case IAX_EVENT_REJECT:
|
// pseudo-silence
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Rejected call.\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "sending silence\n");
|
||||||
case IAX_EVENT_BUSY:
|
break;
|
||||||
case IAX_EVENT_HANGUP:
|
case IAX_EVENT_VOICE:
|
||||||
if (tech_pvt) {
|
if (tech_pvt && (tech_pvt->read_frame.datalen = iaxevent->datalen)) {
|
||||||
switch_channel *channel;
|
switch_channel *channel;
|
||||||
|
if ((channel = switch_core_session_get_channel(tech_pvt->session)) && switch_channel_get_state(channel) <= CS_HANGUP) {
|
||||||
switch_clear_flag(tech_pvt, TFLAG_IO);
|
int bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
||||||
switch_clear_flag(tech_pvt, TFLAG_VOICE);
|
int frames = (int)(tech_pvt->read_frame.datalen / bytes);
|
||||||
if ((channel = switch_core_session_get_channel(tech_pvt->session))) {
|
tech_pvt->read_frame.samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Hangup %s\n", switch_channel_get_name(channel));
|
memcpy(tech_pvt->read_frame.data, iaxevent->data, iaxevent->datalen);
|
||||||
switch_set_flag(tech_pvt, TFLAG_HANGUP);
|
/* wake up the i/o thread*/
|
||||||
switch_channel_hangup(channel);
|
switch_set_flag(tech_pvt, TFLAG_VOICE);
|
||||||
//switch_thread_cond_signal(tech_pvt->cond);
|
//switch_thread_cond_signal(tech_pvt->cond);
|
||||||
iaxevent->session = NULL;
|
}
|
||||||
} else {
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "No Session? %s\n",
|
break;
|
||||||
switch_test_flag(tech_pvt, TFLAG_VOICE) ? "yes" : "no");
|
case IAX_EVENT_TRANSFER:
|
||||||
}
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Call transfer occurred.\n");
|
||||||
}
|
//session[0] = iaxevent->session;
|
||||||
break;
|
break;
|
||||||
case IAX_EVENT_CNG:
|
case IAX_EVENT_DTMF:
|
||||||
// pseudo-silence
|
if (tech_pvt) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "sending silence\n");
|
switch_channel *channel;
|
||||||
break;
|
if ((channel = switch_core_session_get_channel(tech_pvt->session))) {
|
||||||
case IAX_EVENT_VOICE:
|
char str[2] = {iaxevent->subclass};
|
||||||
if (tech_pvt && (tech_pvt->read_frame.datalen = iaxevent->datalen)) {
|
if (globals.debug) {
|
||||||
switch_channel *channel;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s DTMF %s\n", str, switch_channel_get_name(channel));
|
||||||
if ((channel = switch_core_session_get_channel(tech_pvt->session))
|
}
|
||||||
&& switch_channel_get_state(channel) <= CS_HANGUP) {
|
switch_channel_queue_dtmf(channel, str);
|
||||||
int bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_frame;
|
|
||||||
int frames = (int) (tech_pvt->read_frame.datalen / bytes);
|
|
||||||
tech_pvt->read_frame.samples = frames * tech_pvt->read_codec.implementation->samples_per_frame;
|
|
||||||
memcpy(tech_pvt->read_frame.data, iaxevent->data, iaxevent->datalen);
|
|
||||||
/* wake up the i/o thread */
|
|
||||||
switch_set_flag(tech_pvt, TFLAG_VOICE);
|
|
||||||
//switch_thread_cond_signal(tech_pvt->cond);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case IAX_EVENT_TRANSFER:
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Call transfer occurred.\n");
|
|
||||||
//session[0] = iaxevent->session;
|
|
||||||
break;
|
|
||||||
case IAX_EVENT_DTMF:
|
|
||||||
if (tech_pvt) {
|
|
||||||
switch_channel *channel;
|
|
||||||
if ((channel = switch_core_session_get_channel(tech_pvt->session))) {
|
|
||||||
char str[2] = { iaxevent->subclass };
|
|
||||||
if (globals.debug) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s DTMF %s\n", str,
|
|
||||||
switch_channel_get_name(channel));
|
|
||||||
}
|
}
|
||||||
switch_channel_queue_dtmf(channel, str);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Don't know what to do with IAX event %d.\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Don't know what to do with IAX event %d.\n", iaxevent->etype);
|
||||||
iaxevent->etype);
|
break;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
iax_event_free(iaxevent);
|
iax_event_free(iaxevent);
|
||||||
|
@ -1097,3 +1075,4 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
}
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ struct private_object {
|
||||||
struct switch_frame frame;
|
struct switch_frame frame;
|
||||||
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
switch_caller_profile *caller_profile;
|
switch_caller_profile *caller_profile;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -65,12 +65,9 @@ static switch_status channel_on_hangup(switch_core_session *session);
|
||||||
static switch_status channel_on_ring(switch_core_session *session);
|
static switch_status channel_on_ring(switch_core_session *session);
|
||||||
static switch_status channel_on_loopback(switch_core_session *session);
|
static switch_status channel_on_loopback(switch_core_session *session);
|
||||||
static switch_status channel_on_transmit(switch_core_session *session);
|
static switch_status channel_on_transmit(switch_core_session *session);
|
||||||
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status channel_kill_channel(switch_core_session *session, int sig);
|
static switch_status channel_kill_channel(switch_core_session *session, int sig);
|
||||||
|
|
||||||
|
|
||||||
|
@ -122,7 +119,7 @@ static switch_status channel_on_execute(switch_core_session *session)
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
|
||||||
|
|
||||||
|
|
||||||
|
@ -133,7 +130,7 @@ static switch_status channel_on_hangup(switch_core_session *session)
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
|
@ -150,7 +147,7 @@ static switch_status channel_kill_channel(switch_core_session *session, int sig)
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
|
@ -160,7 +157,7 @@ static switch_status channel_kill_channel(switch_core_session *session, int sig)
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,17 +177,15 @@ static switch_status channel_on_transmit(switch_core_session *session)
|
||||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||||
*/
|
*/
|
||||||
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel, *orig_channel;
|
switch_channel *channel, *orig_channel;
|
||||||
switch_caller_profile *caller_profile, *originator_caller_profile = NULL;
|
switch_caller_profile *caller_profile, *originator_caller_profile = NULL;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
switch_core_session_set_private(*new_session, tech_pvt);
|
switch_core_session_set_private(*new_session, tech_pvt);
|
||||||
|
@ -223,7 +218,7 @@ static switch_status channel_outgoing_channel(switch_core_session *session, swit
|
||||||
switch_channel_set_originator_caller_profile(channel, cloned_profile);
|
switch_channel_set_originator_caller_profile(channel, cloned_profile);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_channel_set_flag(channel, CF_OUTBOUND);
|
switch_channel_set_flag(channel, CF_OUTBOUND);
|
||||||
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
switch_set_flag(tech_pvt, TFLAG_OUTBOUND);
|
||||||
switch_channel_set_state(channel, CS_INIT);
|
switch_channel_set_state(channel, CS_INIT);
|
||||||
|
@ -255,8 +250,7 @@ static switch_status channel_waitfor_write(switch_core_session *session, int ms,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -272,8 +266,7 @@ static switch_status channel_read_frame(switch_core_session *session, switch_fra
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -286,43 +279,43 @@ static switch_status channel_write_frame(switch_core_session *session, switch_fr
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_event_handler_table channel_event_handlers = {
|
static const switch_event_handler_table channel_event_handlers = {
|
||||||
/*.on_init */ channel_on_init,
|
/*.on_init*/ channel_on_init,
|
||||||
/*.on_ring */ channel_on_ring,
|
/*.on_ring*/ channel_on_ring,
|
||||||
/*.on_execute */ channel_on_execute,
|
/*.on_execute*/ channel_on_execute,
|
||||||
/*.on_hangup */ channel_on_hangup,
|
/*.on_hangup*/ channel_on_hangup,
|
||||||
/*.on_loopback */ channel_on_loopback,
|
/*.on_loopback*/ channel_on_loopback,
|
||||||
/*.on_transmit */ channel_on_transmit
|
/*.on_transmit*/ channel_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_io_routines channel_io_routines = {
|
static const switch_io_routines channel_io_routines = {
|
||||||
/*.outgoing_channel */ channel_outgoing_channel,
|
/*.outgoing_channel*/ channel_outgoing_channel,
|
||||||
/*.answer_channel */ NULL,
|
/*.answer_channel*/ NULL,
|
||||||
/*.read_frame */ channel_read_frame,
|
/*.read_frame*/ channel_read_frame,
|
||||||
/*.write_frame */ channel_write_frame,
|
/*.write_frame*/ channel_write_frame,
|
||||||
/*.kill_channel */ channel_kill_channel,
|
/*.kill_channel*/ channel_kill_channel,
|
||||||
/*.waitfor_read */ channel_waitfor_read,
|
/*.waitfor_read*/ channel_waitfor_read,
|
||||||
/*.waitfor_write */ channel_waitfor_write
|
/*.waitfor_write*/ channel_waitfor_write
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface channel_endpoint_interface = {
|
static const switch_endpoint_interface channel_endpoint_interface = {
|
||||||
/*.interface_name */ "opal",
|
/*.interface_name*/ "opal",
|
||||||
/*.io_routines */ &channel_io_routines,
|
/*.io_routines*/ &channel_io_routines,
|
||||||
/*.event_handlers */ &channel_event_handlers,
|
/*.event_handlers*/ &channel_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface channel_module_interface = {
|
static const switch_loadable_module_interface channel_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &channel_endpoint_interface,
|
/*.endpoint_interface*/ &channel_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -345,20 +338,19 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
char *cf = "opal.conf";
|
char *cf = "opal.conf";
|
||||||
|
|
||||||
memset(&globals, 0, sizeof(globals));
|
memset(&globals, 0, sizeof(globals));
|
||||||
|
|
||||||
if (!switch_config_open_file(&cfg, cf)) {
|
if (!switch_config_open_file(&cfg, cf)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
while (switch_config_next_pair(&cfg, &var, &val)) {
|
while (switch_config_next_pair(&cfg, &var, &val)) {
|
||||||
if (!strcasecmp(cfg.category, "settings")) {
|
if (!strcasecmp(cfg.category, "settings")) {
|
||||||
|
@ -372,7 +364,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
|
|
||||||
switch_config_close_file(&cfg);
|
switch_config_close_file(&cfg);
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
|
|
|
@ -81,55 +81,51 @@ static struct {
|
||||||
struct private_object {
|
struct private_object {
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
switch_codec read_codec;
|
switch_codec read_codec;
|
||||||
switch_codec write_codec;
|
switch_codec write_codec;
|
||||||
struct switch_frame read_frame;
|
struct switch_frame read_frame;
|
||||||
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
switch_caller_profile *caller_profile;
|
switch_caller_profile *caller_profile;
|
||||||
char call_id[50];
|
char call_id[50];
|
||||||
PaError err;
|
PaError err;
|
||||||
PABLIO_Stream *audio_in;
|
PABLIO_Stream *audio_in;
|
||||||
PABLIO_Stream *audio_out;
|
PABLIO_Stream *audio_out;
|
||||||
int indev;
|
int indev;
|
||||||
int outdev;
|
int outdev;
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_name, globals.cid_name)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_name, globals.cid_name)
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_num, globals.cid_num)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_cid_num, globals.cid_num)
|
||||||
|
|
||||||
|
|
||||||
static const switch_endpoint_interface channel_endpoint_interface;
|
static const switch_endpoint_interface channel_endpoint_interface;
|
||||||
|
|
||||||
static switch_status channel_on_init(switch_core_session *session);
|
static switch_status channel_on_init(switch_core_session *session);
|
||||||
static switch_status channel_on_hangup(switch_core_session *session);
|
static switch_status channel_on_hangup(switch_core_session *session);
|
||||||
static switch_status channel_on_ring(switch_core_session *session);
|
static switch_status channel_on_ring(switch_core_session *session);
|
||||||
static switch_status channel_on_loopback(switch_core_session *session);
|
static switch_status channel_on_loopback(switch_core_session *session);
|
||||||
static switch_status channel_on_transmit(switch_core_session *session);
|
static switch_status channel_on_transmit(switch_core_session *session);
|
||||||
static switch_status channel_outgoing_channel(switch_core_session *session,
|
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_caller_profile *outbound_profile,
|
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
switch_core_session **new_session);
|
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status channel_kill_channel(switch_core_session *session, int sig);
|
||||||
switch_io_flag flags, int stream_id);
|
static switch_status engage_device(struct private_object *tech_pvt);
|
||||||
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static int dump_info(void);
|
||||||
switch_io_flag flags, int stream_id);
|
static switch_status load_config(void);
|
||||||
static switch_status channel_kill_channel(switch_core_session *session, int sig);
|
static int get_dev_by_name(char *name, int in);
|
||||||
static switch_status engage_device(struct private_object *tech_pvt);
|
static switch_status place_call(char *dest, char *out, size_t outlen);
|
||||||
static int dump_info(void);
|
static switch_status hup_call(char *callid, char *out, size_t outlen);
|
||||||
static switch_status load_config(void);
|
static switch_status call_info(char *callid, char *out, size_t outlen);
|
||||||
static int get_dev_by_name(char *name, int in);
|
static switch_status send_dtmf(char *callid, char *out, size_t outlen);
|
||||||
static switch_status place_call(char *dest, char *out, size_t outlen);
|
static switch_status answer_call(char *callid, char *out, size_t outlen);
|
||||||
static switch_status hup_call(char *callid, char *out, size_t outlen);
|
|
||||||
static switch_status call_info(char *callid, char *out, size_t outlen);
|
|
||||||
static switch_status send_dtmf(char *callid, char *out, size_t outlen);
|
|
||||||
static switch_status answer_call(char *callid, char *out, size_t outlen);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
State methods they get called when the state changes to the specific state
|
State methods they get called when the state changes to the specific state
|
||||||
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
returning SWITCH_STATUS_SUCCESS tells the core to execute the standard state method next
|
||||||
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
so if you fully implement the state you can return SWITCH_STATUS_FALSE to skip it.
|
||||||
*/
|
*/
|
||||||
static switch_status channel_on_init(switch_core_session *session)
|
static switch_status channel_on_init(switch_core_session *session)
|
||||||
{
|
{
|
||||||
switch_channel *channel;
|
switch_channel *channel;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -144,7 +140,7 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_dialplan, globals.dialplan)
|
||||||
tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
|
tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
|
||||||
|
|
||||||
switch_set_flag(tech_pvt, TFLAG_IO);
|
switch_set_flag(tech_pvt, TFLAG_IO);
|
||||||
|
|
||||||
/* Move Channel's State Machine to RING */
|
/* Move Channel's State Machine to RING */
|
||||||
switch_channel_set_state(channel, CS_RING);
|
switch_channel_set_state(channel, CS_RING);
|
||||||
|
|
||||||
|
@ -178,7 +174,7 @@ static switch_status channel_on_execute(switch_core_session *session)
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
|
||||||
|
|
||||||
|
|
||||||
|
@ -227,7 +223,7 @@ static switch_status channel_kill_channel(switch_core_session *session, int sig)
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
|
@ -240,7 +236,7 @@ static switch_status channel_kill_channel(switch_core_session *session, int sig)
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -268,25 +264,25 @@ static switch_status channel_on_transmit(switch_core_session *session)
|
||||||
/* Turn on the device */
|
/* Turn on the device */
|
||||||
engage_device(tech_pvt);
|
engage_device(tech_pvt);
|
||||||
|
|
||||||
while (switch_channel_get_state(channel) == CS_TRANSMIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) {
|
while(switch_channel_get_state(channel) == CS_TRANSMIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) {
|
||||||
if (switch_time_now() - last >= waitsec) {
|
if (switch_time_now() - last >= waitsec) {
|
||||||
char buf[512];
|
char buf[512];
|
||||||
switch_event *event;
|
switch_event *event;
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id);
|
snprintf(buf, sizeof(buf), "BRRRRING! BRRRRING! call %s\n", tech_pvt->call_id);
|
||||||
|
|
||||||
if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) {
|
if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_RINGING) == SWITCH_STATUS_SUCCESS) {
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_info", buf);
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_info", buf);
|
||||||
switch_event_fire(&event);
|
switch_event_fire(&event);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s\n", buf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s\n", buf);
|
||||||
last = switch_time_now();
|
last = switch_time_now();
|
||||||
}
|
}
|
||||||
switch_yield(50000);
|
switch_yield(50000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "CHANNEL TRANSMIT\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "CHANNEL TRANSMIT\n");
|
||||||
|
|
||||||
|
@ -297,8 +293,7 @@ static switch_status channel_on_transmit(switch_core_session *session)
|
||||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||||
*/
|
*/
|
||||||
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status channel_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&channel_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
|
@ -306,8 +301,7 @@ static switch_status channel_outgoing_channel(switch_core_session *session, swit
|
||||||
switch_caller_profile *caller_profile;
|
switch_caller_profile *caller_profile;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
switch_core_session_set_private(*new_session, tech_pvt);
|
switch_core_session_set_private(*new_session, tech_pvt);
|
||||||
|
@ -323,9 +317,7 @@ static switch_status channel_outgoing_channel(switch_core_session *session, swit
|
||||||
caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
|
caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
|
||||||
switch_channel_set_caller_profile(channel, caller_profile);
|
switch_channel_set_caller_profile(channel, caller_profile);
|
||||||
tech_pvt->caller_profile = caller_profile;
|
tech_pvt->caller_profile = caller_profile;
|
||||||
snprintf(name, sizeof(name), "PortAudio/%s-%04x",
|
snprintf(name, sizeof(name), "PortAudio/%s-%04x", caller_profile->destination_number ? caller_profile->destination_number : modname, rand() & 0xffff);
|
||||||
caller_profile->destination_number ? caller_profile->destination_number : modname,
|
|
||||||
rand() & 0xffff);
|
|
||||||
switch_channel_set_name(channel, name);
|
switch_channel_set_name(channel, name);
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Doh! no caller profile\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Doh! no caller profile\n");
|
||||||
|
@ -373,11 +365,10 @@ static switch_status channel_send_dtmf(switch_core_session *session, char *dtmf)
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "DTMF ON CALL %s [%s]\n", tech_pvt->call_id, dtmf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "DTMF ON CALL %s [%s]\n", tech_pvt->call_id, dtmf);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status channel_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -394,12 +385,10 @@ static switch_status channel_read_frame(switch_core_session *session, switch_fra
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
switch_mutex_lock(globals.device_lock);
|
switch_mutex_lock(globals.device_lock);
|
||||||
if (tech_pvt->audio_in &&
|
if (tech_pvt->audio_in &&
|
||||||
(samples =
|
(samples = ReadAudioStream(tech_pvt->audio_in, tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_frame))) {
|
||||||
ReadAudioStream(tech_pvt->audio_in, tech_pvt->read_frame.data,
|
|
||||||
tech_pvt->read_codec.implementation->samples_per_frame))) {
|
|
||||||
tech_pvt->read_frame.datalen = samples * 2;
|
tech_pvt->read_frame.datalen = samples * 2;
|
||||||
tech_pvt->read_frame.samples = samples;
|
tech_pvt->read_frame.samples = samples;
|
||||||
*frame = &tech_pvt->read_frame;
|
*frame = &tech_pvt->read_frame;
|
||||||
|
@ -410,8 +399,7 @@ static switch_status channel_read_frame(switch_core_session *session, switch_fra
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status channel_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -422,18 +410,19 @@ static switch_status channel_write_frame(switch_core_session *session, switch_fr
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
|
if(!switch_test_flag(tech_pvt, TFLAG_IO)) {
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
//switch_mutex_lock(globals.device_lock);
|
//switch_mutex_lock(globals.device_lock);
|
||||||
if (tech_pvt->audio_out) {
|
if (tech_pvt->audio_out) {
|
||||||
WriteAudioStream(tech_pvt->audio_out, (short *) frame->data, (int) (frame->datalen / sizeof(SAMPLE)));
|
WriteAudioStream(tech_pvt->audio_out, (short *)frame->data, (int)(frame->datalen / sizeof(SAMPLE)));
|
||||||
status = SWITCH_STATUS_SUCCESS;
|
status = SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
//switch_mutex_unlock(globals.device_lock);
|
//switch_mutex_unlock(globals.device_lock);
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status channel_answer_channel(switch_core_session *session)
|
static switch_status channel_answer_channel(switch_core_session *session)
|
||||||
|
@ -452,83 +441,82 @@ static switch_status channel_answer_channel(switch_core_session *session)
|
||||||
|
|
||||||
|
|
||||||
static struct switch_api_interface send_dtmf_interface = {
|
static struct switch_api_interface send_dtmf_interface = {
|
||||||
/*.interface_name */ "padtmf",
|
/*.interface_name*/ "padtmf",
|
||||||
/*.desc */ "PortAudio Dial DTMF",
|
/*.desc*/ "PortAudio Dial DTMF",
|
||||||
/*.function */ send_dtmf,
|
/*.function*/ send_dtmf,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct switch_api_interface answer_call_interface = {
|
static struct switch_api_interface answer_call_interface = {
|
||||||
/*.interface_name */ "paoffhook",
|
/*.interface_name*/ "paoffhook",
|
||||||
/*.desc */ "PortAudio Answer Call",
|
/*.desc*/ "PortAudio Answer Call",
|
||||||
/*.function */ answer_call,
|
/*.function*/ answer_call,
|
||||||
/*.next */ &send_dtmf_interface
|
/*.next*/ &send_dtmf_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct switch_api_interface channel_info_interface = {
|
static struct switch_api_interface channel_info_interface = {
|
||||||
/*.interface_name */ "painfo",
|
/*.interface_name*/ "painfo",
|
||||||
/*.desc */ "PortAudio Call Info",
|
/*.desc*/ "PortAudio Call Info",
|
||||||
/*.function */ call_info,
|
/*.function*/ call_info,
|
||||||
/*.next */ &answer_call_interface
|
/*.next*/ &answer_call_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct switch_api_interface channel_hup_interface = {
|
static struct switch_api_interface channel_hup_interface = {
|
||||||
/*.interface_name */ "pahup",
|
/*.interface_name*/ "pahup",
|
||||||
/*.desc */ "PortAudio Hangup Call",
|
/*.desc*/ "PortAudio Hangup Call",
|
||||||
/*.function */ hup_call,
|
/*.function*/ hup_call,
|
||||||
/*.next */ &channel_info_interface
|
/*.next*/ &channel_info_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct switch_api_interface channel_api_interface = {
|
static struct switch_api_interface channel_api_interface = {
|
||||||
/*.interface_name */ "pacall",
|
/*.interface_name*/ "pacall",
|
||||||
/*.desc */ "PortAudio Call",
|
/*.desc*/ "PortAudio Call",
|
||||||
/*.function */ place_call,
|
/*.function*/ place_call,
|
||||||
/*.next */ &channel_hup_interface
|
/*.next*/ &channel_hup_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_event_handler_table channel_event_handlers = {
|
static const switch_event_handler_table channel_event_handlers = {
|
||||||
/*.on_init */ channel_on_init,
|
/*.on_init*/ channel_on_init,
|
||||||
/*.on_ring */ channel_on_ring,
|
/*.on_ring*/ channel_on_ring,
|
||||||
/*.on_execute */ channel_on_execute,
|
/*.on_execute*/ channel_on_execute,
|
||||||
/*.on_hangup */ channel_on_hangup,
|
/*.on_hangup*/ channel_on_hangup,
|
||||||
/*.on_loopback */ channel_on_loopback,
|
/*.on_loopback*/ channel_on_loopback,
|
||||||
/*.on_transmit */ channel_on_transmit
|
/*.on_transmit*/ channel_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_io_routines channel_io_routines = {
|
static const switch_io_routines channel_io_routines = {
|
||||||
/*.outgoing_channel */ channel_outgoing_channel,
|
/*.outgoing_channel*/ channel_outgoing_channel,
|
||||||
/*.answer_channel */ channel_answer_channel,
|
/*.answer_channel*/ channel_answer_channel,
|
||||||
/*.read_frame */ channel_read_frame,
|
/*.read_frame*/ channel_read_frame,
|
||||||
/*.write_frame */ channel_write_frame,
|
/*.write_frame*/ channel_write_frame,
|
||||||
/*.kill_channel */ channel_kill_channel,
|
/*.kill_channel*/ channel_kill_channel,
|
||||||
/*.waitfor_read */ channel_waitfor_read,
|
/*.waitfor_read*/ channel_waitfor_read,
|
||||||
/*.waitfor_write */ channel_waitfor_write,
|
/*.waitfor_write*/ channel_waitfor_write,
|
||||||
/*.send_dtmf */ channel_send_dtmf
|
/*.send_dtmf*/ channel_send_dtmf
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface channel_endpoint_interface = {
|
static const switch_endpoint_interface channel_endpoint_interface = {
|
||||||
/*.interface_name */ "portaudio",
|
/*.interface_name*/ "portaudio",
|
||||||
/*.io_routines */ &channel_io_routines,
|
/*.io_routines*/ &channel_io_routines,
|
||||||
/*.event_handlers */ &channel_event_handlers,
|
/*.event_handlers*/ &channel_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface channel_module_interface = {
|
static const switch_loadable_module_interface channel_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &channel_endpoint_interface,
|
/*.endpoint_interface*/ &channel_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL,
|
/*.application_interface*/ NULL,
|
||||||
/*.api_interface */ &channel_api_interface
|
/*.api_interface*/ &channel_api_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
|
@ -540,7 +528,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
load_config();
|
load_config();
|
||||||
switch_core_hash_init(&globals.call_hash, module_pool);
|
switch_core_hash_init(&globals.call_hash, module_pool);
|
||||||
switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool);
|
switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool);
|
||||||
|
|
||||||
dump_info();
|
dump_info();
|
||||||
|
|
||||||
if (switch_event_reserve_subclass(MY_EVENT_RINGING) != SWITCH_STATUS_SUCCESS) {
|
if (switch_event_reserve_subclass(MY_EVENT_RINGING) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
@ -561,14 +549,14 @@ static switch_status load_config(void)
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
char *cf = "portaudio.conf";
|
char *cf = "portaudio.conf";
|
||||||
|
|
||||||
memset(&globals, 0, sizeof(globals));
|
memset(&globals, 0, sizeof(globals));
|
||||||
|
|
||||||
if (!switch_config_open_file(&cfg, cf)) {
|
if (!switch_config_open_file(&cfg, cf)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (switch_config_next_pair(&cfg, &var, &val)) {
|
while (switch_config_next_pair(&cfg, &var, &val)) {
|
||||||
if (!strcasecmp(cfg.category, "settings")) {
|
if (!strcasecmp(cfg.category, "settings")) {
|
||||||
if (!strcmp(var, "debug")) {
|
if (!strcmp(var, "debug")) {
|
||||||
|
@ -583,13 +571,13 @@ static switch_status load_config(void)
|
||||||
set_global_cid_num(val);
|
set_global_cid_num(val);
|
||||||
} else if (!strcmp(var, "indev")) {
|
} else if (!strcmp(var, "indev")) {
|
||||||
if (*val == '#') {
|
if (*val == '#') {
|
||||||
globals.indev = atoi(val + 1);
|
globals.indev = atoi(val+1);
|
||||||
} else {
|
} else {
|
||||||
globals.indev = get_dev_by_name(val, 1);
|
globals.indev = get_dev_by_name(val, 1);
|
||||||
}
|
}
|
||||||
} else if (!strcmp(var, "outdev")) {
|
} else if (!strcmp(var, "outdev")) {
|
||||||
if (*val == '#') {
|
if (*val == '#') {
|
||||||
globals.outdev = atoi(val + 1);
|
globals.outdev = atoi(val+1);
|
||||||
} else {
|
} else {
|
||||||
globals.outdev = get_dev_by_name(val, 0);
|
globals.outdev = get_dev_by_name(val, 0);
|
||||||
}
|
}
|
||||||
|
@ -600,13 +588,13 @@ static switch_status load_config(void)
|
||||||
if (!globals.dialplan) {
|
if (!globals.dialplan) {
|
||||||
set_global_dialplan("default");
|
set_global_dialplan("default");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!globals.sample_rate) {
|
if (!globals.sample_rate) {
|
||||||
globals.sample_rate = 8000;
|
globals.sample_rate = 8000;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_config_close_file(&cfg);
|
switch_config_close_file(&cfg);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -622,28 +610,28 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
{
|
{
|
||||||
Pa_Terminate();
|
Pa_Terminate();
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int get_dev_by_name(char *name, int in)
|
static int get_dev_by_name(char *name, int in)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
int numDevices;
|
int numDevices;
|
||||||
const PaDeviceInfo *pdi;
|
const PaDeviceInfo *pdi;
|
||||||
numDevices = Pa_CountDevices();
|
numDevices = Pa_CountDevices();
|
||||||
|
|
||||||
if (numDevices < 0) {
|
if( numDevices < 0 ) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices );
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < numDevices; i++) {
|
for( i=0; i<numDevices; i++ ) {
|
||||||
pdi = Pa_GetDeviceInfo(i);
|
pdi = Pa_GetDeviceInfo( i );
|
||||||
if (strstr(pdi->name, name)) {
|
if(strstr(pdi->name, name)) {
|
||||||
if (in && pdi->maxInputChannels) {
|
if(in && pdi->maxInputChannels) {
|
||||||
return i;
|
return i;
|
||||||
} else if (!in && pdi->maxOutputChannels) {
|
} else if (!in && pdi->maxOutputChannels) {
|
||||||
return i;
|
return i;
|
||||||
|
@ -656,62 +644,58 @@ static int get_dev_by_name(char *name, int in)
|
||||||
|
|
||||||
static int dump_info(void)
|
static int dump_info(void)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i,j;
|
||||||
int numDevices;
|
int numDevices;
|
||||||
const PaDeviceInfo *pdi;
|
const PaDeviceInfo *pdi;
|
||||||
PaError err;
|
PaError err;
|
||||||
numDevices = Pa_CountDevices();
|
numDevices = Pa_CountDevices();
|
||||||
if (numDevices < 0) {
|
if( numDevices < 0 )
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices);
|
{
|
||||||
err = numDevices;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "ERROR: Pa_CountDevices returned 0x%x\n", numDevices );
|
||||||
goto error;
|
err = numDevices;
|
||||||
}
|
goto error;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Number of devices = %d\n", numDevices);
|
}
|
||||||
for (i = 0; i < numDevices; i++) {
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Number of devices = %d\n", numDevices );
|
||||||
pdi = Pa_GetDeviceInfo(i);
|
for( i=0; i<numDevices; i++ )
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "---------------------------------------------- #%d", i);
|
{
|
||||||
if (i == Pa_GetDefaultInputDeviceID())
|
pdi = Pa_GetDeviceInfo( i );
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " DefaultInput");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "---------------------------------------------- #%d", i );
|
||||||
if (i == Pa_GetDefaultOutputDeviceID())
|
if( i == Pa_GetDefaultInputDeviceID() ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " DefaultInput");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " DefaultOutput");
|
if( i == Pa_GetDefaultOutputDeviceID() ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " DefaultOutput");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "\nName = %s\n", pdi->name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "\nName = %s\n", pdi->name );
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Max Inputs = %d", pdi->maxInputChannels);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Max Inputs = %d", pdi->maxInputChannels );
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, ", Max Outputs = %d\n", pdi->maxOutputChannels);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, ", Max Outputs = %d\n", pdi->maxOutputChannels );
|
||||||
if (pdi->numSampleRates == -1) {
|
if( pdi->numSampleRates == -1 )
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Sample Rate Range = %f to %f\n", pdi->sampleRates[0],
|
{
|
||||||
pdi->sampleRates[1]);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Sample Rate Range = %f to %f\n", pdi->sampleRates[0], pdi->sampleRates[1] );
|
||||||
} else {
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Sample Rates =");
|
else
|
||||||
for (j = 0; j < pdi->numSampleRates; j++) {
|
{
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " %8.2f,", pdi->sampleRates[j]);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Sample Rates =");
|
||||||
}
|
for( j=0; j<pdi->numSampleRates; j++ )
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "\n");
|
{
|
||||||
}
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " %8.2f,", pdi->sampleRates[j] );
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Native Sample Formats = ");
|
}
|
||||||
if (pdi->nativeSampleFormats & paInt8)
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "\n");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt8, ");
|
}
|
||||||
if (pdi->nativeSampleFormats & paUInt8)
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Native Sample Formats = ");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paUInt8, ");
|
if( pdi->nativeSampleFormats & paInt8 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt8, ");
|
||||||
if (pdi->nativeSampleFormats & paInt16)
|
if( pdi->nativeSampleFormats & paUInt8 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paUInt8, ");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt16, ");
|
if( pdi->nativeSampleFormats & paInt16 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt16, ");
|
||||||
if (pdi->nativeSampleFormats & paInt32)
|
if( pdi->nativeSampleFormats & paInt32 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt32, ");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt32, ");
|
if( pdi->nativeSampleFormats & paFloat32 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paFloat32, ");
|
||||||
if (pdi->nativeSampleFormats & paFloat32)
|
if( pdi->nativeSampleFormats & paInt24 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt24, ");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paFloat32, ");
|
if( pdi->nativeSampleFormats & paPackedInt24 ) switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paPackedInt24, ");
|
||||||
if (pdi->nativeSampleFormats & paInt24)
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "\n");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paInt24, ");
|
}
|
||||||
if (pdi->nativeSampleFormats & paPackedInt24)
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "paPackedInt24, ");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "----------------------------------------------\n");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "\n");
|
return 0;
|
||||||
}
|
error:
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "An error occured while using the portaudio stream\n" );
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "----------------------------------------------\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Error number: %d\n", err );
|
||||||
return 0;
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Error message: %s\n", Pa_GetErrorText( err ) );
|
||||||
error:
|
return err;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "An error occured while using the portaudio stream\n");
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Error number: %d\n", err);
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Error message: %s\n", Pa_GetErrorText(err));
|
|
||||||
return err;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status engage_device(struct private_object *tech_pvt)
|
static switch_status engage_device(struct private_object *tech_pvt)
|
||||||
|
@ -729,59 +713,56 @@ static switch_status engage_device(struct private_object *tech_pvt)
|
||||||
codec_ms,
|
codec_ms,
|
||||||
1,
|
1,
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
NULL,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
return SWITCH_STATUS_FALSE;
|
|
||||||
} else {
|
|
||||||
if (switch_core_codec_init(&tech_pvt->write_codec,
|
|
||||||
"L16",
|
|
||||||
sample_rate,
|
|
||||||
codec_ms,
|
|
||||||
1,
|
|
||||||
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
|
|
||||||
NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
switch_core_codec_destroy(&tech_pvt->read_codec);
|
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
} else {
|
||||||
|
if (switch_core_codec_init(&tech_pvt->write_codec,
|
||||||
|
"L16",
|
||||||
|
sample_rate,
|
||||||
|
codec_ms,
|
||||||
|
1,
|
||||||
|
SWITCH_CODEC_FLAG_ENCODE |SWITCH_CODEC_FLAG_DECODE,
|
||||||
|
NULL,
|
||||||
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't load codec?\n");
|
||||||
|
switch_core_codec_destroy(&tech_pvt->read_codec);
|
||||||
|
return SWITCH_STATUS_FALSE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Loaded codec L16 %dhz %dms on %s\n", sample_rate, codec_ms, switch_channel_get_name(channel));
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Loaded codec L16 %dhz %dms on %s\n", sample_rate, codec_ms,
|
tech_pvt->read_frame.rate = sample_rate;
|
||||||
switch_channel_get_name(channel));
|
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
||||||
tech_pvt->read_frame.rate = sample_rate;
|
switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
|
||||||
tech_pvt->read_frame.codec = &tech_pvt->read_codec;
|
switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
|
||||||
switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
|
|
||||||
switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
|
|
||||||
|
|
||||||
tech_pvt->indev = globals.indev;
|
tech_pvt->indev = globals.indev;
|
||||||
tech_pvt->outdev = globals.outdev;
|
tech_pvt->outdev = globals.outdev;
|
||||||
|
|
||||||
switch_mutex_lock(globals.device_lock);
|
switch_mutex_lock(globals.device_lock);
|
||||||
if ((tech_pvt->err =
|
if ((tech_pvt->err = OpenAudioStream( &tech_pvt->audio_in, sample_rate, SAMPLE_TYPE, PABLIO_READ | PABLIO_MONO, tech_pvt->indev, -1)) == paNoError) {
|
||||||
OpenAudioStream(&tech_pvt->audio_in, sample_rate, SAMPLE_TYPE, PABLIO_READ | PABLIO_MONO, tech_pvt->indev,
|
if ((tech_pvt->err = OpenAudioStream(&tech_pvt->audio_out, sample_rate, SAMPLE_TYPE, PABLIO_WRITE | PABLIO_MONO, -1, tech_pvt->outdev)) != paNoError) {
|
||||||
-1)) == paNoError) {
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open audio out [%d]!\n", tech_pvt->outdev);
|
||||||
if ((tech_pvt->err =
|
CloseAudioStream(tech_pvt->audio_in);
|
||||||
OpenAudioStream(&tech_pvt->audio_out, sample_rate, SAMPLE_TYPE, PABLIO_WRITE | PABLIO_MONO, -1,
|
tech_pvt->audio_in = NULL;
|
||||||
tech_pvt->outdev)) != paNoError) {
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open audio out [%d]!\n", tech_pvt->outdev);
|
} else {
|
||||||
CloseAudioStream(tech_pvt->audio_in);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open audio in [%d]!\n", tech_pvt->indev);
|
||||||
tech_pvt->audio_in = NULL;
|
|
||||||
}
|
}
|
||||||
} else {
|
switch_mutex_unlock(globals.device_lock);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open audio in [%d]!\n", tech_pvt->indev);
|
|
||||||
}
|
|
||||||
switch_mutex_unlock(globals.device_lock);
|
|
||||||
|
|
||||||
if (tech_pvt->err == paNoError) {
|
if (tech_pvt->err == paNoError) {
|
||||||
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", globals.call_id++);
|
snprintf(tech_pvt->call_id, sizeof(tech_pvt->call_id), "%d", globals.call_id++);
|
||||||
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
switch_core_hash_insert(globals.call_hash, tech_pvt->call_id, tech_pvt);
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
switch_core_codec_destroy(&tech_pvt->read_codec);
|
switch_core_codec_destroy(&tech_pvt->read_codec);
|
||||||
switch_core_codec_destroy(&tech_pvt->write_codec);
|
switch_core_codec_destroy(&tech_pvt->write_codec);
|
||||||
switch_core_session_destroy(&tech_pvt->session);
|
switch_core_session_destroy(&tech_pvt->session);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status place_call(char *dest, char *out, size_t outlen)
|
static switch_status place_call(char *dest, char *out, size_t outlen)
|
||||||
|
@ -815,12 +796,14 @@ static switch_status place_call(char *dest, char *out, size_t outlen)
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
globals.dialplan,
|
globals.dialplan,
|
||||||
globals.cid_name,
|
globals.cid_name,
|
||||||
globals.cid_num, NULL, NULL, NULL, dest))) {
|
globals.cid_num,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
dest))) {
|
||||||
char name[128];
|
char name[128];
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
snprintf(name, sizeof(name), "PortAudio/%s-%04x",
|
snprintf(name, sizeof(name), "PortAudio/%s-%04x", tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : modname, rand() & 0xffff);
|
||||||
tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->
|
|
||||||
destination_number : modname, rand() & 0xffff);
|
|
||||||
switch_channel_set_name(channel, name);
|
switch_channel_set_name(channel, name);
|
||||||
}
|
}
|
||||||
tech_pvt->session = session;
|
tech_pvt->session = session;
|
||||||
|
@ -829,7 +812,7 @@ static switch_status place_call(char *dest, char *out, size_t outlen)
|
||||||
switch_core_session_thread_launch(tech_pvt->session);
|
switch_core_session_thread_launch(tech_pvt->session);
|
||||||
snprintf(out, outlen, "SUCCESS: %s", tech_pvt->call_id);
|
snprintf(out, outlen, "SUCCESS: %s", tech_pvt->call_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -845,7 +828,7 @@ static switch_status hup_call(char *callid, char *out, size_t outlen)
|
||||||
callid = tmp;
|
callid = tmp;
|
||||||
}
|
}
|
||||||
if (!callid || !strcasecmp(callid, "all")) {
|
if (!callid || !strcasecmp(callid, "all")) {
|
||||||
switch_hash_index_t *hi;
|
switch_hash_index_t* hi;
|
||||||
void *val;
|
void *val;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
@ -862,7 +845,7 @@ static switch_status hup_call(char *callid, char *out, size_t outlen)
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid))) {
|
if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid))) {
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(tech_pvt->session);
|
channel = switch_core_session_get_channel(tech_pvt->session);
|
||||||
|
@ -926,7 +909,7 @@ static void print_info(struct private_object *tech_pvt, char *out, size_t outlen
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
snprintf(out, outlen, "CALL %s\t%s\t%s\t%s\t%s\n",
|
snprintf(out, outlen, "CALL %s\t%s\t%s\t%s\t%s\n",
|
||||||
tech_pvt->call_id,
|
tech_pvt->call_id,
|
||||||
tech_pvt->caller_profile->caller_id_name ? tech_pvt->caller_profile->caller_id_name : "n/a",
|
tech_pvt->caller_profile->caller_id_name ? tech_pvt->caller_profile->caller_id_name : "n/a",
|
||||||
tech_pvt->caller_profile->caller_id_number ? tech_pvt->caller_profile->caller_id_number : "n/a",
|
tech_pvt->caller_profile->caller_id_number ? tech_pvt->caller_profile->caller_id_number : "n/a",
|
||||||
tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : "n/a",
|
tech_pvt->caller_profile->destination_number ? tech_pvt->caller_profile->destination_number : "n/a",
|
||||||
|
@ -937,19 +920,19 @@ static void print_info(struct private_object *tech_pvt, char *out, size_t outlen
|
||||||
static switch_status call_info(char *callid, char *out, size_t outlen)
|
static switch_status call_info(char *callid, char *out, size_t outlen)
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_hash_index_t *hi;
|
switch_hash_index_t* hi;
|
||||||
void *val;
|
void *val;
|
||||||
if (!callid || !strcasecmp(callid, "all")) {
|
if (!callid || !strcasecmp(callid, "all")) {
|
||||||
for (hi = apr_hash_first(module_pool, globals.call_hash); hi; hi = switch_hash_next(hi)) {
|
for (hi = apr_hash_first(module_pool, globals.call_hash); hi; hi = switch_hash_next(hi)) {
|
||||||
switch_hash_this(hi, NULL, NULL, &val);
|
switch_hash_this(hi, NULL, NULL, &val);
|
||||||
tech_pvt = val;
|
tech_pvt = val;
|
||||||
print_info(tech_pvt, out + strlen(out), outlen - strlen(out));
|
print_info(tech_pvt, out + strlen(out), outlen - strlen(out));
|
||||||
}
|
}
|
||||||
} else if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid))) {
|
} else if ((tech_pvt = switch_core_hash_find(globals.call_hash, callid))) {
|
||||||
print_info(tech_pvt, out, outlen);
|
print_info(tech_pvt, out, outlen);
|
||||||
} else {
|
} else {
|
||||||
strncpy(out, "NO SUCH CALL", outlen - 1);
|
strncpy(out, "NO SUCH CALL", outlen - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,12 +32,12 @@
|
||||||
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* History:
|
/* History:
|
||||||
* PLB021214 - check for valid stream in CloseAudioStream() to prevent hang.
|
* PLB021214 - check for valid stream in CloseAudioStream() to prevent hang.
|
||||||
* add timeOutMSec to CloseAudioStream() to prevent hang.
|
* add timeOutMSec to CloseAudioStream() to prevent hang.
|
||||||
*/
|
*/
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
@ -45,155 +45,146 @@
|
||||||
#include "ringbuffer.h"
|
#include "ringbuffer.h"
|
||||||
#include "pablio.h"
|
#include "pablio.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/******** Constants *****************************************************/
|
/******** Constants *****************************************************/
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
|
||||||
#define FRAMES_PER_BUFFER (256)
|
#define FRAMES_PER_BUFFER (256)
|
||||||
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
/******** Prototypes ****************************************************/
|
/******** Prototypes ****************************************************/
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
static int blockingIOCallback(void *inputBuffer, void *outputBuffer,
unsigned long framesPerBuffer,
|
|
||||||
PaTimestamp outTime, void *userData);
|
static int blockingIOCallback( void *inputBuffer, void *outputBuffer,
|
||||||
static PaError PABLIO_InitFIFO(RingBuffer * rbuf, long numFrames, long bytesPerFrame);
|
unsigned long framesPerBuffer,
|
||||||
static PaError PABLIO_TermFIFO(RingBuffer * rbuf);
|
PaTimestamp outTime, void *userData );
|
||||||
|
static PaError PABLIO_InitFIFO( RingBuffer *rbuf, long numFrames, long bytesPerFrame );
|
||||||
/************************************************************************/
|
static PaError PABLIO_TermFIFO( RingBuffer *rbuf );
|
||||||
/******** Functions *****************************************************/
|
|
||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
|
/******** Functions *****************************************************/
|
||||||
|
/************************************************************************/
|
||||||
|
|
||||||
/* Called from PortAudio.
|
/* Called from PortAudio.
|
||||||
* Read and write data only if there is room in FIFOs.
|
* Read and write data only if there is room in FIFOs.
|
||||||
*/
|
*/
|
||||||
static int blockingIOCallback(void *inputBuffer, void *outputBuffer,
unsigned long framesPerBuffer,
|
static int blockingIOCallback( void *inputBuffer, void *outputBuffer,
|
||||||
PaTimestamp outTime, void *userData)
|
unsigned long framesPerBuffer,
|
||||||
{
|
PaTimestamp outTime, void *userData )
|
||||||
PABLIO_Stream * data = (PABLIO_Stream *) userData;
|
{
|
||||||
long numBytes = data->bytesPerFrame * framesPerBuffer;
|
PABLIO_Stream *data = (PABLIO_Stream*)userData;
|
||||||
(void) outTime;
|
long numBytes = data->bytesPerFrame * framesPerBuffer;
|
||||||
|
(void) outTime;
|
||||||
/* This may get called with NULL inputBuffer during initial setup. */
|
|
||||||
if (inputBuffer != NULL)
|
/* This may get called with NULL inputBuffer during initial setup. */
|
||||||
{
|
if( inputBuffer != NULL )
|
||||||
RingBuffer_Write(&data->inFIFO, inputBuffer, numBytes);
|
{
|
||||||
}
|
RingBuffer_Write( &data->inFIFO, inputBuffer, numBytes );
|
||||||
if (outputBuffer != NULL)
|
}
|
||||||
{
|
if( outputBuffer != NULL )
|
||||||
int i;
|
{
|
||||||
int numRead = RingBuffer_Read(&data->outFIFO, outputBuffer, numBytes);
|
int i;
|
||||||
|
int numRead = RingBuffer_Read( &data->outFIFO, outputBuffer, numBytes );
|
||||||
/* Zero out remainder of buffer if we run out of data. */
|
/* Zero out remainder of buffer if we run out of data. */
|
||||||
for (i = numRead; i < numBytes; i++)
|
for( i=numRead; i<numBytes; i++ )
|
||||||
{
|
{
|
||||||
((char *) outputBuffer)[i] = 0;
|
((char *)outputBuffer)[i] = 0;
|
||||||
}
}
|
}
|
||||||
return 0;
|
}
|
||||||
}
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
/* Allocate buffer. */
|
|
||||||
static PaError PABLIO_InitFIFO(RingBuffer * rbuf, long numFrames, long bytesPerFrame)
|
/* Allocate buffer. */
|
||||||
{
|
static PaError PABLIO_InitFIFO( RingBuffer *rbuf, long numFrames, long bytesPerFrame )
|
||||||
long numBytes = numFrames * bytesPerFrame;
|
{
|
||||||
char *buffer = (char *) malloc(numBytes);
|
long numBytes = numFrames * bytesPerFrame;
|
||||||
if (buffer == NULL)
|
char *buffer = (char *) malloc( numBytes );
|
||||||
return paInsufficientMemory;
|
if( buffer == NULL ) return paInsufficientMemory;
|
||||||
memset(buffer, 0, numBytes);
|
memset( buffer, 0, numBytes );
|
||||||
return (PaError) RingBuffer_Init(rbuf, numBytes, buffer);
|
return (PaError) RingBuffer_Init( rbuf, numBytes, buffer );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Free buffer. */
|
||||||
/* Free buffer. */
|
static PaError PABLIO_TermFIFO( RingBuffer *rbuf )
|
||||||
static PaError PABLIO_TermFIFO(RingBuffer * rbuf)
|
{
|
||||||
{
|
if( rbuf->buffer ) free( rbuf->buffer );
|
||||||
if (rbuf->buffer)
|
rbuf->buffer = NULL;
|
||||||
free(rbuf->buffer);
|
return paNoError;
|
||||||
rbuf->buffer = NULL;
|
}
|
||||||
return paNoError;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
* Write data to ring buffer.
|
* Write data to ring buffer.
|
||||||
* Will not return until all the data has been written.
|
* Will not return until all the data has been written.
|
||||||
*/
|
*/
|
||||||
long WriteAudioStream(PABLIO_Stream * aStream, void *data, long numFrames)
|
long WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
|
||||||
{
|
{
|
||||||
long bytesWritten;
|
long bytesWritten;
|
||||||
char *p = (char *) data;
|
char *p = (char *) data;
|
||||||
long numBytes = aStream->bytesPerFrame * numFrames;
|
long numBytes = aStream->bytesPerFrame * numFrames;
|
||||||
while (numBytes > 0)
|
while( numBytes > 0)
|
||||||
{
|
{
|
||||||
bytesWritten = RingBuffer_Write(&aStream->outFIFO, p, numBytes);
|
bytesWritten = RingBuffer_Write( &aStream->outFIFO, p, numBytes );
|
||||||
numBytes -= bytesWritten;
|
numBytes -= bytesWritten;
|
||||||
p += bytesWritten;
|
p += bytesWritten;
|
||||||
if (numBytes > 0)
|
if( numBytes > 0) Pa_Sleep(10);
|
||||||
Pa_Sleep(10);
|
}
|
||||||
}
|
return numFrames;
|
||||||
return numFrames;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
* Read data from ring buffer.
|
* Read data from ring buffer.
|
||||||
* Will not return until all the data has been read.
|
* Will not return until all the data has been read.
|
||||||
*/
|
*/
|
||||||
long ReadAudioStream(PABLIO_Stream * aStream, void *data, long numFrames)
|
long ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
|
||||||
{
|
{
|
||||||
long bytesRead;
|
long bytesRead;
|
||||||
char *p = (char *) data;
|
char *p = (char *) data;
|
||||||
long numBytes = aStream->bytesPerFrame * numFrames;
|
long numBytes = aStream->bytesPerFrame * numFrames;
|
||||||
while (numBytes > 0)
|
while( numBytes > 0)
|
||||||
{
|
{
|
||||||
bytesRead = RingBuffer_Read(&aStream->inFIFO, p, numBytes);
|
bytesRead = RingBuffer_Read( &aStream->inFIFO, p, numBytes );
|
||||||
numBytes -= bytesRead;
|
numBytes -= bytesRead;
|
||||||
p += bytesRead;
|
p += bytesRead;
|
||||||
if (numBytes > 0)
|
if( numBytes > 0) Pa_Sleep(10);
|
||||||
Pa_Sleep(10);
|
}
|
||||||
}
|
return numFrames;
|
||||||
return numFrames;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
* Return the number of frames that could be written to the stream without
|
* Return the number of frames that could be written to the stream without
|
||||||
* having to wait.
|
* having to wait.
|
||||||
*/
|
*/
|
||||||
long GetAudioStreamWriteable(PABLIO_Stream * aStream)
|
long GetAudioStreamWriteable( PABLIO_Stream *aStream )
|
||||||
{
|
{
|
||||||
int bytesEmpty = RingBuffer_GetWriteAvailable(&aStream->outFIFO);
|
int bytesEmpty = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
|
||||||
return bytesEmpty / aStream->bytesPerFrame;
|
return bytesEmpty / aStream->bytesPerFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
* Return the number of frames that are available to be read from the
|
* Return the number of frames that are available to be read from the
|
||||||
* stream without having to wait.
|
* stream without having to wait.
|
||||||
*/
|
*/
|
||||||
long GetAudioStreamReadable(PABLIO_Stream * aStream)
|
long GetAudioStreamReadable( PABLIO_Stream *aStream )
|
||||||
{
|
{
|
||||||
int bytesFull = RingBuffer_GetReadAvailable(&aStream->inFIFO);
|
int bytesFull = RingBuffer_GetReadAvailable( &aStream->inFIFO );
|
||||||
return bytesFull / aStream->bytesPerFrame;
|
return bytesFull / aStream->bytesPerFrame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/************************************************************/
|
||||||
/************************************************************/
|
static unsigned long RoundUpToNextPowerOf2( unsigned long n )
|
||||||
static unsigned long RoundUpToNextPowerOf2(unsigned long n)
|
{
|
||||||
{
|
long numBits = 0;
|
||||||
long numBits = 0;
|
if( ((n-1) & n) == 0) return n; /* Already Power of two. */
|
||||||
if (((n - 1) & n) == 0)
|
while( n > 0 )
|
||||||
return n; /* Already Power of two. */
|
{
|
||||||
while (n > 0)
|
n= n>>1;
|
||||||
{
|
numBits++;
|
||||||
n = n >> 1;
|
}
|
||||||
numBits++;
|
return (1<<numBits);
|
||||||
}
|
}
|
||||||
return (1 << numBits);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************
|
/************************************************************
|
||||||
* Opens a PortAudio stream with default characteristics.
|
* Opens a PortAudio stream with default characteristics.
|
||||||
* Allocates PABLIO_Stream structure.
|
* Allocates PABLIO_Stream structure.
|
||||||
|
@ -201,133 +192,136 @@ static unsigned long RoundUpToNextPowerOf2(unsigned long n)
|
||||||
* flags parameter can be an ORed combination of:
|
* flags parameter can be an ORed combination of:
|
||||||
* PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
|
* PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
|
||||||
* and either PABLIO_MONO or PABLIO_STEREO
|
* and either PABLIO_MONO or PABLIO_STEREO
|
||||||
*/
|
*/
|
||||||
PaError OpenAudioStream(PABLIO_Stream ** rwblPtr, double sampleRate,
PaSampleFormat format, long flags, int indev,
|
PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
|
||||||
int outdev)
|
PaSampleFormat format, long flags, int indev, int outdev )
|
||||||
{
|
{
|
||||||
long bytesPerSample;
|
long bytesPerSample;
|
||||||
long doRead = 0;
|
long doRead = 0;
|
||||||
long doWrite = 0;
|
long doWrite = 0;
|
||||||
PaError err;
|
PaError err;
|
||||||
PABLIO_Stream * aStream;
|
PABLIO_Stream *aStream;
|
||||||
long minNumBuffers;
|
long minNumBuffers;
|
||||||
long numFrames;
|
long numFrames;
|
||||||
|
|
||||||
/* Allocate PABLIO_Stream structure for caller. */
|
|
||||||
aStream = (PABLIO_Stream *) malloc(sizeof(PABLIO_Stream));
|
|
||||||
if (aStream == NULL)
|
|
||||||
return paInsufficientMemory;
|
|
||||||
memset(aStream, 0, sizeof(PABLIO_Stream));
|
|
||||||
|
|
||||||
/* Determine size of a sample. */
|
|
||||||
bytesPerSample = Pa_GetSampleSize(format);
|
|
||||||
if (bytesPerSample < 0)
|
|
||||||
{
|
|
||||||
err = (PaError) bytesPerSample;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
aStream->samplesPerFrame = ((flags & PABLIO_MONO) != 0) ? 1 : 2;
|
|
||||||
aStream->bytesPerFrame = bytesPerSample * aStream->samplesPerFrame;
|
|
||||||
|
|
||||||
/* Initialize PortAudio */
|
|
||||||
err = Pa_Initialize();
|
|
||||||
if (err != paNoError)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* Warning: numFrames must be larger than amount of data processed per interrupt
|
|
||||||
* inside PA to prevent glitches. Just to be safe, adjust size upwards.
|
|
||||||
*/
|
|
||||||
minNumBuffers = 2 * Pa_GetMinNumBuffers(FRAMES_PER_BUFFER, sampleRate);
|
|
||||||
numFrames = minNumBuffers * FRAMES_PER_BUFFER;
|
|
||||||
|
|
||||||
/* The PortAudio callback runs in a high priority thread. But PABLIO
|
|
||||||
* runs in a normal foreground thread. So we may have much worse
|
|
||||||
* latency in PABLIO. So adjust latency to a safe level.
|
|
||||||
*/
|
|
||||||
{
|
|
||||||
const int safeLatencyMSec = 200;
|
|
||||||
int minLatencyMSec = (int) ((1000 * numFrames) / sampleRate);
|
|
||||||
if (minLatencyMSec < safeLatencyMSec)
|
|
||||||
{
|
|
||||||
numFrames = (int) ((safeLatencyMSec * sampleRate) / 1000);
|
|
||||||
}
|
|
||||||
}
numFrames = RoundUpToNextPowerOf2(numFrames);
|
|
||||||
|
|
||||||
/* Initialize Ring Buffers */
|
|
||||||
doRead = ((flags & PABLIO_READ) != 0);
|
|
||||||
doWrite = ((flags & PABLIO_WRITE) != 0);
|
|
||||||
if (doRead)
|
|
||||||
{
|
|
||||||
err = PABLIO_InitFIFO(&aStream->inFIFO, numFrames, aStream->bytesPerFrame);
|
|
||||||
if (err != paNoError)
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
if (doWrite)
|
|
||||||
{
|
|
||||||
long numBytes;
|
|
||||||
err = PABLIO_InitFIFO(&aStream->outFIFO, numFrames, aStream->bytesPerFrame);
|
|
||||||
if (err != paNoError)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
/* Make Write FIFO appear full initially. */
|
|
||||||
numBytes = RingBuffer_GetWriteAvailable(&aStream->outFIFO);
|
|
||||||
RingBuffer_AdvanceWriteIndex(&aStream->outFIFO, numBytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Open a PortAudio stream that we will use to communicate with the underlying
|
|
||||||
* audio drivers. */
|
|
||||||
err = Pa_OpenStream(
&aStream->stream,
|
|
||||||
(doRead ? (indev > -1) ? indev : Pa_GetDefaultInputDeviceID() : paNoDevice),
|
|
||||||
(doRead ? aStream->samplesPerFrame : 0),
format,
NULL,
|
|
||||||
(doWrite ? (outdev > -1) ? outdev : Pa_GetDefaultOutputDeviceID() : paNoDevice),
|
|
||||||
(doWrite ? aStream->samplesPerFrame : 0),
format,
NULL,
sampleRate,
FRAMES_PER_BUFFER,
|
|
||||||
minNumBuffers,
paClipOff,
|
|
||||||
/* we won't output out of range samples so don't bother clipping them */
|
|
||||||
blockingIOCallback,
aStream);
|
|
||||||
if (err != paNoError)
|
|
||||||
goto error;
|
|
||||||
err = Pa_StartStream(aStream->stream);
|
|
||||||
if (err != paNoError)
|
|
||||||
goto error;
|
|
||||||
*rwblPtr = aStream;
|
|
||||||
return paNoError;
|
|
||||||
error:
CloseAudioStream(aStream);
|
|
||||||
*rwblPtr = NULL;
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/************************************************************/
|
|
||||||
PaError CloseAudioStream(PABLIO_Stream * aStream)
|
|
||||||
{
|
|
||||||
PaError err = paNoError;
|
|
||||||
int bytesEmpty;
|
|
||||||
int byteSize = aStream->outFIFO.bufferSize;
|
|
||||||
if (aStream->stream != NULL) /* Make sure stream was opened. PLB021214 */
|
|
||||||
{
|
|
||||||
|
|
||||||
/* If we are writing data, make sure we play everything written. */
|
|
||||||
if (byteSize > 0)
|
|
||||||
{
|
|
||||||
int timeOutMSec = 2000;
|
|
||||||
bytesEmpty = RingBuffer_GetWriteAvailable(&aStream->outFIFO);
|
|
||||||
while ((bytesEmpty < byteSize) && (timeOutMSec > 0))
|
|
||||||
{
|
|
||||||
Pa_Sleep(20);
|
|
||||||
timeOutMSec -= 20;
|
|
||||||
bytesEmpty = RingBuffer_GetWriteAvailable(&aStream->outFIFO);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
err = Pa_StopStream(aStream->stream);
|
|
||||||
if (err != paNoError)
|
|
||||||
goto error;
|
|
||||||
err = Pa_CloseStream(aStream->stream);
|
|
||||||
}
|
|
||||||
error:
Pa_Terminate();
|
|
||||||
PABLIO_TermFIFO(&aStream->inFIFO);
|
|
||||||
PABLIO_TermFIFO(&aStream->outFIFO);
|
|
||||||
free(aStream);
|
|
||||||
return err;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
/* Allocate PABLIO_Stream structure for caller. */
|
||||||
|
aStream = (PABLIO_Stream *) malloc( sizeof(PABLIO_Stream) );
|
||||||
|
if( aStream == NULL ) return paInsufficientMemory;
|
||||||
|
memset( aStream, 0, sizeof(PABLIO_Stream) );
|
||||||
|
|
||||||
|
/* Determine size of a sample. */
|
||||||
|
bytesPerSample = Pa_GetSampleSize( format );
|
||||||
|
if( bytesPerSample < 0 )
|
||||||
|
{
|
||||||
|
err = (PaError) bytesPerSample;
|
||||||
|
goto error;
|
||||||
|
}
|
||||||
|
aStream->samplesPerFrame = ((flags&PABLIO_MONO) != 0) ? 1 : 2;
|
||||||
|
aStream->bytesPerFrame = bytesPerSample * aStream->samplesPerFrame;
|
||||||
|
|
||||||
|
/* Initialize PortAudio */
|
||||||
|
err = Pa_Initialize();
|
||||||
|
if( err != paNoError ) goto error;
|
||||||
|
|
||||||
|
/* Warning: numFrames must be larger than amount of data processed per interrupt
|
||||||
|
* inside PA to prevent glitches. Just to be safe, adjust size upwards.
|
||||||
|
*/
|
||||||
|
minNumBuffers = 2 * Pa_GetMinNumBuffers( FRAMES_PER_BUFFER, sampleRate );
|
||||||
|
numFrames = minNumBuffers * FRAMES_PER_BUFFER;
|
||||||
|
/* The PortAudio callback runs in a high priority thread. But PABLIO
|
||||||
|
* runs in a normal foreground thread. So we may have much worse
|
||||||
|
* latency in PABLIO. So adjust latency to a safe level.
|
||||||
|
*/
|
||||||
|
{
|
||||||
|
const int safeLatencyMSec = 200;
|
||||||
|
int minLatencyMSec = (int) ((1000 * numFrames) / sampleRate);
|
||||||
|
if( minLatencyMSec < safeLatencyMSec )
|
||||||
|
{
|
||||||
|
numFrames = (int) ((safeLatencyMSec * sampleRate) / 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
numFrames = RoundUpToNextPowerOf2( numFrames );
|
||||||
|
|
||||||
|
/* Initialize Ring Buffers */
|
||||||
|
doRead = ((flags & PABLIO_READ) != 0);
|
||||||
|
doWrite = ((flags & PABLIO_WRITE) != 0);
|
||||||
|
if(doRead)
|
||||||
|
{
|
||||||
|
err = PABLIO_InitFIFO( &aStream->inFIFO, numFrames, aStream->bytesPerFrame );
|
||||||
|
if( err != paNoError ) goto error;
|
||||||
|
}
|
||||||
|
if(doWrite)
|
||||||
|
{
|
||||||
|
long numBytes;
|
||||||
|
err = PABLIO_InitFIFO( &aStream->outFIFO, numFrames, aStream->bytesPerFrame );
|
||||||
|
if( err != paNoError ) goto error;
|
||||||
|
/* Make Write FIFO appear full initially. */
|
||||||
|
numBytes = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
|
||||||
|
RingBuffer_AdvanceWriteIndex( &aStream->outFIFO, numBytes );
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Open a PortAudio stream that we will use to communicate with the underlying
|
||||||
|
* audio drivers. */
|
||||||
|
err = Pa_OpenStream(
|
||||||
|
&aStream->stream,
|
||||||
|
(doRead ? (indev > -1) ? indev : Pa_GetDefaultInputDeviceID() : paNoDevice),
|
||||||
|
(doRead ? aStream->samplesPerFrame : 0 ),
|
||||||
|
format,
|
||||||
|
NULL,
|
||||||
|
(doWrite ? (outdev > -1) ? outdev : Pa_GetDefaultOutputDeviceID() : paNoDevice),
|
||||||
|
(doWrite ? aStream->samplesPerFrame : 0 ),
|
||||||
|
format,
|
||||||
|
NULL,
|
||||||
|
sampleRate,
|
||||||
|
FRAMES_PER_BUFFER,
|
||||||
|
minNumBuffers,
|
||||||
|
paClipOff, /* we won't output out of range samples so don't bother clipping them */
|
||||||
|
blockingIOCallback,
|
||||||
|
aStream );
|
||||||
|
if( err != paNoError ) goto error;
|
||||||
|
|
||||||
|
err = Pa_StartStream( aStream->stream );
|
||||||
|
if( err != paNoError ) goto error;
|
||||||
|
|
||||||
|
*rwblPtr = aStream;
|
||||||
|
return paNoError;
|
||||||
|
|
||||||
|
error:
|
||||||
|
CloseAudioStream( aStream );
|
||||||
|
*rwblPtr = NULL;
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
/************************************************************/
|
||||||
|
PaError CloseAudioStream( PABLIO_Stream *aStream )
|
||||||
|
{
|
||||||
|
PaError err = paNoError;
|
||||||
|
int bytesEmpty;
|
||||||
|
int byteSize = aStream->outFIFO.bufferSize;
|
||||||
|
|
||||||
|
if( aStream->stream != NULL ) /* Make sure stream was opened. PLB021214 */
|
||||||
|
{
|
||||||
|
/* If we are writing data, make sure we play everything written. */
|
||||||
|
if( byteSize > 0 )
|
||||||
|
{
|
||||||
|
int timeOutMSec = 2000;
|
||||||
|
bytesEmpty = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
|
||||||
|
while( (bytesEmpty < byteSize) && (timeOutMSec > 0) )
|
||||||
|
{
|
||||||
|
Pa_Sleep( 20 );
|
||||||
|
timeOutMSec -= 20;
|
||||||
|
bytesEmpty = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
err = Pa_StopStream( aStream->stream );
|
||||||
|
if( err != paNoError ) goto error;
|
||||||
|
err = Pa_CloseStream( aStream->stream );
|
||||||
|
}
|
||||||
|
|
||||||
|
error:
|
||||||
|
Pa_Terminate();
|
||||||
|
PABLIO_TermFIFO( &aStream->inFIFO );
|
||||||
|
PABLIO_TermFIFO( &aStream->outFIFO );
|
||||||
|
free( aStream );
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
|
@ -32,188 +32,168 @@
|
||||||
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "ringbuffer.h"
|
#include "ringbuffer.h"
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
* Initialize FIFO.
|
* Initialize FIFO.
|
||||||
* numBytes must be power of 2, returns -1 if not.
|
* numBytes must be power of 2, returns -1 if not.
|
||||||
*/
|
*/
|
||||||
long RingBuffer_Init(RingBuffer * rbuf, long numBytes, void *dataPtr)
|
long RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr )
|
||||||
{
|
{
|
||||||
if (((numBytes - 1) & numBytes) != 0)
|
if( ((numBytes-1) & numBytes) != 0) return -1; /* Not Power of two. */
|
||||||
return -1; /* Not Power of two. */
|
rbuf->bufferSize = numBytes;
|
||||||
rbuf->bufferSize = numBytes;
|
rbuf->buffer = (char *)dataPtr;
|
||||||
rbuf->buffer = (char *) dataPtr;
|
RingBuffer_Flush( rbuf );
|
||||||
RingBuffer_Flush(rbuf);
|
rbuf->bigMask = (numBytes*2)-1;
|
||||||
rbuf->bigMask = (numBytes * 2) - 1;
|
rbuf->smallMask = (numBytes)-1;
|
||||||
rbuf->smallMask = (numBytes) - 1;
|
return 0;
|
||||||
return 0;
|
}
|
||||||
}
|
/***************************************************************************
|
||||||
|
** Return number of bytes available for reading. */
|
||||||
|
long RingBuffer_GetReadAvailable( RingBuffer *rbuf )
|
||||||
|
{
|
||||||
|
return ( (rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask );
|
||||||
|
}
|
||||||
|
/***************************************************************************
|
||||||
|
** Return number of bytes available for writing. */
|
||||||
|
long RingBuffer_GetWriteAvailable( RingBuffer *rbuf )
|
||||||
|
{
|
||||||
|
return ( rbuf->bufferSize - RingBuffer_GetReadAvailable(rbuf));
|
||||||
|
}
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
** Return number of bytes available for reading. */
|
** Clear buffer. Should only be called when buffer is NOT being read. */
|
||||||
long RingBuffer_GetReadAvailable(RingBuffer * rbuf)
|
void RingBuffer_Flush( RingBuffer *rbuf )
|
||||||
{
|
{
|
||||||
return ((rbuf->writeIndex - rbuf->readIndex) & rbuf->bigMask);
|
rbuf->writeIndex = rbuf->readIndex = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
|
||||||
** Return number of bytes available for writing. */
|
|
||||||
long RingBuffer_GetWriteAvailable(RingBuffer * rbuf)
|
|
||||||
{
|
|
||||||
return (rbuf->bufferSize - RingBuffer_GetReadAvailable(rbuf));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
|
||||||
** Clear buffer. Should only be called when buffer is NOT being read. */
|
|
||||||
void RingBuffer_Flush(RingBuffer * rbuf)
|
|
||||||
{
|
|
||||||
rbuf->writeIndex = rbuf->readIndex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
** Get address of region(s) to which we can write data.
|
** Get address of region(s) to which we can write data.
|
||||||
** If the region is contiguous, size2 will be zero.
|
** If the region is contiguous, size2 will be zero.
|
||||||
** If non-contiguous, size2 will be the size of second region.
|
** If non-contiguous, size2 will be the size of second region.
|
||||||
** Returns room available to be written or numBytes, whichever is smaller.
|
** Returns room available to be written or numBytes, whichever is smaller.
|
||||||
*/
|
*/
|
||||||
long RingBuffer_GetWriteRegions(RingBuffer * rbuf, long numBytes,
void **dataPtr1, long *sizePtr1,
void **dataPtr2,
|
long RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes,
|
||||||
long *sizePtr2)
|
void **dataPtr1, long *sizePtr1,
|
||||||
{
|
void **dataPtr2, long *sizePtr2 )
|
||||||
long index;
|
{
|
||||||
long available = RingBuffer_GetWriteAvailable(rbuf);
|
long index;
|
||||||
if (numBytes > available)
|
long available = RingBuffer_GetWriteAvailable( rbuf );
|
||||||
numBytes = available;
|
if( numBytes > available ) numBytes = available;
|
||||||
|
/* Check to see if write is not contiguous. */
|
||||||
/* Check to see if write is not contiguous. */
|
index = rbuf->writeIndex & rbuf->smallMask;
|
||||||
index = rbuf->writeIndex & rbuf->smallMask;
|
if( (index + numBytes) > rbuf->bufferSize )
|
||||||
if ((index + numBytes) > rbuf->bufferSize)
|
{
|
||||||
{
|
/* Write data in two blocks that wrap the buffer. */
|
||||||
|
long firstHalf = rbuf->bufferSize - index;
|
||||||
/* Write data in two blocks that wrap the buffer. */
|
*dataPtr1 = &rbuf->buffer[index];
|
||||||
long firstHalf = rbuf->bufferSize - index;
|
*sizePtr1 = firstHalf;
|
||||||
*dataPtr1 = &rbuf->buffer[index];
|
*dataPtr2 = &rbuf->buffer[0];
|
||||||
*sizePtr1 = firstHalf;
|
*sizePtr2 = numBytes - firstHalf;
|
||||||
*dataPtr2 = &rbuf->buffer[0];
|
}
|
||||||
*sizePtr2 = numBytes - firstHalf;
|
else
|
||||||
}
|
{
|
||||||
|
*dataPtr1 = &rbuf->buffer[index];
|
||||||
else
|
*sizePtr1 = numBytes;
|
||||||
{
|
*dataPtr2 = NULL;
|
||||||
*dataPtr1 = &rbuf->buffer[index];
|
*sizePtr2 = 0;
|
||||||
*sizePtr1 = numBytes;
|
}
|
||||||
*dataPtr2 = NULL;
|
return numBytes;
|
||||||
*sizePtr2 = 0;
|
}
|
||||||
}
|
|
||||||
return numBytes;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
*/
|
*/
|
||||||
long RingBuffer_AdvanceWriteIndex(RingBuffer * rbuf, long numBytes)
|
long RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes )
|
||||||
{
|
{
|
||||||
return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
|
return rbuf->writeIndex = (rbuf->writeIndex + numBytes) & rbuf->bigMask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
** Get address of region(s) from which we can read data.
|
** Get address of region(s) from which we can read data.
|
||||||
** If the region is contiguous, size2 will be zero.
|
** If the region is contiguous, size2 will be zero.
|
||||||
** If non-contiguous, size2 will be the size of second region.
|
** If non-contiguous, size2 will be the size of second region.
|
||||||
** Returns room available to be written or numBytes, whichever is smaller.
|
** Returns room available to be written or numBytes, whichever is smaller.
|
||||||
*/
|
*/
|
||||||
long RingBuffer_GetReadRegions(RingBuffer * rbuf, long numBytes,
void **dataPtr1, long *sizePtr1,
void **dataPtr2,
|
long RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes,
|
||||||
long *sizePtr2)
|
void **dataPtr1, long *sizePtr1,
|
||||||
{
|
void **dataPtr2, long *sizePtr2 )
|
||||||
long index;
|
{
|
||||||
long available = RingBuffer_GetReadAvailable(rbuf);
|
long index;
|
||||||
if (numBytes > available)
|
long available = RingBuffer_GetReadAvailable( rbuf );
|
||||||
numBytes = available;
|
if( numBytes > available ) numBytes = available;
|
||||||
|
/* Check to see if read is not contiguous. */
|
||||||
/* Check to see if read is not contiguous. */
|
index = rbuf->readIndex & rbuf->smallMask;
|
||||||
index = rbuf->readIndex & rbuf->smallMask;
|
if( (index + numBytes) > rbuf->bufferSize )
|
||||||
if ((index + numBytes) > rbuf->bufferSize)
|
{
|
||||||
{
|
/* Write data in two blocks that wrap the buffer. */
|
||||||
|
long firstHalf = rbuf->bufferSize - index;
|
||||||
/* Write data in two blocks that wrap the buffer. */
|
*dataPtr1 = &rbuf->buffer[index];
|
||||||
long firstHalf = rbuf->bufferSize - index;
|
*sizePtr1 = firstHalf;
|
||||||
*dataPtr1 = &rbuf->buffer[index];
|
*dataPtr2 = &rbuf->buffer[0];
|
||||||
*sizePtr1 = firstHalf;
|
*sizePtr2 = numBytes - firstHalf;
|
||||||
*dataPtr2 = &rbuf->buffer[0];
|
}
|
||||||
*sizePtr2 = numBytes - firstHalf;
|
else
|
||||||
}
|
{
|
||||||
|
*dataPtr1 = &rbuf->buffer[index];
|
||||||
else
|
*sizePtr1 = numBytes;
|
||||||
{
|
*dataPtr2 = NULL;
|
||||||
*dataPtr1 = &rbuf->buffer[index];
|
*sizePtr2 = 0;
|
||||||
*sizePtr1 = numBytes;
|
}
|
||||||
*dataPtr2 = NULL;
|
return numBytes;
|
||||||
*sizePtr2 = 0;
|
}
|
||||||
}
|
/***************************************************************************
|
||||||
return numBytes;
|
*/
|
||||||
}
|
long RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes )
|
||||||
|
{
|
||||||
|
return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
|
||||||
|
}
|
||||||
|
|
||||||
/***************************************************************************
|
/***************************************************************************
|
||||||
*/
|
** Return bytes written. */
|
||||||
long RingBuffer_AdvanceReadIndex(RingBuffer * rbuf, long numBytes)
|
long RingBuffer_Write( RingBuffer *rbuf, void *data, long numBytes )
|
||||||
{
|
{
|
||||||
return rbuf->readIndex = (rbuf->readIndex + numBytes) & rbuf->bigMask;
|
long size1, size2, numWritten;
|
||||||
}
|
void *data1, *data2;
|
||||||
|
numWritten = RingBuffer_GetWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
|
||||||
|
if( size2 > 0 )
|
||||||
/***************************************************************************
|
{
|
||||||
** Return bytes written. */
|
|
||||||
long RingBuffer_Write(RingBuffer * rbuf, void *data, long numBytes)
|
|
||||||
{
|
|
||||||
long size1, size2, numWritten;
|
|
||||||
void *data1, *data2;
|
|
||||||
numWritten = RingBuffer_GetWriteRegions(rbuf, numBytes, &data1, &size1, &data2, &size2);
|
|
||||||
if (size2 > 0)
|
|
||||||
{
|
|
||||||
memcpy(data1, data, size1);
|
|
||||||
data = ((char *) data) + size1;
|
|
||||||
memcpy(data2, data, size2);
|
|
||||||
}
|
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
memcpy(data1, data, size1);
|
|
||||||
}
|
|
||||||
RingBuffer_AdvanceWriteIndex(rbuf, numWritten);
|
|
||||||
return numWritten;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************
|
|
||||||
** Return bytes read. */
|
|
||||||
long RingBuffer_Read(RingBuffer * rbuf, void *data, long numBytes)
|
|
||||||
{
|
|
||||||
long size1, size2, numRead;
|
|
||||||
void *data1, *data2;
|
|
||||||
numRead = RingBuffer_GetReadRegions(rbuf, numBytes, &data1, &size1, &data2, &size2);
|
|
||||||
if (size2 > 0)
|
|
||||||
{
|
|
||||||
memcpy(data, data1, size1);
|
|
||||||
data = ((char *) data) + size1;
|
|
||||||
memcpy(data, data2, size2);
|
|
||||||
}
|
|
||||||
|
|
||||||
else
|
|
||||||
{
|
|
||||||
memcpy(data, data1, size1);
|
|
||||||
}
|
|
||||||
RingBuffer_AdvanceReadIndex(rbuf, numRead);
|
|
||||||
return numRead;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
memcpy( data1, data, size1 );
|
||||||
|
data = ((char *)data) + size1;
|
||||||
|
memcpy( data2, data, size2 );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
memcpy( data1, data, size1 );
|
||||||
|
}
|
||||||
|
RingBuffer_AdvanceWriteIndex( rbuf, numWritten );
|
||||||
|
return numWritten;
|
||||||
|
}
|
||||||
|
|
||||||
|
/***************************************************************************
|
||||||
|
** Return bytes read. */
|
||||||
|
long RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes )
|
||||||
|
{
|
||||||
|
long size1, size2, numRead;
|
||||||
|
void *data1, *data2;
|
||||||
|
numRead = RingBuffer_GetReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
|
||||||
|
if( size2 > 0 )
|
||||||
|
{
|
||||||
|
memcpy( data, data1, size1 );
|
||||||
|
data = ((char *)data) + size1;
|
||||||
|
memcpy( data, data2, size2 );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
memcpy( data, data1, size1 );
|
||||||
|
}
|
||||||
|
RingBuffer_AdvanceReadIndex( rbuf, numRead );
|
||||||
|
return numRead;
|
||||||
|
}
|
||||||
|
|
|
@ -86,8 +86,8 @@ static struct {
|
||||||
|
|
||||||
|
|
||||||
struct private_object {
|
struct private_object {
|
||||||
unsigned int flags; /* FLAGS */
|
unsigned int flags; /* FLAGS */
|
||||||
struct switch_frame frame; /* Frame for Writing */
|
struct switch_frame frame; /* Frame for Writing */
|
||||||
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE];
|
||||||
struct sangoma_pri *spri;
|
struct sangoma_pri *spri;
|
||||||
pri_event ring_event;
|
pri_event ring_event;
|
||||||
|
@ -110,7 +110,7 @@ static void set_global_dialplan(char *dialplan)
|
||||||
free(globals.dialplan);
|
free(globals.dialplan);
|
||||||
globals.dialplan = NULL;
|
globals.dialplan = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
globals.dialplan = strdup(dialplan);
|
globals.dialplan = strdup(dialplan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,18 +153,15 @@ static switch_status wanpipe_on_init(switch_core_session *session);
|
||||||
static switch_status wanpipe_on_hangup(switch_core_session *session);
|
static switch_status wanpipe_on_hangup(switch_core_session *session);
|
||||||
static switch_status wanpipe_on_loopback(switch_core_session *session);
|
static switch_status wanpipe_on_loopback(switch_core_session *session);
|
||||||
static switch_status wanpipe_on_transmit(switch_core_session *session);
|
static switch_status wanpipe_on_transmit(switch_core_session *session);
|
||||||
static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status wanpipe_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
static switch_status wanpipe_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status wanpipe_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
switch_io_flag flags, int stream_id);
|
static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
|
||||||
static switch_status wanpipe_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
|
||||||
switch_io_flag flags, int stream_id);
|
static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
|
||||||
static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event);
|
|
||||||
static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event);
|
|
||||||
static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event);
|
|
||||||
static int check_flags(struct sangoma_pri *spri);
|
static int check_flags(struct sangoma_pri *spri);
|
||||||
static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event);
|
static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
|
||||||
static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event);
|
static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event);
|
||||||
static void *pri_thread_run(switch_thread *thread, void *obj);
|
static void *pri_thread_run(switch_thread *thread, void *obj);
|
||||||
static int config_wanpipe(int reload);
|
static int config_wanpipe(int reload);
|
||||||
|
|
||||||
|
@ -187,10 +184,10 @@ static switch_status wanpipe_on_init(switch_core_session *session)
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
tech_pvt->frame.data = tech_pvt->databuf;
|
tech_pvt->frame.data = tech_pvt->databuf;
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE INIT\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE INIT\n");
|
||||||
|
|
||||||
|
|
||||||
/* Move Channel's State Machine to RING */
|
/* Move Channel's State Machine to RING */
|
||||||
switch_channel_set_state(channel, CS_RING);
|
switch_channel_set_state(channel, CS_RING);
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
@ -224,14 +221,10 @@ static switch_status wanpipe_on_hangup(switch_core_session *session)
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
switch_socket_close(&tech_pvt->socket);
|
switch_socket_close(&tech_pvt->socket);
|
||||||
|
|
||||||
pri_hangup(tech_pvt->spri->pri,
|
pri_hangup(tech_pvt->spri->pri, tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call, tech_pvt->cause);
|
||||||
tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call,
|
pri_destroycall(tech_pvt->spri->pri, tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.call);
|
||||||
tech_pvt->cause);
|
|
||||||
pri_destroycall(tech_pvt->spri->pri,
|
|
||||||
tech_pvt->hangup_event.hangup.call ? tech_pvt->hangup_event.hangup.call : tech_pvt->ring_event.ring.
|
|
||||||
call);
|
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE HANGUP\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE HANGUP\n");
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
@ -248,8 +241,7 @@ static switch_status wanpipe_on_transmit(switch_core_session *session)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status wanpipe_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NOT IMPLEMENTED\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "NOT IMPLEMENTED\n");
|
||||||
|
|
||||||
|
@ -260,7 +252,7 @@ static switch_status wanpipe_answer_channel(switch_core_session *session)
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
|
@ -268,14 +260,13 @@ static switch_status wanpipe_answer_channel(switch_core_session *session)
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
pri_answer(tech_pvt->spri->pri, tech_pvt->ring_event.ring.call, 0, 1);
|
pri_answer(tech_pvt->spri->pri, tech_pvt->ring_event.ring.call, 0, 1);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static switch_status wanpipe_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status wanpipe_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
@ -287,22 +278,25 @@ static switch_status wanpipe_read_frame(switch_core_session *session, switch_fra
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
bp = tech_pvt->databuf;
|
bp = tech_pvt->databuf;
|
||||||
|
|
||||||
*frame = NULL;
|
*frame = NULL;
|
||||||
memset(tech_pvt->databuf, 0, sizeof(tech_pvt->databuf));
|
memset(tech_pvt->databuf, 0, sizeof(tech_pvt->databuf));
|
||||||
while (bytes < globals.bytes_per_frame) {
|
while (bytes < globals.bytes_per_frame) {
|
||||||
if ((res = switch_socket_waitfor(tech_pvt->socket, timeout, POLLIN | POLLERR)) < 0) {
|
if ((res = switch_socket_waitfor(tech_pvt->socket, timeout, POLLIN|POLLERR)) < 0) {
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
} else if (res == 0) {
|
} else if (res == 0) {
|
||||||
tech_pvt->frame.datalen = 0;
|
tech_pvt->frame.datalen = 0;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((res = sangoma_readmsg_socket(tech_pvt->socket,
|
if ((res = sangoma_readmsg_socket(
|
||||||
|
tech_pvt->socket,
|
||||||
&tech_pvt->hdrframe,
|
&tech_pvt->hdrframe,
|
||||||
sizeof(tech_pvt->hdrframe), bp, sizeof(tech_pvt->databuf) - bytes, 0)) < 0) {
|
sizeof(tech_pvt->hdrframe),
|
||||||
|
bp,
|
||||||
|
sizeof(tech_pvt->databuf) - bytes, 0)) < 0) {
|
||||||
if (errno == EBUSY) {
|
if (errno == EBUSY) {
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
|
@ -312,14 +306,13 @@ static switch_status wanpipe_read_frame(switch_core_session *session, switch_fra
|
||||||
bytes += res;
|
bytes += res;
|
||||||
bp += bytes;
|
bp += bytes;
|
||||||
}
|
}
|
||||||
tech_pvt->frame.datalen = bytes;
|
tech_pvt->frame.datalen = bytes;
|
||||||
|
|
||||||
*frame = &tech_pvt->frame;
|
*frame = &tech_pvt->frame;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status wanpipe_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status wanpipe_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
|
@ -336,12 +329,14 @@ static switch_status wanpipe_write_frame(switch_core_session *session, switch_fr
|
||||||
|
|
||||||
while (bytes > 0) {
|
while (bytes > 0) {
|
||||||
switch_socket_waitfor(tech_pvt->socket, -1, POLLOUT | POLLERR | POLLHUP);
|
switch_socket_waitfor(tech_pvt->socket, -1, POLLOUT | POLLERR | POLLHUP);
|
||||||
res = sangoma_sendmsg_socket(tech_pvt->socket,
|
res = sangoma_sendmsg_socket(
|
||||||
&tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), bp, PACKET_LEN, 0);
|
tech_pvt->socket,
|
||||||
|
&tech_pvt->hdrframe,
|
||||||
|
sizeof(tech_pvt->hdrframe),
|
||||||
|
bp,
|
||||||
|
PACKET_LEN, 0);
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Bad Write frame len %d write %d bytes returned %d errno %d!\n", frame->datalen, PACKET_LEN, res, errno);
|
||||||
"Bad Write frame len %d write %d bytes returned %d errno %d!\n", frame->datalen,
|
|
||||||
PACKET_LEN, res, errno);
|
|
||||||
if (errno == EBUSY) {
|
if (errno == EBUSY) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -357,48 +352,47 @@ static switch_status wanpipe_write_frame(switch_core_session *session, switch_fr
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_io_routines wanpipe_io_routines */ {
|
static const switch_io_routines wanpipe_io_routines*/ {
|
||||||
/*.outgoing_channel */ wanpipe_outgoing_channel,
|
/*.outgoing_channel*/ wanpipe_outgoing_channel,
|
||||||
/*.answer_channel */ wanpipe_answer_channel,
|
/*.answer_channel*/ wanpipe_answer_channel,
|
||||||
/*.read_frame */ wanpipe_read_frame,
|
/*.read_frame*/ wanpipe_read_frame,
|
||||||
/*.write_frame */ wanpipe_write_frame
|
/*.write_frame*/ wanpipe_write_frame
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_event_handler_table wanpipe_event_handlers = {
|
static const switch_event_handler_table wanpipe_event_handlers = {
|
||||||
/*.on_init */ wanpipe_on_init,
|
/*.on_init*/ wanpipe_on_init,
|
||||||
/*.on_ring */ wanpipe_on_ring,
|
/*.on_ring*/ wanpipe_on_ring,
|
||||||
/*.on_execute */ NULL,
|
/*.on_execute*/ NULL,
|
||||||
/*.on_hangup */ wanpipe_on_hangup,
|
/*.on_hangup*/ wanpipe_on_hangup,
|
||||||
/*.on_loopback */ wanpipe_on_loopback,
|
/*.on_loopback*/ wanpipe_on_loopback,
|
||||||
/*.on_transmit */ wanpipe_on_transmit
|
/*.on_transmit*/ wanpipe_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface wanpipe_endpoint_interface = {
|
static const switch_endpoint_interface wanpipe_endpoint_interface = {
|
||||||
/*.interface_name */ "wanpipe",
|
/*.interface_name*/ "wanpipe",
|
||||||
/*.io_routines */ &wanpipe_io_routines,
|
/*.io_routines*/ &wanpipe_io_routines,
|
||||||
/*.event_handlers */ &wanpipe_event_handlers,
|
/*.event_handlers*/ &wanpipe_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface wanpipe_module_interface = {
|
static const switch_loadable_module_interface wanpipe_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &wanpipe_endpoint_interface,
|
/*.endpoint_interface*/ &wanpipe_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
Public switch_status switch_module_load(const switch_loadable_module_interface **interface, chanr * filename)
|
Public switch_status switch_module_load(const switch_loadable_module_interface **interface, chanr *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &wanpipe_module_interface;
|
*interface = &wanpipe_module_interface;
|
||||||
|
|
||||||
|
@ -412,7 +406,7 @@ Public switch_status switch_module_load(const switch_loadable_module_interface *
|
||||||
|
|
||||||
/* Event Handlers */
|
/* Event Handlers */
|
||||||
|
|
||||||
static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event)
|
static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event)
|
||||||
{
|
{
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "number is: %s\n", event->ring.callednum);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "number is: %s\n", event->ring.callednum);
|
||||||
if (strlen(event->ring.callednum) > 3) {
|
if (strlen(event->ring.callednum) > 3) {
|
||||||
|
@ -422,7 +416,7 @@ static int on_info(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event)
|
static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event)
|
||||||
{
|
{
|
||||||
struct channel_map *chanmap;
|
struct channel_map *chanmap;
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
|
@ -437,18 +431,18 @@ static int on_hangup(struct sangoma_pri *spri, sangoma_pri_event_t event_type, p
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
tech_pvt->cause = event->hangup.cause;
|
tech_pvt->cause = event->hangup.cause;
|
||||||
memcpy(&tech_pvt->hangup_event, event, sizeof(*event));
|
memcpy(&tech_pvt->hangup_event, event, sizeof(*event));
|
||||||
|
|
||||||
switch_channel_set_state(channel, CS_HANGUP);
|
switch_channel_set_state(channel, CS_HANGUP);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "-- Hanging up channel %d\n", event->hangup.channel);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"-- Hanging up channel %d\n", event->hangup.channel);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event)
|
static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event)
|
||||||
{
|
{
|
||||||
char name[128];
|
char name[128];
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
|
@ -459,13 +453,11 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
|
||||||
|
|
||||||
chanmap = spri->private;
|
chanmap = spri->private;
|
||||||
if (chanmap->map[event->ring.channel]) {
|
if (chanmap->map[event->ring.channel]) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "--Duplicate Ring on channel %d (ignored)\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"--Duplicate Ring on channel %d (ignored)\n", event->ring.channel);
|
||||||
event->ring.channel);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "-- Ring on channel %d (from %s to %s)\n", event->ring.channel,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"-- Ring on channel %d (from %s to %s)\n", event->ring.channel, event->ring.callingnum, event->ring.callednum);
|
||||||
event->ring.callingnum, event->ring.callednum);
|
|
||||||
|
|
||||||
sprintf(name, "w%dg%d", globals.span, event->ring.channel);
|
sprintf(name, "w%dg%d", globals.span, event->ring.channel);
|
||||||
if ((session = switch_core_session_request(&wanpipe_endpoint_interface, NULL))) {
|
if ((session = switch_core_session_request(&wanpipe_endpoint_interface, NULL))) {
|
||||||
|
@ -484,18 +476,18 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
|
||||||
switch_core_session_destroy(&session);
|
switch_core_session_destroy(&session);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (event->ring.ani2 >= 0) {
|
if (event->ring.ani2 >= 0) {
|
||||||
snprintf(ani2str, 5, "%.2d", event->ring.ani2);
|
snprintf(ani2str, 5, "%.2d", event->ring.ani2);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
globals.dialplan,
|
globals.dialplan,
|
||||||
"wanpipe fixme",
|
"wanpipe fixme",
|
||||||
event->ring.callingnum,
|
event->ring.callingnum,
|
||||||
event->ring.callingani,
|
event->ring.callingani,
|
||||||
switch_strlen_zero(ani2str) ? NULL : ani2str,
|
switch_strlen_zero(ani2str) ? NULL : ani2str,
|
||||||
event->ring.callednum))) {
|
event->ring.callednum))) {
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -510,6 +502,7 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
|
||||||
if ((fd = sangoma_create_socket_intr(spri->span, event->ring.channel)) < 0) {
|
if ((fd = sangoma_create_socket_intr(spri->span, event->ring.channel)) < 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open fd!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open fd!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
//sangoma_tdm_set_hw_period(fd, &tdm_api, 480);
|
//sangoma_tdm_set_hw_period(fd, &tdm_api, 480);
|
||||||
|
|
||||||
tech_pvt->socket = fd;
|
tech_pvt->socket = fd;
|
||||||
|
@ -527,28 +520,27 @@ static int on_ring(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri
|
||||||
|
|
||||||
static int check_flags(struct sangoma_pri *spri)
|
static int check_flags(struct sangoma_pri *spri)
|
||||||
{
|
{
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event)
|
static int on_restart(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "-- Restarting channel %d\n", event->restart.channel);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"-- Restarting channel %d\n", event->restart.channel);
|
||||||
|
|
||||||
if ((fd = sangoma_create_socket_intr(spri->span, event->restart.channel)) < 0) {
|
if ((fd = sangoma_create_socket_intr(spri->span, event->restart.channel)) < 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't open fd!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"Can't open fd!\n");
|
||||||
} else {
|
} else {
|
||||||
close(fd);
|
close(fd);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event * event)
|
static int on_anything(struct sangoma_pri *spri, sangoma_pri_event_t event_type, pri_event *event)
|
||||||
{
|
{
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Caught Event %d (%s)\n", event_type,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,"Caught Event %d (%s)\n", event_type, sangoma_pri_event_str(event_type));
|
||||||
sangoma_pri_event_str(event_type));
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -567,13 +559,13 @@ static void *pri_thread_run(switch_thread *thread, void *obj)
|
||||||
spri->on_loop = check_flags;
|
spri->on_loop = check_flags;
|
||||||
spri->private = &chanmap;
|
spri->private = &chanmap;
|
||||||
sangoma_run_pri(spri);
|
sangoma_run_pri(spri);
|
||||||
|
|
||||||
free(spri);
|
free(spri);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int config_wanpipe(int reload)
|
static int config_wanpipe(int reload)
|
||||||
{
|
{
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
|
@ -604,7 +596,7 @@ static int config_wanpipe(int reload)
|
||||||
globals.bytes_per_frame = atoi(val);
|
globals.bytes_per_frame = atoi(val);
|
||||||
} else if (!strcmp(var, "dialplan")) {
|
} else if (!strcmp(var, "dialplan")) {
|
||||||
set_global_dialplan(val);
|
set_global_dialplan(val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -614,12 +606,18 @@ static int config_wanpipe(int reload)
|
||||||
set_global_dialplan("default");
|
set_global_dialplan("default");
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((spri = switch_core_alloc(module_pool, sizeof(*spri)))) {
|
if ((spri=switch_core_alloc(module_pool, sizeof(*spri)))) {
|
||||||
memset(spri, 0, sizeof(*spri));
|
memset(spri, 0, sizeof(*spri));
|
||||||
sangoma_init_pri(spri, globals.span, globals.dchan, 23, globals.pswitch, globals.node, globals.debug);
|
sangoma_init_pri(spri,
|
||||||
|
globals.span,
|
||||||
|
globals.dchan,
|
||||||
|
23,
|
||||||
|
globals.pswitch,
|
||||||
|
globals.node,
|
||||||
|
globals.debug);
|
||||||
|
|
||||||
pri_thread_run(NULL, spri);
|
pri_thread_run(NULL, spri);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "error!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "error!\n");
|
||||||
}
|
}
|
||||||
|
@ -634,3 +632,4 @@ Public switch_status switch_module_runtime(void)
|
||||||
config_wanpipe(0);
|
config_wanpipe(0);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#define WOOMERA_LINE_SEPERATOR "\r\n"
|
#define WOOMERA_LINE_SEPERATOR "\r\n"
|
||||||
#define WOOMERA_RECORD_SEPERATOR "\r\n\r\n"
|
#define WOOMERA_RECORD_SEPERATOR "\r\n\r\n"
|
||||||
#define WOOMERA_DEBUG_PREFIX "**[DEBUG]** "
|
#define WOOMERA_DEBUG_PREFIX "**[DEBUG]** "
|
||||||
#define WOOMERA_DEBUG_LINE "--------------------------------------------------------------------------------"
|
#define WOOMERA_DEBUG_LINE "--------------------------------------------------------------------------------"
|
||||||
#define WOOMERA_HARD_TIMEOUT -10000
|
#define WOOMERA_HARD_TIMEOUT -10000
|
||||||
#define WOOMERA_QLEN 10
|
#define WOOMERA_QLEN 10
|
||||||
#define WOOMERA_RECONNECT_TIME 5000000
|
#define WOOMERA_RECONNECT_TIME 5000000
|
||||||
|
@ -104,7 +104,7 @@ struct woomera_message {
|
||||||
|
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
int next_woomera_port;
|
int next_woomera_port;
|
||||||
int debug;
|
int debug;
|
||||||
int panic;
|
int panic;
|
||||||
int rtpmode;
|
int rtpmode;
|
||||||
|
@ -122,7 +122,7 @@ struct woomera_profile {
|
||||||
int woomera_port;
|
int woomera_port;
|
||||||
char audio_ip[WOOMERA_STRLEN];
|
char audio_ip[WOOMERA_STRLEN];
|
||||||
char dialplan[WOOMERA_STRLEN];
|
char dialplan[WOOMERA_STRLEN];
|
||||||
// pthread_t thread;
|
// pthread_t thread;
|
||||||
unsigned int flags;
|
unsigned int flags;
|
||||||
int thread_running;
|
int thread_running;
|
||||||
struct woomera_event_queue event_queue;
|
struct woomera_event_queue event_queue;
|
||||||
|
@ -171,27 +171,23 @@ static switch_status woomerachan_on_hangup(switch_core_session *session);
|
||||||
static switch_status woomerachan_on_ring(switch_core_session *session);
|
static switch_status woomerachan_on_ring(switch_core_session *session);
|
||||||
static switch_status woomerachan_on_loopback(switch_core_session *session);
|
static switch_status woomerachan_on_loopback(switch_core_session *session);
|
||||||
static switch_status woomerachan_on_transmit(switch_core_session *session);
|
static switch_status woomerachan_on_transmit(switch_core_session *session);
|
||||||
static switch_status woomerachan_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status woomerachan_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session);
|
||||||
switch_core_session **new_session);
|
static switch_status woomerachan_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
static switch_status woomerachan_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status woomerachan_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id);
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status woomerachan_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
|
||||||
switch_io_flag flags, int stream_id);
|
|
||||||
static switch_status woomerachan_kill_channel(switch_core_session *session, int sig);
|
static switch_status woomerachan_kill_channel(switch_core_session *session, int sig);
|
||||||
static void tech_destroy(private_object * tech_pvt);
|
static void tech_destroy(private_object *tech_pvt);
|
||||||
static void woomera_printf(woomera_profile * profile, switch_socket_t *socket, char *fmt, ...);
|
static void woomera_printf(woomera_profile *profile, switch_socket_t *socket, char *fmt, ...);
|
||||||
static char *woomera_message_header(woomera_message * wmsg, char *key);
|
static char *woomera_message_header(woomera_message *wmsg, char *key);
|
||||||
static int woomera_enqueue_event(woomera_event_queue * event_queue, woomera_message * wmsg);
|
static int woomera_enqueue_event(woomera_event_queue *event_queue, woomera_message *wmsg);
|
||||||
static int woomera_dequeue_event(woomera_event_queue * event_queue, woomera_message * wmsg);
|
static int woomera_dequeue_event(woomera_event_queue *event_queue, woomera_message *wmsg);
|
||||||
static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, int timeout, woomera_profile * profile,
|
static int woomera_message_parse(switch_socket_t *fd, woomera_message *wmsg, int timeout, woomera_profile *profile, woomera_event_queue *event_queue);
|
||||||
woomera_event_queue * event_queue);
|
static int connect_woomera(switch_socket_t **new_sock, woomera_profile *profile, int flags);
|
||||||
static int connect_woomera(switch_socket_t **new_sock, woomera_profile * profile, int flags);
|
static int woomera_profile_thread_running(woomera_profile *profile, int set, int new);
|
||||||
static int woomera_profile_thread_running(woomera_profile * profile, int set, int new);
|
static int woomera_locate_socket(woomera_profile *profile, switch_socket_t **woomera_socket);
|
||||||
static int woomera_locate_socket(woomera_profile * profile, switch_socket_t **woomera_socket);
|
static int tech_create_read_socket(private_object *tech_pvt);
|
||||||
static int tech_create_read_socket(private_object * tech_pvt);
|
|
||||||
static void *woomera_channel_thread_run(switch_thread *thread, void *obj);
|
static void *woomera_channel_thread_run(switch_thread *thread, void *obj);
|
||||||
static void *woomera_thread_run(void *obj);
|
static void *woomera_thread_run(void *obj);
|
||||||
static int tech_activate(private_object * tech_pvt);
|
static int tech_activate(private_object *tech_pvt);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
State methods they get called when the state changes to the specific state
|
State methods they get called when the state changes to the specific state
|
||||||
|
@ -212,17 +208,13 @@ static switch_status woomerachan_on_init(switch_core_session *session)
|
||||||
|
|
||||||
tech_pvt->frame.data = tech_pvt->databuf;
|
tech_pvt->frame.data = tech_pvt->databuf;
|
||||||
|
|
||||||
if (switch_core_codec_init
|
if (switch_core_codec_init(&tech_pvt->read_codec, "L16", rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
(&tech_pvt->read_codec, "L16", rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
|
|
||||||
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s Cannot set read codec\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s Cannot set read codec\n", switch_channel_get_name(channel));
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_core_codec_init
|
if (switch_core_codec_init(&tech_pvt->write_codec, "L16", rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
(&tech_pvt->write_codec, "L16", rate, 30, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
|
|
||||||
switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s Cannot set read codec\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s Cannot set read codec\n", switch_channel_get_name(channel));
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
|
@ -236,7 +228,7 @@ static switch_status woomerachan_on_init(switch_core_session *session)
|
||||||
switch_set_flag(tech_pvt, TFLAG_ACTIVATE);
|
switch_set_flag(tech_pvt, TFLAG_ACTIVATE);
|
||||||
|
|
||||||
switch_core_session_launch_thread(session, woomera_channel_thread_run, session);
|
switch_core_session_launch_thread(session, woomera_channel_thread_run, session);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s WOOMERACHAN INIT\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s WOOMERACHAN INIT\n", switch_channel_get_name(channel));
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
@ -269,7 +261,7 @@ static switch_status woomerachan_on_execute(switch_core_session *session)
|
||||||
|
|
||||||
tech_pvt = switch_core_session_get_private(session);
|
tech_pvt = switch_core_session_get_private(session);
|
||||||
assert(tech_pvt != NULL);
|
assert(tech_pvt != NULL);
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s WOOMERACHAN EXECUTE\n", switch_channel_get_name(channel));
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s WOOMERACHAN EXECUTE\n", switch_channel_get_name(channel));
|
||||||
|
|
||||||
|
|
||||||
|
@ -280,7 +272,7 @@ static switch_status woomerachan_on_hangup(switch_core_session *session)
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
|
@ -303,7 +295,7 @@ static void woomera_socket_close(switch_socket_t **socket)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void udp_socket_close(struct private_object *tech_pvt)
|
static void udp_socket_close(struct private_object *tech_pvt)
|
||||||
{
|
{
|
||||||
if (tech_pvt->udp_socket) {
|
if (tech_pvt->udp_socket) {
|
||||||
apr_socket_shutdown(tech_pvt->udp_socket, APR_SHUTDOWN_READWRITE);
|
apr_socket_shutdown(tech_pvt->udp_socket, APR_SHUTDOWN_READWRITE);
|
||||||
|
@ -316,7 +308,7 @@ static switch_status woomerachan_kill_channel(switch_core_session *session, int
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
|
@ -330,10 +322,9 @@ static switch_status woomerachan_kill_channel(switch_core_session *session, int
|
||||||
udp_socket_close(tech_pvt);
|
udp_socket_close(tech_pvt);
|
||||||
|
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s WOOMERACHAN KILL %d\n", switch_channel_get_name(channel),
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s WOOMERACHAN KILL %d\n", switch_channel_get_name(channel), tech_pvt->udp_socket);
|
||||||
tech_pvt->udp_socket);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -353,16 +344,14 @@ static switch_status woomerachan_on_transmit(switch_core_session *session)
|
||||||
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
/* Make sure when you have 2 sessions in the same scope that you pass the appropriate one to the routines
|
||||||
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
that allocate memory or you will have 1 channel with memory allocated from another channel's pool!
|
||||||
*/
|
*/
|
||||||
static switch_status woomerachan_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile,
|
static switch_status woomerachan_outgoing_channel(switch_core_session *session, switch_caller_profile *outbound_profile, switch_core_session **new_session)
|
||||||
switch_core_session **new_session)
|
|
||||||
{
|
{
|
||||||
if ((*new_session = switch_core_session_request(&woomerachan_endpoint_interface, NULL))) {
|
if ((*new_session = switch_core_session_request(&woomerachan_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
switch_channel *channel;
|
switch_channel *channel;
|
||||||
|
|
||||||
switch_core_session_add_stream(*new_session, NULL);
|
switch_core_session_add_stream(*new_session, NULL);
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(*new_session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
tech_pvt->profile = &default_profile;
|
tech_pvt->profile = &default_profile;
|
||||||
channel = switch_core_session_get_channel(*new_session);
|
channel = switch_core_session_get_channel(*new_session);
|
||||||
|
@ -420,8 +409,7 @@ static switch_status woomerachan_waitfor_write(switch_core_session *session, int
|
||||||
return switch_socket_waitfor(&tech_pvt->write_poll, ms);
|
return switch_socket_waitfor(&tech_pvt->write_poll, ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status woomerachan_read_frame(switch_core_session *session, switch_frame **frame, int timeout,
|
static switch_status woomerachan_read_frame(switch_core_session *session, switch_frame **frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -438,24 +426,21 @@ static switch_status woomerachan_read_frame(switch_core_session *session, switch
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
if ((status = woomerachan_waitfor_read(session, -1)) != SWITCH_STATUS_SUCCESS) {
|
if ((status = woomerachan_waitfor_read(session, -1)) != SWITCH_STATUS_SUCCESS) {
|
||||||
return status;
|
return status;
|
||||||
}1<
|
}1<
|
||||||
*/
|
*/
|
||||||
pframe = &tech_pvt->frame;
|
pframe = &tech_pvt->frame;
|
||||||
*frame = pframe;
|
*frame = pframe;
|
||||||
|
|
||||||
pframe->datalen = sizeof(tech_pvt->databuf);
|
pframe->datalen = sizeof(tech_pvt->databuf);
|
||||||
if ((status =
|
if ((status = switch_socket_recvfrom (tech_pvt->udpread, tech_pvt->udp_socket, 0, tech_pvt->databuf, &pframe->datalen)) == SWITCH_STATUS_SUCCESS) {
|
||||||
switch_socket_recvfrom(tech_pvt->udpread, tech_pvt->udp_socket, 0, tech_pvt->databuf,
|
pframe->samples = (int)pframe->datalen / 2;
|
||||||
&pframe->datalen)) == SWITCH_STATUS_SUCCESS) {
|
|
||||||
pframe->samples = (int) pframe->datalen / 2;
|
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status woomerachan_write_frame(switch_core_session *session, switch_frame *frame, int timeout,
|
static switch_status woomerachan_write_frame(switch_core_session *session, switch_frame *frame, int timeout, switch_io_flag flags, int stream_id)
|
||||||
switch_io_flag flags, int stream_id)
|
|
||||||
{
|
{
|
||||||
switch_channel *channel = NULL;
|
switch_channel *channel = NULL;
|
||||||
struct private_object *tech_pvt = NULL;
|
struct private_object *tech_pvt = NULL;
|
||||||
|
@ -473,69 +458,72 @@ static switch_status woomerachan_write_frame(switch_core_session *session, switc
|
||||||
|
|
||||||
pframe = &tech_pvt->frame;
|
pframe = &tech_pvt->frame;
|
||||||
return switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, frame->data, &frame->datalen);
|
return switch_socket_sendto(tech_pvt->udp_socket, tech_pvt->udpwrite, 0, frame->data, &frame->datalen);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_event_handler_table woomerachan_event_handlers = {
|
static const switch_event_handler_table woomerachan_event_handlers = {
|
||||||
/*.on_init */ woomerachan_on_init,
|
/*.on_init*/ woomerachan_on_init,
|
||||||
/*.on_ring */ woomerachan_on_ring,
|
/*.on_ring*/ woomerachan_on_ring,
|
||||||
/*.on_execute */ woomerachan_on_execute,
|
/*.on_execute*/ woomerachan_on_execute,
|
||||||
/*.on_hangup */ woomerachan_on_hangup,
|
/*.on_hangup*/ woomerachan_on_hangup,
|
||||||
/*.on_loopback */ woomerachan_on_loopback,
|
/*.on_loopback*/ woomerachan_on_loopback,
|
||||||
/*.on_transmit */ woomerachan_on_transmit
|
/*.on_transmit*/ woomerachan_on_transmit
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_io_routines woomerachan_io_routines = {
|
static const switch_io_routines woomerachan_io_routines = {
|
||||||
/*.outgoing_channel */ woomerachan_outgoing_channel,
|
/*.outgoing_channel*/ woomerachan_outgoing_channel,
|
||||||
/*.answer_channel */ NULL,
|
/*.answer_channel*/ NULL,
|
||||||
/*.read_frame */ woomerachan_read_frame,
|
/*.read_frame*/ woomerachan_read_frame,
|
||||||
/*.write_frame */ woomerachan_write_frame,
|
/*.write_frame*/ woomerachan_write_frame,
|
||||||
/*.kill_channel */ woomerachan_kill_channel,
|
/*.kill_channel*/ woomerachan_kill_channel,
|
||||||
/*.waitfor_read */ woomerachan_waitfor_read,
|
/*.waitfor_read*/ woomerachan_waitfor_read,
|
||||||
/*.waitfor_write */ woomerachan_waitfor_write
|
/*.waitfor_write*/ woomerachan_waitfor_write
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_endpoint_interface woomerachan_endpoint_interface = {
|
static const switch_endpoint_interface woomerachan_endpoint_interface = {
|
||||||
/*.interface_name */ "woomera",
|
/*.interface_name*/ "woomera",
|
||||||
/*.io_routines */ &woomerachan_io_routines,
|
/*.io_routines*/ &woomerachan_io_routines,
|
||||||
/*.event_handlers */ &woomerachan_event_handlers,
|
/*.event_handlers*/ &woomerachan_event_handlers,
|
||||||
/*.private */ NULL,
|
/*.private*/ NULL,
|
||||||
/*.next */ NULL
|
/*.next*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface woomerachan_module_interface = {
|
static const switch_loadable_module_interface woomerachan_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ &woomerachan_endpoint_interface,
|
/*.endpoint_interface*/ &woomerachan_endpoint_interface,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
static void tech_destroy(private_object * tech_pvt)
|
static void tech_destroy(private_object *tech_pvt)
|
||||||
{
|
{
|
||||||
woomera_message wmsg;
|
woomera_message wmsg;
|
||||||
|
|
||||||
if (globals.debug > 1) {
|
if (globals.debug > 1) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "+++DESTROY\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "+++DESTROY\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "hangup %s%s", tech_pvt->call_info.callid,
|
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "hangup %s%s", tech_pvt->call_info.callid, WOOMERA_RECORD_SEPERATOR);
|
||||||
WOOMERA_RECORD_SEPERATOR);
|
if(woomera_message_parse(tech_pvt->command_channel,
|
||||||
if (woomera_message_parse
|
&wmsg,
|
||||||
(tech_pvt->command_channel, &wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue) < 0) {
|
WOOMERA_HARD_TIMEOUT,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} Already Disconnected\n", tech_pvt->profile->name);
|
tech_pvt->profile,
|
||||||
|
&tech_pvt->event_queue
|
||||||
|
) < 0) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} Already Disconnected\n", tech_pvt->profile->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "bye%s", WOOMERA_RECORD_SEPERATOR);
|
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "bye%s", WOOMERA_RECORD_SEPERATOR);
|
||||||
woomera_socket_close(&tech_pvt->command_channel);
|
woomera_socket_close(&tech_pvt->command_channel);
|
||||||
udp_socket_close(tech_pvt);
|
udp_socket_close(tech_pvt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void woomera_printf(woomera_profile * profile, switch_socket_t *socket, char *fmt, ...)
|
static void woomera_printf(woomera_profile *profile, switch_socket_t *socket, char *fmt, ...)
|
||||||
{
|
{
|
||||||
char *stuff;
|
char *stuff;
|
||||||
size_t res = 0, len = 0;
|
size_t res = 0, len = 0;
|
||||||
|
@ -543,7 +531,7 @@ static void woomera_printf(woomera_profile * profile, switch_socket_t *socket, c
|
||||||
va_list ap;
|
va_list ap;
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
#ifndef vasprintf
|
#ifndef vasprintf
|
||||||
stuff = (char *) malloc(10240);
|
stuff = (char *)malloc(10240);
|
||||||
vsnprintf(stuff, 10240, fmt, ap);
|
vsnprintf(stuff, 10240, fmt, ap);
|
||||||
#else
|
#else
|
||||||
res = vasprintf(&stuff, fmt, ap);
|
res = vasprintf(&stuff, fmt, ap);
|
||||||
|
@ -553,23 +541,22 @@ static void woomera_printf(woomera_profile * profile, switch_socket_t *socket, c
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Out of memory\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Out of memory\n");
|
||||||
} else {
|
} else {
|
||||||
if (profile && globals.debug) {
|
if (profile && globals.debug) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Send Message: {%s} [%s/%d]\n%s\n%s", profile->name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Send Message: {%s} [%s/%d]\n%s\n%s", profile->name, profile->woomera_host, profile->woomera_port, WOOMERA_DEBUG_LINE, stuff);
|
||||||
profile->woomera_host, profile->woomera_port, WOOMERA_DEBUG_LINE, stuff);
|
|
||||||
}
|
}
|
||||||
len = strlen(stuff);
|
len = strlen(stuff);
|
||||||
switch_socket_send(socket, stuff, &len);
|
switch_socket_send(socket, stuff, &len);
|
||||||
|
|
||||||
free(stuff);
|
free(stuff);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *woomera_message_header(woomera_message * wmsg, char *key)
|
static char *woomera_message_header(woomera_message *wmsg, char *key)
|
||||||
{
|
{
|
||||||
int x = 0;
|
int x = 0;
|
||||||
char *value = NULL;
|
char *value = NULL;
|
||||||
|
|
||||||
for (x = 0; x < wmsg->last; x++) {
|
for (x = 0 ; x < wmsg->last ; x++) {
|
||||||
if (!strcasecmp(wmsg->names[x], key)) {
|
if (!strcasecmp(wmsg->names[x], key)) {
|
||||||
value = wmsg->values[x];
|
value = wmsg->values[x];
|
||||||
break;
|
break;
|
||||||
|
@ -579,7 +566,7 @@ static char *woomera_message_header(woomera_message * wmsg, char *key)
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int woomera_enqueue_event(woomera_event_queue * event_queue, woomera_message * wmsg)
|
static int woomera_enqueue_event(woomera_event_queue *event_queue, woomera_message *wmsg)
|
||||||
{
|
{
|
||||||
woomera_message *new, *mptr;
|
woomera_message *new, *mptr;
|
||||||
|
|
||||||
|
@ -590,7 +577,7 @@ static int woomera_enqueue_event(woomera_event_queue * event_queue, woomera_mess
|
||||||
if (!event_queue->head) {
|
if (!event_queue->head) {
|
||||||
event_queue->head = new;
|
event_queue->head = new;
|
||||||
} else {
|
} else {
|
||||||
for (mptr = event_queue->head; mptr && mptr->next; mptr = mptr->next);
|
for (mptr = event_queue->head; mptr && mptr->next ; mptr = mptr->next);
|
||||||
mptr->next = new;
|
mptr->next = new;
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -601,10 +588,10 @@ static int woomera_enqueue_event(woomera_event_queue * event_queue, woomera_mess
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int woomera_dequeue_event(woomera_event_queue * event_queue, woomera_message * wmsg)
|
static int woomera_dequeue_event(woomera_event_queue *event_queue, woomera_message *wmsg)
|
||||||
{
|
{
|
||||||
woomera_message *mptr = NULL;
|
woomera_message *mptr = NULL;
|
||||||
|
|
||||||
if (event_queue->head) {
|
if (event_queue->head) {
|
||||||
mptr = event_queue->head;
|
mptr = event_queue->head;
|
||||||
event_queue->head = mptr->next;
|
event_queue->head = mptr->next;
|
||||||
|
@ -617,12 +604,11 @@ static int woomera_dequeue_event(woomera_event_queue * event_queue, woomera_mess
|
||||||
} else {
|
} else {
|
||||||
memset(wmsg, 0, sizeof(woomera_message));
|
memset(wmsg, 0, sizeof(woomera_message));
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, int timeout, woomera_profile * profile,
|
static int woomera_message_parse(switch_socket_t *fd, woomera_message *wmsg, int timeout, woomera_profile *profile, woomera_event_queue *event_queue)
|
||||||
woomera_event_queue * event_queue)
|
|
||||||
{
|
{
|
||||||
char *cur, *cr, *next = NULL, *eor = NULL;
|
char *cur, *cr, *next = NULL, *eor = NULL;
|
||||||
char buf[2048] = "", *ptr;
|
char buf[2048] = "", *ptr;
|
||||||
|
@ -631,7 +617,7 @@ static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, in
|
||||||
|
|
||||||
memset(wmsg, 0, sizeof(woomera_message));
|
memset(wmsg, 0, sizeof(woomera_message));
|
||||||
|
|
||||||
if (fd < 0) {
|
if (fd < 0 ) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -661,18 +647,17 @@ static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, in
|
||||||
next = buf;
|
next = buf;
|
||||||
|
|
||||||
if (globals.debug) {
|
if (globals.debug) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Receive Message: {%s} [%s/%d]\n%s\n%s", profile->name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Receive Message: {%s} [%s/%d]\n%s\n%s", profile->name, profile->woomera_host, profile->woomera_port, WOOMERA_DEBUG_LINE, buf);
|
||||||
profile->woomera_host, profile->woomera_port, WOOMERA_DEBUG_LINE, buf);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
while ((cur = next)) {
|
while((cur = next)) {
|
||||||
if ((cr = strstr(cur, WOOMERA_LINE_SEPERATOR))) {
|
if ((cr = strstr(cur, WOOMERA_LINE_SEPERATOR))) {
|
||||||
*cr = '\0';
|
*cr = '\0';
|
||||||
next = cr + (sizeof(WOOMERA_LINE_SEPERATOR) - 1);
|
next = cr + (sizeof(WOOMERA_LINE_SEPERATOR) - 1);
|
||||||
if (!strcmp(next, WOOMERA_RECORD_SEPERATOR)) {
|
if (!strcmp(next, WOOMERA_RECORD_SEPERATOR)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cur || !cur[0]) {
|
if (!cur || !cur[0]) {
|
||||||
break;
|
break;
|
||||||
|
@ -725,9 +710,9 @@ static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, in
|
||||||
*val = '\0';
|
*val = '\0';
|
||||||
val++;
|
val++;
|
||||||
}
|
}
|
||||||
strncpy(wmsg->values[wmsg->last - 1], val, WOOMERA_STRLEN);
|
strncpy(wmsg->values[wmsg->last-1], val, WOOMERA_STRLEN);
|
||||||
}
|
}
|
||||||
strncpy(wmsg->names[wmsg->last - 1], name, WOOMERA_STRLEN);
|
strncpy(wmsg->names[wmsg->last-1], name, WOOMERA_STRLEN);
|
||||||
if (name && val && !strcasecmp(name, "content-type")) {
|
if (name && val && !strcasecmp(name, "content-type")) {
|
||||||
switch_set_flag(wmsg, WFLAG_CONTENT);
|
switch_set_flag(wmsg, WFLAG_CONTENT);
|
||||||
bytes = atoi(val);
|
bytes = atoi(val);
|
||||||
|
@ -759,11 +744,11 @@ static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, in
|
||||||
* wmsg will be overwritten but it's ok we just queued it.
|
* wmsg will be overwritten but it's ok we just queued it.
|
||||||
*/
|
*/
|
||||||
return woomera_message_parse(fd, wmsg, timeout, profile, event_queue);
|
return woomera_message_parse(fd, wmsg, timeout, profile, event_queue);
|
||||||
|
|
||||||
} else if (wmsg->mval > 99 && wmsg->mval < 200) {
|
} else if (wmsg->mval > 99 && wmsg->mval < 200) {
|
||||||
/* reply in the 100's are nice but we need to wait for another reply
|
/* reply in the 100's are nice but we need to wait for another reply
|
||||||
call ourself recursively to find the reply > 199 and forget this reply.
|
call ourself recursively to find the reply > 199 and forget this reply.
|
||||||
*/
|
*/
|
||||||
return woomera_message_parse(fd, wmsg, timeout, profile, event_queue);
|
return woomera_message_parse(fd, wmsg, timeout, profile, event_queue);
|
||||||
} else {
|
} else {
|
||||||
return switch_test_flag(wmsg, WFLAG_EXISTS);
|
return switch_test_flag(wmsg, WFLAG_EXISTS);
|
||||||
|
@ -771,7 +756,7 @@ static int woomera_message_parse(switch_socket_t *fd, woomera_message * wmsg, in
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int connect_woomera(switch_socket_t **new_sock, woomera_profile * profile, int flags)
|
static int connect_woomera(switch_socket_t **new_sock, woomera_profile *profile, int flags)
|
||||||
{
|
{
|
||||||
|
|
||||||
switch_sockaddr_t *sa;
|
switch_sockaddr_t *sa;
|
||||||
|
@ -786,12 +771,12 @@ static int connect_woomera(switch_socket_t **new_sock, woomera_profile * profile
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
status = switch_socket_bind((*new_sock), sa);
|
status = switch_socket_bind((*new_sock), sa);
|
||||||
if (0 && status != SWITCH_STATUS_SUCCESS) {
|
if (0 && status != SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't Bind to %s:%d!\n", profile->woomera_host, profile->woomera_port);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't Bind to %s:%d!\n", profile->woomera_host, profile->woomera_port);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
status = switch_socket_connect((*new_sock), sa);
|
status = switch_socket_connect((*new_sock), sa);
|
||||||
if (status != SWITCH_STATUS_SUCCESS) {
|
if (status != SWITCH_STATUS_SUCCESS) {
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -800,7 +785,7 @@ static int connect_woomera(switch_socket_t **new_sock, woomera_profile * profile
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int woomera_profile_thread_running(woomera_profile * profile, int set, int new)
|
static int woomera_profile_thread_running(woomera_profile *profile, int set, int new)
|
||||||
{
|
{
|
||||||
int running = 0;
|
int running = 0;
|
||||||
|
|
||||||
|
@ -811,21 +796,20 @@ static int woomera_profile_thread_running(woomera_profile * profile, int set, in
|
||||||
running = profile->thread_running;
|
running = profile->thread_running;
|
||||||
switch_mutex_unlock(profile->iolock);
|
switch_mutex_unlock(profile->iolock);
|
||||||
return running;
|
return running;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int woomera_locate_socket(woomera_profile * profile, switch_socket_t **woomera_socket)
|
static int woomera_locate_socket(woomera_profile *profile, switch_socket_t **woomera_socket)
|
||||||
{
|
{
|
||||||
woomera_message wmsg;
|
woomera_message wmsg;
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
|
||||||
while (connect_woomera(woomera_socket, profile, 0) < 0) {
|
while (connect_woomera(woomera_socket, profile, 0) < 0) {
|
||||||
if (!woomera_profile_thread_running(profile, 0, 0)) {
|
if (!woomera_profile_thread_running(profile, 0, 0)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} Cannot Reconnect to Woomera! retry in 5 seconds\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} Cannot Reconnect to Woomera! retry in 5 seconds\n", profile->name);
|
||||||
profile->name);
|
|
||||||
switch_sleep(WOOMERA_RECONNECT_TIME);
|
switch_sleep(WOOMERA_RECONNECT_TIME);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -833,7 +817,11 @@ static int woomera_locate_socket(woomera_profile * profile, switch_socket_t **wo
|
||||||
if (switch_test_flag(profile, PFLAG_INBOUND)) {
|
if (switch_test_flag(profile, PFLAG_INBOUND)) {
|
||||||
woomera_printf(profile, *woomera_socket, "LISTEN%s", WOOMERA_RECORD_SEPERATOR);
|
woomera_printf(profile, *woomera_socket, "LISTEN%s", WOOMERA_RECORD_SEPERATOR);
|
||||||
if (woomera_message_parse(*woomera_socket,
|
if (woomera_message_parse(*woomera_socket,
|
||||||
&wmsg, WOOMERA_HARD_TIMEOUT, profile, &profile->event_queue) < 0) {
|
&wmsg,
|
||||||
|
WOOMERA_HARD_TIMEOUT,
|
||||||
|
profile,
|
||||||
|
&profile->event_queue
|
||||||
|
) < 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", profile->name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", profile->name);
|
||||||
globals.panic = 1;
|
globals.panic = 1;
|
||||||
woomera_profile_thread_running(&default_profile, 1, 0);
|
woomera_profile_thread_running(&default_profile, 1, 0);
|
||||||
|
@ -841,7 +829,7 @@ static int woomera_locate_socket(woomera_profile * profile, switch_socket_t **wo
|
||||||
if (*woomera_socket) {
|
if (*woomera_socket) {
|
||||||
woomera_socket_close(woomera_socket);
|
woomera_socket_close(woomera_socket);
|
||||||
}
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -849,13 +837,13 @@ static int woomera_locate_socket(woomera_profile * profile, switch_socket_t **wo
|
||||||
}
|
}
|
||||||
switch_sleep(100);
|
switch_sleep(100);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return *woomera_socket ? 1 : 0;
|
return *woomera_socket ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static int tech_create_read_socket(private_object * tech_pvt)
|
static int tech_create_read_socket(private_object *tech_pvt)
|
||||||
{
|
{
|
||||||
switch_memory_pool *pool = switch_core_session_get_pool(tech_pvt->session);
|
switch_memory_pool *pool = switch_core_session_get_pool(tech_pvt->session);
|
||||||
|
|
||||||
|
@ -869,20 +857,20 @@ static int tech_create_read_socket(private_object * tech_pvt)
|
||||||
switch_sockaddr_info_get(&tech_pvt->udpread, tech_pvt->profile->audio_ip, SWITCH_UNSPEC, tech_pvt->port, 0, pool);
|
switch_sockaddr_info_get(&tech_pvt->udpread, tech_pvt->profile->audio_ip, SWITCH_UNSPEC, tech_pvt->port, 0, pool);
|
||||||
if (switch_socket_create(&tech_pvt->udp_socket, AF_INET, SOCK_DGRAM, 0, pool) == SWITCH_STATUS_SUCCESS) {
|
if (switch_socket_create(&tech_pvt->udp_socket, AF_INET, SOCK_DGRAM, 0, pool) == SWITCH_STATUS_SUCCESS) {
|
||||||
switch_socket_bind(tech_pvt->udp_socket, tech_pvt->udpread);
|
switch_socket_bind(tech_pvt->udp_socket, tech_pvt->udpread);
|
||||||
switch_socket_create_pollfd(&tech_pvt->read_poll, tech_pvt->udp_socket, SWITCH_POLLIN | SWITCH_POLLERR, pool);
|
switch_socket_create_pollfd(&tech_pvt->read_poll, tech_pvt->udp_socket, SWITCH_POLLIN|SWITCH_POLLERR, pool);
|
||||||
switch_socket_create_pollfd(&tech_pvt->write_poll, tech_pvt->udp_socket, SWITCH_POLLOUT | SWITCH_POLLERR, pool);
|
switch_socket_create_pollfd(&tech_pvt->write_poll, tech_pvt->udp_socket, SWITCH_POLLOUT|SWITCH_POLLERR, pool);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int tech_activate(private_object * tech_pvt)
|
static int tech_activate(private_object *tech_pvt)
|
||||||
{
|
{
|
||||||
woomera_message wmsg;
|
woomera_message wmsg;
|
||||||
|
|
||||||
if (tech_pvt) {
|
if (tech_pvt) {
|
||||||
if ((connect_woomera(&tech_pvt->command_channel, tech_pvt->profile, 0))) {
|
if((connect_woomera(&tech_pvt->command_channel, tech_pvt->profile, 0))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "connected to woomera!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "connected to woomera!\n");
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't connect to woomera!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Can't connect to woomera!\n");
|
||||||
|
@ -893,25 +881,34 @@ static int tech_activate(private_object * tech_pvt)
|
||||||
if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
|
if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
|
||||||
|
|
||||||
woomera_printf(tech_pvt->profile,
|
woomera_printf(tech_pvt->profile,
|
||||||
tech_pvt->command_channel,
|
tech_pvt->command_channel,
|
||||||
"CALL %s%sRaw-Audio: %s/%d%sLocal-Name: %s!%s%s",
|
"CALL %s%sRaw-Audio: %s/%d%sLocal-Name: %s!%s%s",
|
||||||
tech_pvt->caller_profile->destination_number,
|
tech_pvt->caller_profile->destination_number,
|
||||||
WOOMERA_LINE_SEPERATOR,
|
WOOMERA_LINE_SEPERATOR,
|
||||||
tech_pvt->profile->audio_ip,
|
tech_pvt->profile->audio_ip,
|
||||||
tech_pvt->port,
|
tech_pvt->port,
|
||||||
WOOMERA_LINE_SEPERATOR,
|
WOOMERA_LINE_SEPERATOR,
|
||||||
tech_pvt->caller_profile->caller_id_name,
|
tech_pvt->caller_profile->caller_id_name,
|
||||||
tech_pvt->caller_profile->caller_id_number, WOOMERA_RECORD_SEPERATOR);
|
tech_pvt->caller_profile->caller_id_number,
|
||||||
|
WOOMERA_RECORD_SEPERATOR
|
||||||
|
);
|
||||||
|
|
||||||
woomera_message_parse(tech_pvt->command_channel,
|
woomera_message_parse(tech_pvt->command_channel,
|
||||||
&wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue);
|
&wmsg,
|
||||||
|
WOOMERA_HARD_TIMEOUT,
|
||||||
|
tech_pvt->profile,
|
||||||
|
&tech_pvt->event_queue
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
switch_set_flag(tech_pvt, TFLAG_PARSE_INCOMING);
|
switch_set_flag(tech_pvt, TFLAG_PARSE_INCOMING);
|
||||||
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "LISTEN%s", WOOMERA_RECORD_SEPERATOR);
|
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "LISTEN%s", WOOMERA_RECORD_SEPERATOR);
|
||||||
if (woomera_message_parse(tech_pvt->command_channel,
|
if (woomera_message_parse(tech_pvt->command_channel,
|
||||||
&wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue) < 0) {
|
&wmsg,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n",
|
WOOMERA_HARD_TIMEOUT,
|
||||||
tech_pvt->profile->name);
|
tech_pvt->profile,
|
||||||
|
&tech_pvt->event_queue
|
||||||
|
) < 0) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name);
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
globals.panic = 1;
|
globals.panic = 1;
|
||||||
}
|
}
|
||||||
|
@ -944,9 +941,9 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
if (!tech_pvt->udp_socket) {
|
if (!tech_pvt->udp_socket) {
|
||||||
tech_create_read_socket(tech_pvt);
|
tech_create_read_socket(tech_pvt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
for(;;) {
|
||||||
for (;;) {
|
|
||||||
if (globals.panic) {
|
if (globals.panic) {
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
}
|
}
|
||||||
|
@ -967,29 +964,31 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
if (switch_test_flag(tech_pvt, TFLAG_ANSWER)) {
|
if (switch_test_flag(tech_pvt, TFLAG_ANSWER)) {
|
||||||
switch_clear_flag(tech_pvt, TFLAG_ANSWER);
|
switch_clear_flag(tech_pvt, TFLAG_ANSWER);
|
||||||
#ifdef USE_ANSWER
|
#ifdef USE_ANSWER
|
||||||
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "ANSWER %s%s", tech_pvt->call_info.callid,
|
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "ANSWER %s%s",tech_pvt->call_info.callid, WOOMERA_RECORD_SEPERATOR);
|
||||||
WOOMERA_RECORD_SEPERATOR);
|
if(woomera_message_parse(tech_pvt->command_channel,
|
||||||
if (woomera_message_parse
|
&wmsg,
|
||||||
(tech_pvt->command_channel, &wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile,
|
WOOMERA_HARD_TIMEOUT,
|
||||||
&tech_pvt->event_queue) < 0) {
|
tech_pvt->profile,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n",
|
&tech_pvt->event_queue
|
||||||
tech_pvt->profile->name);
|
) < 0) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name);
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
globals.panic = 1;
|
globals.panic = 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (switch_test_flag(tech_pvt, TFLAG_DTMF)) {
|
if (switch_test_flag(tech_pvt, TFLAG_DTMF)) {
|
||||||
switch_mutex_lock(tech_pvt->iolock);
|
switch_mutex_lock(tech_pvt->iolock);
|
||||||
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "DTMF %s %s%s", tech_pvt->call_info.callid,
|
woomera_printf(tech_pvt->profile, tech_pvt->command_channel, "DTMF %s %s%s",tech_pvt->call_info.callid, tech_pvt->dtmfbuf, WOOMERA_RECORD_SEPERATOR);
|
||||||
tech_pvt->dtmfbuf, WOOMERA_RECORD_SEPERATOR);
|
if(woomera_message_parse(tech_pvt->command_channel,
|
||||||
if (woomera_message_parse
|
&wmsg,
|
||||||
(tech_pvt->command_channel, &wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile,
|
WOOMERA_HARD_TIMEOUT,
|
||||||
&tech_pvt->event_queue) < 0) {
|
tech_pvt->profile,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n",
|
&tech_pvt->event_queue
|
||||||
tech_pvt->profile->name);
|
) < 0) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name);
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
globals.panic = 1;
|
globals.panic = 1;
|
||||||
continue;
|
continue;
|
||||||
|
@ -998,14 +997,13 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
memset(tech_pvt->dtmfbuf, 0, sizeof(tech_pvt->dtmfbuf));
|
memset(tech_pvt->dtmfbuf, 0, sizeof(tech_pvt->dtmfbuf));
|
||||||
switch_mutex_unlock(tech_pvt->iolock);
|
switch_mutex_unlock(tech_pvt->iolock);
|
||||||
}
|
}
|
||||||
#if 1==0 /*convert to use switch_time_now */
|
|
||||||
if (tech_pvt->timeout) {
|
#if 1==0 /*convert to use switch_time_now */
|
||||||
|
if(tech_pvt->timeout) {
|
||||||
struct timeval now;
|
struct timeval now;
|
||||||
int elapsed;
|
int elapsed;
|
||||||
gettimeofday(&now, NULL);
|
gettimeofday(&now, NULL);
|
||||||
elapsed =
|
elapsed = (((now.tv_sec * 1000) + now.tv_usec / 1000) - ((tech_pvt->started.tv_sec * 1000) + tech_pvt->started.tv_usec / 1000));
|
||||||
(((now.tv_sec * 1000) + now.tv_usec / 1000) -
|
|
||||||
((tech_pvt->started.tv_sec * 1000) + tech_pvt->started.tv_usec / 1000));
|
|
||||||
if (elapsed > tech_pvt->timeout) {
|
if (elapsed > tech_pvt->timeout) {
|
||||||
/* call timed out! */
|
/* call timed out! */
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
|
@ -1017,24 +1015,29 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* Check for events */
|
/* Check for events */
|
||||||
if ((res = woomera_dequeue_event(&tech_pvt->event_queue, &wmsg)) ||
|
if((res = woomera_dequeue_event(&tech_pvt->event_queue, &wmsg)) ||
|
||||||
(res = woomera_message_parse(tech_pvt->command_channel, &wmsg, 100, tech_pvt->profile, NULL))) {
|
(res = woomera_message_parse(tech_pvt->command_channel,
|
||||||
|
&wmsg,
|
||||||
|
100,
|
||||||
|
tech_pvt->profile,
|
||||||
|
NULL
|
||||||
|
))) {
|
||||||
|
|
||||||
if (res < 0 || !strcasecmp(wmsg.command, "HANGUP")) {
|
if (res < 0 || !strcasecmp(wmsg.command, "HANGUP")) {
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
continue;
|
continue;
|
||||||
} else if (!strcasecmp(wmsg.command, "DTMF")) {
|
} else if (!strcasecmp(wmsg.command, "DTMF")) {
|
||||||
/*
|
/*
|
||||||
struct ast_frame dtmf_frame = {AST_FRAME_DTMF};
|
struct ast_frame dtmf_frame = {AST_FRAME_DTMF};
|
||||||
int x = 0;
|
int x = 0;
|
||||||
for (x = 0; x < strlen(wmsg.command_args); x++) {
|
for (x = 0; x < strlen(wmsg.command_args); x++) {
|
||||||
dtmf_frame.subclass = wmsg.command_args[x];
|
dtmf_frame.subclass = wmsg.command_args[x];
|
||||||
ast_queue_frame(tech_pvt->owner, ast_frdup(&dtmf_frame));
|
ast_queue_frame(tech_pvt->owner, ast_frdup(&dtmf_frame));
|
||||||
if (globals.debug > 1) {
|
if (globals.debug > 1) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "SEND DTMF [%c] to %s\n", dtmf_frame.subclass, tech_pvt->owner->name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "SEND DTMF [%c] to %s\n", dtmf_frame.subclass, tech_pvt->owner->name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
} else if (!strcasecmp(wmsg.command, "PROCEED")) {
|
} else if (!strcasecmp(wmsg.command, "PROCEED")) {
|
||||||
/* This packet has lots of info so well keep it */
|
/* This packet has lots of info so well keep it */
|
||||||
tech_pvt->call_info = wmsg;
|
tech_pvt->call_info = wmsg;
|
||||||
|
@ -1056,7 +1059,7 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
if ((p = woomera_message_header(&wmsg, "Remote-Name"))) {
|
if ((p = woomera_message_header(&wmsg, "Remote-Name"))) {
|
||||||
strncpy(cid_name, p, sizeof(cid_name));
|
strncpy(cid_name, p, sizeof(cid_name));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((cid_num = strchr(cid_name, '!'))) {
|
if ((cid_num = strchr(cid_name, '!'))) {
|
||||||
*cid_num = '\0';
|
*cid_num = '\0';
|
||||||
cid_num++;
|
cid_num++;
|
||||||
|
@ -1067,31 +1070,40 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
|
|
||||||
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
if ((tech_pvt->caller_profile = switch_caller_profile_new(session,
|
||||||
tech_pvt->profile->dialplan,
|
tech_pvt->profile->dialplan,
|
||||||
cid_name, cid_num, ip, NULL, NULL, exten))) {
|
cid_name,
|
||||||
|
cid_num,
|
||||||
|
ip,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
exten))) {
|
||||||
char name[128];
|
char name[128];
|
||||||
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
|
||||||
snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number,
|
snprintf(name, sizeof(name), "Woomera/%s-%04x", tech_pvt->caller_profile->destination_number, rand() & 0xffff);
|
||||||
rand() & 0xffff);
|
|
||||||
switch_channel_set_name(channel, name);
|
switch_channel_set_name(channel, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
woomera_printf(tech_pvt->profile, tech_pvt->command_channel,
|
woomera_printf(tech_pvt->profile, tech_pvt->command_channel,
|
||||||
"%s %s%s"
|
"%s %s%s"
|
||||||
"Raw-Audio: %s/%d%s",
|
"Raw-Audio: %s/%d%s",
|
||||||
MEDIA_ANSWER,
|
MEDIA_ANSWER,
|
||||||
wmsg.callid,
|
wmsg.callid,
|
||||||
WOOMERA_LINE_SEPERATOR,
|
WOOMERA_LINE_SEPERATOR,
|
||||||
tech_pvt->profile->audio_ip, tech_pvt->port, WOOMERA_RECORD_SEPERATOR);
|
tech_pvt->profile->audio_ip,
|
||||||
|
tech_pvt->port,
|
||||||
if (woomera_message_parse(tech_pvt->command_channel,
|
WOOMERA_RECORD_SEPERATOR);
|
||||||
&wmsg, WOOMERA_HARD_TIMEOUT, tech_pvt->profile, &tech_pvt->event_queue) < 0) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n",
|
if(woomera_message_parse(tech_pvt->command_channel,
|
||||||
tech_pvt->profile->name);
|
&wmsg,
|
||||||
|
WOOMERA_HARD_TIMEOUT,
|
||||||
|
tech_pvt->profile,
|
||||||
|
&tech_pvt->event_queue
|
||||||
|
) < 0) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", tech_pvt->profile->name);
|
||||||
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
switch_set_flag(tech_pvt, TFLAG_ABORT);
|
||||||
globals.panic = 1;
|
globals.panic = 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (!strcasecmp(wmsg.command, "CONNECT")) {
|
} else if (!strcasecmp(wmsg.command, "CONNECT")) {
|
||||||
|
|
||||||
} else if (!strcasecmp(wmsg.command, "MEDIA")) {
|
} else if (!strcasecmp(wmsg.command, "MEDIA")) {
|
||||||
|
@ -1103,7 +1115,7 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
int port = 0;
|
int port = 0;
|
||||||
|
|
||||||
strncpy(ip, raw_audio_header, sizeof(ip) - 1);
|
strncpy(ip, raw_audio_header, sizeof(ip) - 1);
|
||||||
if ((ptr = strchr(ip, '/'))) {
|
if ((ptr=strchr(ip, '/'))) {
|
||||||
*ptr = '\0';
|
*ptr = '\0';
|
||||||
ptr++;
|
ptr++;
|
||||||
port = atoi(ptr);
|
port = atoi(ptr);
|
||||||
|
@ -1117,12 +1129,9 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
SWITCH_UNSPEC,
|
SWITCH_UNSPEC,
|
||||||
port,
|
port,
|
||||||
0,
|
0,
|
||||||
switch_core_session_get_pool(tech_pvt->session)) !=
|
switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
|
||||||
SWITCH_STATUS_SUCCESS) {
|
|
||||||
if (globals.debug) {
|
if (globals.debug) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "{%s} Cannot resolve %s\n", tech_pvt->profile->name, ip);
|
||||||
WOOMERA_DEBUG_PREFIX "{%s} Cannot resolve %s\n",
|
|
||||||
tech_pvt->profile->name, ip);
|
|
||||||
}
|
}
|
||||||
switch_channel_hangup(channel);
|
switch_channel_hangup(channel);
|
||||||
}
|
}
|
||||||
|
@ -1130,22 +1139,20 @@ static void *woomera_channel_thread_run(switch_thread *thread, void *obj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (globals.debug > 2) {
|
if (globals.debug > 2) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "CHECK {%s}(%d)\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "CHECK {%s}(%d)\n", tech_pvt->profile->name, res);
|
||||||
tech_pvt->profile->name, res);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (globals.debug > 1) {
|
if (globals.debug > 1) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "Monitor thread for %s done.\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, WOOMERA_DEBUG_PREFIX "Monitor thread for %s done.\n", tech_pvt->profile->name);
|
||||||
tech_pvt->profile->name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void *woomera_thread_run(void *obj)
|
||||||
static void *woomera_thread_run(void *obj)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
int res = 0;
|
int res = 0;
|
||||||
|
@ -1154,12 +1161,12 @@ static void *woomera_thread_run(void *obj)
|
||||||
|
|
||||||
profile = obj;
|
profile = obj;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Started Woomera Thread {%s}.\n", profile->name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Started Woomera Thread {%s}.\n", profile->name);
|
||||||
|
|
||||||
profile->thread_running = 1;
|
profile->thread_running = 1;
|
||||||
profile->woomera_socket = NULL;
|
profile->woomera_socket = NULL;
|
||||||
|
|
||||||
|
|
||||||
while (woomera_profile_thread_running(profile, 0, 0)) {
|
while(woomera_profile_thread_running(profile, 0, 0)) {
|
||||||
/* listen on socket and handle events */
|
/* listen on socket and handle events */
|
||||||
if (globals.panic == 2) {
|
if (globals.panic == 2) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Woomera is disabled!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Woomera is disabled!\n");
|
||||||
|
@ -1167,22 +1174,21 @@ static void *woomera_thread_run(void *obj)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!profile->woomera_socket) {
|
if (! profile->woomera_socket) {
|
||||||
if (woomera_locate_socket(profile, &profile->woomera_socket)) {
|
if (woomera_locate_socket(profile, &profile->woomera_socket)) {
|
||||||
globals.panic = 0;
|
globals.panic = 0;
|
||||||
}
|
}
|
||||||
if (!woomera_profile_thread_running(profile, 0, 0)) {
|
if (!woomera_profile_thread_running(profile, 0, 0)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Woomera Thread Up {%s} %s/%d\n", profile->name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Woomera Thread Up {%s} %s/%d\n", profile->name, profile->woomera_host, profile->woomera_port);
|
||||||
profile->woomera_host, profile->woomera_port);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (globals.panic) {
|
if (globals.panic) {
|
||||||
if (globals.panic != 2) {
|
if (globals.panic != 2) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Help I'm in a state of panic!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Help I'm in a state of panic!\n");
|
||||||
globals.panic = 0; //fix
|
globals.panic = 0;//fix
|
||||||
}
|
}
|
||||||
woomera_socket_close(&profile->woomera_socket);
|
woomera_socket_close(&profile->woomera_socket);
|
||||||
|
|
||||||
|
@ -1191,12 +1197,15 @@ static void *woomera_thread_run(void *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((res = woomera_dequeue_event(&profile->event_queue, &wmsg) ||
|
if ((res = woomera_dequeue_event(&profile->event_queue, &wmsg) ||
|
||||||
(res = woomera_message_parse(profile->woomera_socket, &wmsg,
|
(res = woomera_message_parse(profile->woomera_socket,
|
||||||
|
&wmsg,
|
||||||
/* if we are not stingy with threads we can block forever */
|
/* if we are not stingy with threads we can block forever */
|
||||||
0, profile, NULL)))) {
|
0,
|
||||||
|
profile,
|
||||||
|
NULL
|
||||||
|
)))) {
|
||||||
if (res < 0) {
|
if (res < 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! I lost my connection to woomera!\n",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! I lost my connection to woomera!\n", profile->name);
|
||||||
profile->name);
|
|
||||||
woomera_socket_close(&profile->woomera_socket);
|
woomera_socket_close(&profile->woomera_socket);
|
||||||
|
|
||||||
//global_set_flag(TFLAG_ABORT);
|
//global_set_flag(TFLAG_ABORT);
|
||||||
|
@ -1207,16 +1216,18 @@ static void *woomera_thread_run(void *obj)
|
||||||
if (switch_test_flag(profile, PFLAG_INBOUND)) {
|
if (switch_test_flag(profile, PFLAG_INBOUND)) {
|
||||||
woomera_printf(profile, profile->woomera_socket, "LISTEN%s", WOOMERA_RECORD_SEPERATOR);
|
woomera_printf(profile, profile->woomera_socket, "LISTEN%s", WOOMERA_RECORD_SEPERATOR);
|
||||||
if (woomera_message_parse(profile->woomera_socket,
|
if (woomera_message_parse(profile->woomera_socket,
|
||||||
&wmsg, WOOMERA_HARD_TIMEOUT, profile, &profile->event_queue) < 0) {
|
&wmsg,
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n",
|
WOOMERA_HARD_TIMEOUT,
|
||||||
profile->name);
|
profile,
|
||||||
|
&profile->event_queue
|
||||||
|
) < 0) {
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "{%s} HELP! Woomera is broken!\n", profile->name);
|
||||||
globals.panic = 1;
|
globals.panic = 1;
|
||||||
woomera_socket_close(&profile->woomera_socket);
|
woomera_socket_close(&profile->woomera_socket);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (profile->woomera_socket) {
|
if (profile->woomera_socket) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Woomera Thread Up {%s} %s/%d\n", profile->name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Woomera Thread Up {%s} %s/%d\n", profile->name, profile->woomera_host, profile->woomera_port);
|
||||||
profile->woomera_host, profile->woomera_port);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
@ -1225,11 +1236,11 @@ static void *woomera_thread_run(void *obj)
|
||||||
if (!strcasecmp(wmsg.command, "INCOMING")) {
|
if (!strcasecmp(wmsg.command, "INCOMING")) {
|
||||||
char *name;
|
char *name;
|
||||||
switch_core_session *session;
|
switch_core_session *session;
|
||||||
|
|
||||||
if (!(name = woomera_message_header(&wmsg, "Remote-Address"))) {
|
if (!(name = woomera_message_header(&wmsg, "Remote-Address"))) {
|
||||||
name = woomera_message_header(&wmsg, "Channel-Name");
|
name = woomera_message_header(&wmsg, "Channel-Name");
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "New Inbound Channel %s!\n", name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "New Inbound Channel %s!\n", name);
|
||||||
if ((session = switch_core_session_request(&woomerachan_endpoint_interface, NULL))) {
|
if ((session = switch_core_session_request(&woomerachan_endpoint_interface, NULL))) {
|
||||||
struct private_object *tech_pvt;
|
struct private_object *tech_pvt;
|
||||||
|
@ -1237,8 +1248,7 @@ static void *woomera_thread_run(void *obj)
|
||||||
|
|
||||||
switch_core_session_add_stream(session, NULL);
|
switch_core_session_add_stream(session, NULL);
|
||||||
|
|
||||||
if ((tech_pvt =
|
if ((tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object)))) {
|
||||||
(struct private_object *) switch_core_session_alloc(session, sizeof(struct private_object)))) {
|
|
||||||
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
memset(tech_pvt, 0, sizeof(*tech_pvt));
|
||||||
tech_pvt->profile = &default_profile;
|
tech_pvt->profile = &default_profile;
|
||||||
channel = switch_core_session_get_channel(session);
|
channel = switch_core_session_get_channel(session);
|
||||||
|
@ -1254,14 +1264,14 @@ static void *woomera_thread_run(void *obj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (globals.debug > 2) {
|
if (globals.debug > 2) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Main Thread {%s} Select Return %d\n", profile->name, res);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Main Thread {%s} Select Return %d\n", profile->name, res);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_yield(100);
|
switch_yield(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (profile->woomera_socket) {
|
if (profile->woomera_socket) {
|
||||||
woomera_printf(profile, profile->woomera_socket, "BYE%s", WOOMERA_RECORD_SEPERATOR);
|
woomera_printf(profile, profile->woomera_socket, "BYE%s", WOOMERA_RECORD_SEPERATOR);
|
||||||
|
@ -1295,31 +1305,30 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
switch_config cfg;
|
switch_config cfg;
|
||||||
char *var, *val;
|
char *var, *val;
|
||||||
struct woomera_profile *profile = &default_profile;
|
struct woomera_profile *profile = &default_profile;
|
||||||
char *cf = "woomera.conf";
|
char *cf = "woomera.conf";
|
||||||
|
|
||||||
memset(&globals, 0, sizeof(globals));
|
memset(&globals, 0, sizeof(globals));
|
||||||
globals.next_woomera_port = WOOMERA_MIN_PORT;
|
globals.next_woomera_port = WOOMERA_MIN_PORT;
|
||||||
|
|
||||||
if (!switch_config_open_file(&cfg, cf)) {
|
if (!switch_config_open_file(&cfg, cf)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_set_flag(profile, PFLAG_INBOUND | PFLAG_OUTBOUND);
|
switch_set_flag(profile, PFLAG_INBOUND | PFLAG_OUTBOUND);
|
||||||
profile->name = "main";
|
profile->name = "main";
|
||||||
strncpy(profile->dialplan, "default", sizeof(profile->dialplan) - 1);
|
strncpy(profile->dialplan, "default", sizeof(profile->dialplan) - 1);
|
||||||
|
|
||||||
while (switch_config_next_pair(&cfg, &var, &val)) {
|
while (switch_config_next_pair(&cfg, &var, &val)) {
|
||||||
if (!strcasecmp(cfg.category, "settings")) {
|
if (!strcasecmp(cfg.category, "settings")) {
|
||||||
if (!strcmp(var, "noload") && atoi(val)) {
|
if (!strcmp(var, "noload") && atoi(val)) {
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
if (!strcmp(var, "debug")) {
|
if (!strcmp(var, "debug")) {
|
||||||
globals.debug = atoi(val);
|
globals.debug = atoi(val);
|
||||||
}
|
}
|
||||||
|
@ -1350,7 +1359,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
|
|
||||||
switch_config_close_file(&cfg);
|
switch_config_close_file(&cfg);
|
||||||
|
|
||||||
|
|
||||||
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) {
|
||||||
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no pool\n");
|
||||||
|
|
||||||
|
@ -1367,7 +1376,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no lock\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "OH OH no lock\n");
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &woomerachan_module_interface;
|
*interface = &woomerachan_module_interface;
|
||||||
|
@ -1375,3 +1384,6 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_modul
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,11 +33,11 @@
|
||||||
|
|
||||||
static const char modname[] = "mod_event_test";
|
static const char modname[] = "mod_event_test";
|
||||||
|
|
||||||
static void event_handler(switch_event *event)
|
static void event_handler (switch_event *event)
|
||||||
{
|
{
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
||||||
switch (event->event_id) {
|
switch(event->event_id) {
|
||||||
case SWITCH_EVENT_LOG:
|
case SWITCH_EVENT_LOG:
|
||||||
return;
|
return;
|
||||||
break;
|
break;
|
||||||
|
@ -50,12 +50,12 @@ static void event_handler(switch_event *event)
|
||||||
|
|
||||||
|
|
||||||
static switch_loadable_module_interface event_test_module_interface = {
|
static switch_loadable_module_interface event_test_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MY_EVENT_COOL "test::cool"
|
#define MY_EVENT_COOL "test::cool"
|
||||||
|
@ -76,9 +76,9 @@ static void *torture_thread(switch_thread *thread, void *obj)
|
||||||
|
|
||||||
z = THREADS++;
|
z = THREADS++;
|
||||||
|
|
||||||
while (THREADS > 0) {
|
while(THREADS > 0) {
|
||||||
int x;
|
int x;
|
||||||
for (x = 0; x < 1; x++) {
|
for(x = 0; x < 1; x++) {
|
||||||
if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_COOL) == SWITCH_STATUS_SUCCESS) {
|
if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_COOL) == SWITCH_STATUS_SUCCESS) {
|
||||||
switch_event_add_header(event, "event_info", "hello world %d %d", z, y++);
|
switch_event_add_header(event, "event_info", "hello world %d %d", z, y++);
|
||||||
switch_event_fire(&event);
|
switch_event_fire(&event);
|
||||||
|
@ -104,8 +104,7 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &event_test_module_interface;
|
*interface = &event_test_module_interface;
|
||||||
|
|
||||||
|
@ -113,16 +112,16 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't register subclass!");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't register subclass!");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TORTURE_ME
|
#ifdef TORTURE_ME
|
||||||
if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) !=
|
if (switch_event_bind((char *)modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (1) {
|
if (1) {
|
||||||
int x = 0;
|
int x = 0;
|
||||||
for (x = 0; x < TTHREADS; x++) {
|
for(x = 0 ; x < TTHREADS ; x++) {
|
||||||
switch_core_launch_thread(torture_thread, NULL);
|
switch_core_launch_thread(torture_thread, NULL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -131,3 +130,4 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,7 @@ static struct {
|
||||||
struct session session;
|
struct session session;
|
||||||
} globals;
|
} globals;
|
||||||
|
|
||||||
static void event_handler(switch_event *event)
|
static void event_handler (switch_event *event)
|
||||||
{
|
{
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
iks *msg;
|
iks *msg;
|
||||||
|
@ -76,7 +76,7 @@ static void event_handler(switch_event *event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (event->event_id) {
|
switch(event->event_id) {
|
||||||
default:
|
default:
|
||||||
switch_event_serialize(event, buf, sizeof(buf), NULL);
|
switch_event_serialize(event, buf, sizeof(buf), NULL);
|
||||||
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\nEVENT\n--------------------------------\n%s\n", buf);
|
//switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\nEVENT\n--------------------------------\n%s\n", buf);
|
||||||
|
@ -91,8 +91,8 @@ static void event_handler(switch_event *event)
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_target_jid, globals.target_jid)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_target_jid, globals.target_jid)
|
||||||
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_passwd, globals.passwd)
|
SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_passwd, globals.passwd)
|
||||||
|
|
||||||
|
|
||||||
static switch_status load_config(void)
|
static switch_status load_config(void)
|
||||||
|
@ -103,13 +103,13 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
|
||||||
char *cf = "xmpp_event.conf";
|
char *cf = "xmpp_event.conf";
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
memset(&globals, 0, sizeof(globals));
|
memset(&globals, 0, sizeof(globals));
|
||||||
|
|
||||||
if (!switch_config_open_file(&cfg, cf)) {
|
if (!switch_config_open_file(&cfg, cf)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "open of %s failed\n", cf);
|
||||||
return SWITCH_STATUS_TERM;
|
return SWITCH_STATUS_TERM;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (switch_config_next_pair(&cfg, &var, &val)) {
|
while (switch_config_next_pair(&cfg, &var, &val)) {
|
||||||
if (!strcasecmp(cfg.category, "settings")) {
|
if (!strcasecmp(cfg.category, "settings")) {
|
||||||
if (!strcmp(var, "jid")) {
|
if (!strcmp(var, "jid")) {
|
||||||
|
@ -131,79 +131,76 @@ SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_jid, globals.jid)
|
||||||
|
|
||||||
if (count == 3) {
|
if (count == 3) {
|
||||||
/* TBD use config to pick what events to bind to */
|
/* TBD use config to pick what events to bind to */
|
||||||
if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) !=
|
if (switch_event_bind((char *)modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) {
|
||||||
SWITCH_STATUS_SUCCESS) {
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Couldn't bind!\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
status = SWITCH_STATUS_SUCCESS;
|
status = SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int on_result(struct session *sess, ikspak * pak)
|
int on_result (struct session *sess, ikspak *pak)
|
||||||
{
|
{
|
||||||
|
|
||||||
return IKS_FILTER_EAT;
|
return IKS_FILTER_EAT;
|
||||||
}
|
}
|
||||||
|
|
||||||
int on_stream(struct session *sess, int type, iks * node)
|
int on_stream (struct session *sess, int type, iks *node)
|
||||||
{
|
{
|
||||||
sess->counter = opt_timeout;
|
sess->counter = opt_timeout;
|
||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case IKS_NODE_START:
|
case IKS_NODE_START:
|
||||||
if (opt_use_tls && !iks_is_secure(sess->parser)) {
|
if (opt_use_tls && !iks_is_secure (sess->parser)) {
|
||||||
iks_start_tls(sess->parser);
|
iks_start_tls (sess->parser);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case IKS_NODE_NORMAL:
|
case IKS_NODE_NORMAL:
|
||||||
if (strcmp("stream:features", iks_name(node)) == 0) {
|
if (strcmp ("stream:features", iks_name (node)) == 0) {
|
||||||
sess->features = iks_stream_features(node);
|
sess->features = iks_stream_features (node);
|
||||||
if (opt_use_tls && !iks_is_secure(sess->parser))
|
if (opt_use_tls && !iks_is_secure (sess->parser)) break;
|
||||||
break;
|
|
||||||
if (sess->authorized) {
|
if (sess->authorized) {
|
||||||
iks *t;
|
iks *t;
|
||||||
if (sess->features & IKS_STREAM_BIND) {
|
if (sess->features & IKS_STREAM_BIND) {
|
||||||
t = iks_make_resource_bind(sess->acc);
|
t = iks_make_resource_bind (sess->acc);
|
||||||
iks_send(sess->parser, t);
|
iks_send (sess->parser, t);
|
||||||
iks_delete(t);
|
iks_delete (t);
|
||||||
}
|
}
|
||||||
if (sess->features & IKS_STREAM_SESSION) {
|
if (sess->features & IKS_STREAM_SESSION) {
|
||||||
t = iks_make_session();
|
t = iks_make_session ();
|
||||||
iks_insert_attrib(t, "id", "auth");
|
iks_insert_attrib (t, "id", "auth");
|
||||||
iks_send(sess->parser, t);
|
iks_send (sess->parser, t);
|
||||||
iks_delete(t);
|
iks_delete (t);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (sess->features & IKS_STREAM_SASL_MD5)
|
if (sess->features & IKS_STREAM_SASL_MD5)
|
||||||
iks_start_sasl(sess->parser, IKS_SASL_DIGEST_MD5, sess->acc->user, sess->pass);
|
iks_start_sasl (sess->parser, IKS_SASL_DIGEST_MD5, sess->acc->user, sess->pass);
|
||||||
else if (sess->features & IKS_STREAM_SASL_PLAIN)
|
else if (sess->features & IKS_STREAM_SASL_PLAIN)
|
||||||
iks_start_sasl(sess->parser, IKS_SASL_PLAIN, sess->acc->user, sess->pass);
|
iks_start_sasl (sess->parser, IKS_SASL_PLAIN, sess->acc->user, sess->pass);
|
||||||
}
|
}
|
||||||
} else if (strcmp("failure", iks_name(node)) == 0) {
|
} else if (strcmp ("failure", iks_name (node)) == 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "sasl authentication failed\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "sasl authentication failed\n");
|
||||||
} else if (strcmp("success", iks_name(node)) == 0) {
|
} else if (strcmp ("success", iks_name (node)) == 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "server connected\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "server connected\n");
|
||||||
sess->authorized = 1;
|
sess->authorized = 1;
|
||||||
iks_send_header(sess->parser, sess->acc->server);
|
iks_send_header (sess->parser, sess->acc->server);
|
||||||
} else {
|
} else {
|
||||||
ikspak *pak;
|
ikspak *pak;
|
||||||
|
|
||||||
pak = iks_packet(node);
|
pak = iks_packet (node);
|
||||||
iks_filter_packet(my_filter, pak);
|
iks_filter_packet (my_filter, pak);
|
||||||
if (sess->job_done == 1)
|
if (sess->job_done == 1) return IKS_HOOK;
|
||||||
return IKS_HOOK;
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#if 0
|
#if 0
|
||||||
case IKS_NODE_STOP:
|
case IKS_NODE_STOP:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "server disconnected\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "server disconnected\n");
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IKS_NODE_ERROR:
|
case IKS_NODE_ERROR:
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "stream error\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "stream error\n");
|
||||||
break;
|
break;
|
||||||
|
@ -211,14 +208,13 @@ int on_stream(struct session *sess, int type, iks * node)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (node)
|
if (node) iks_delete (node);
|
||||||
iks_delete(node);
|
|
||||||
return IKS_OK;
|
return IKS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
int on_msg(void *user_data, ikspak * pak)
|
int on_msg (void *user_data, ikspak *pak)
|
||||||
{
|
{
|
||||||
char *cmd = iks_find_cdata(pak->x, "body");
|
char *cmd = iks_find_cdata (pak->x, "body");
|
||||||
char *arg = NULL;
|
char *arg = NULL;
|
||||||
char retbuf[1024] = "";
|
char retbuf[1024] = "";
|
||||||
char *p;
|
char *p;
|
||||||
|
@ -231,67 +227,67 @@ int on_msg(void *user_data, ikspak * pak)
|
||||||
|
|
||||||
if ((arg = strchr(cmd, ' '))) {
|
if ((arg = strchr(cmd, ' '))) {
|
||||||
*arg++ = '\0';
|
*arg++ = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_api_execute(cmd, arg, retbuf, sizeof(retbuf));
|
switch_api_execute(cmd, arg, retbuf, sizeof(retbuf));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int on_error(void *user_data, ikspak * pak)
|
int on_error (void *user_data, ikspak *pak)
|
||||||
{
|
{
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "authorization failed\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "authorization failed\n");
|
||||||
return IKS_FILTER_EAT;
|
return IKS_FILTER_EAT;
|
||||||
}
|
}
|
||||||
|
|
||||||
void on_log(struct session *sess, const char *data, size_t size, int is_incoming)
|
void on_log (struct session *sess, const char *data, size_t size, int is_incoming)
|
||||||
{
|
{
|
||||||
if (iks_is_secure(sess->parser))
|
if (iks_is_secure (sess->parser)) fprintf (stderr, "Sec");
|
||||||
fprintf(stderr, "Sec");
|
if (is_incoming) fprintf (stderr, "RECV"); else fprintf (stderr, "SEND");
|
||||||
if (is_incoming)
|
fprintf (stderr, "[%s]\n", data);
|
||||||
fprintf(stderr, "RECV");
|
|
||||||
else
|
|
||||||
fprintf(stderr, "SEND");
|
|
||||||
fprintf(stderr, "[%s]\n", data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void j_setup_filter(struct session *sess)
|
void j_setup_filter (struct session *sess)
|
||||||
{
|
{
|
||||||
if (my_filter)
|
if (my_filter) iks_filter_delete (my_filter);
|
||||||
iks_filter_delete(my_filter);
|
my_filter = iks_filter_new ();
|
||||||
my_filter = iks_filter_new();
|
iks_filter_add_rule (my_filter, on_msg, 0,
|
||||||
iks_filter_add_rule(my_filter, on_msg, 0,
|
IKS_RULE_TYPE, IKS_PAK_MESSAGE,
|
||||||
IKS_RULE_TYPE, IKS_PAK_MESSAGE,
|
IKS_RULE_SUBTYPE, IKS_TYPE_CHAT,
|
||||||
IKS_RULE_SUBTYPE, IKS_TYPE_CHAT, IKS_RULE_FROM, globals.target_jid, IKS_RULE_DONE);
|
IKS_RULE_FROM, globals.target_jid,
|
||||||
iks_filter_add_rule(my_filter, (iksFilterHook *) on_result, sess,
|
IKS_RULE_DONE);
|
||||||
IKS_RULE_TYPE, IKS_PAK_IQ,
|
iks_filter_add_rule (my_filter, (iksFilterHook *) on_result, sess,
|
||||||
IKS_RULE_SUBTYPE, IKS_TYPE_RESULT, IKS_RULE_ID, "auth", IKS_RULE_DONE);
|
IKS_RULE_TYPE, IKS_PAK_IQ,
|
||||||
iks_filter_add_rule(my_filter, on_error, sess,
|
IKS_RULE_SUBTYPE, IKS_TYPE_RESULT,
|
||||||
IKS_RULE_TYPE, IKS_PAK_IQ,
|
IKS_RULE_ID, "auth",
|
||||||
IKS_RULE_SUBTYPE, IKS_TYPE_ERROR, IKS_RULE_ID, "auth", IKS_RULE_DONE);
|
IKS_RULE_DONE);
|
||||||
|
iks_filter_add_rule (my_filter, on_error, sess,
|
||||||
|
IKS_RULE_TYPE, IKS_PAK_IQ,
|
||||||
|
IKS_RULE_SUBTYPE, IKS_TYPE_ERROR,
|
||||||
|
IKS_RULE_ID, "auth",
|
||||||
|
IKS_RULE_DONE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xmpp_connect(char *jabber_id, char *pass)
|
static void xmpp_connect (char *jabber_id, char *pass)
|
||||||
{
|
{
|
||||||
while (RUNNING == 1) {
|
while (RUNNING == 1) {
|
||||||
int e;
|
int e;
|
||||||
|
|
||||||
memset(&globals.session, 0, sizeof(globals.session));
|
memset (&globals.session, 0, sizeof (globals.session));
|
||||||
globals.session.parser = iks_stream_new(IKS_NS_CLIENT, &globals.session, (iksStreamHook *) on_stream);
|
globals.session.parser = iks_stream_new (IKS_NS_CLIENT, &globals.session, (iksStreamHook *) on_stream);
|
||||||
if (globals.debug)
|
if (globals.debug) iks_set_log_hook (globals.session.parser, (iksLogHook *) on_log);
|
||||||
iks_set_log_hook(globals.session.parser, (iksLogHook *) on_log);
|
globals.session.acc = iks_id_new (iks_parser_stack (globals.session.parser), jabber_id);
|
||||||
globals.session.acc = iks_id_new(iks_parser_stack(globals.session.parser), jabber_id);
|
|
||||||
if (NULL == globals.session.acc->resource) {
|
if (NULL == globals.session.acc->resource) {
|
||||||
/* user gave no resource name, use the default */
|
/* user gave no resource name, use the default */
|
||||||
char tmp[512];
|
char tmp[512];
|
||||||
sprintf(tmp, "%s@%s/%s", globals.session.acc->user, globals.session.acc->server, modname);
|
sprintf (tmp, "%s@%s/%s", globals.session.acc->user, globals.session.acc->server, modname);
|
||||||
globals.session.acc = iks_id_new(iks_parser_stack(globals.session.parser), tmp);
|
globals.session.acc = iks_id_new (iks_parser_stack (globals.session.parser), tmp);
|
||||||
}
|
}
|
||||||
globals.session.pass = pass;
|
globals.session.pass = pass;
|
||||||
|
|
||||||
j_setup_filter(&globals.session);
|
j_setup_filter (&globals.session);
|
||||||
|
|
||||||
e = iks_connect_tcp(globals.session.parser, globals.session.acc->server, IKS_JABBER_PORT);
|
e = iks_connect_tcp (globals.session.parser, globals.session.acc->server, IKS_JABBER_PORT);
|
||||||
switch (e) {
|
switch (e) {
|
||||||
case IKS_OK:
|
case IKS_OK:
|
||||||
break;
|
break;
|
||||||
|
@ -307,13 +303,13 @@ static void xmpp_connect(char *jabber_id, char *pass)
|
||||||
|
|
||||||
globals.session.counter = opt_timeout;
|
globals.session.counter = opt_timeout;
|
||||||
while (RUNNING == 1) {
|
while (RUNNING == 1) {
|
||||||
e = iks_recv(globals.session.parser, 1);
|
e = iks_recv (globals.session.parser, 1);
|
||||||
|
|
||||||
if (globals.session.job_done) {
|
if(globals.session.job_done) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IKS_HOOK == e) {
|
if (IKS_HOOK == e) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -324,39 +320,38 @@ static void xmpp_connect(char *jabber_id, char *pass)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!globals.session.authorized) {
|
if (!globals.session.authorized) {
|
||||||
if (IKS_NET_TLSFAIL == e) {
|
if (IKS_NET_TLSFAIL == e) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "tls handshake failed\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "tls handshake failed\n");
|
||||||
switch_sleep(5000000);
|
switch_sleep(5000000);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (globals.session.counter == 0) {
|
if (globals.session.counter == 0) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "network timeout\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "network timeout\n");
|
||||||
switch_sleep(5000000);
|
switch_sleep(5000000);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
iks_disconnect(globals.session.parser);
|
iks_disconnect(globals.session.parser);
|
||||||
iks_parser_delete(globals.session.parser);
|
iks_parser_delete (globals.session.parser);
|
||||||
globals.session.authorized = 0;
|
globals.session.authorized = 0;
|
||||||
}
|
}
|
||||||
RUNNING = 0;
|
RUNNING = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_loadable_module_interface xmpp_event_module_interface = {
|
static switch_loadable_module_interface xmpp_event_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL
|
/*.application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &xmpp_event_module_interface;
|
*interface = &xmpp_event_module_interface;
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ static const char modname[] = "mod_sndfile";
|
||||||
|
|
||||||
struct sndfile_context {
|
struct sndfile_context {
|
||||||
SF_INFO sfinfo;
|
SF_INFO sfinfo;
|
||||||
SNDFILE *handle;
|
SNDFILE* handle;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct sndfile_context sndfile_context;
|
typedef struct sndfile_context sndfile_context;
|
||||||
|
@ -48,11 +48,11 @@ switch_status sndfile_file_open(switch_file_handle *handle, char *path)
|
||||||
char *ext;
|
char *ext;
|
||||||
|
|
||||||
if (!(ext = strrchr(path, '.'))) {
|
if (!(ext = strrchr(path, '.'))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid Format\n");
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid Format\n");
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
ext++;
|
ext++;
|
||||||
|
|
||||||
|
|
||||||
if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) {
|
if (switch_test_flag(handle, SWITCH_FILE_FLAG_READ)) {
|
||||||
mode += SFM_READ;
|
mode += SFM_READ;
|
||||||
|
@ -97,19 +97,18 @@ switch_status sndfile_file_open(switch_file_handle *handle, char *path)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp(ext, "gsm")) {
|
if (!strcmp(ext, "gsm")) {
|
||||||
context->sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_GSM610;
|
context->sfinfo.format = SF_FORMAT_RAW |SF_FORMAT_GSM610;
|
||||||
context->sfinfo.channels = 1;
|
context->sfinfo.channels = 1;
|
||||||
context->sfinfo.samplerate = 8000;
|
context->sfinfo.samplerate = 8000;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(context->handle = sf_open(path, mode, &context->sfinfo))) {
|
if (!(context->handle = sf_open(path, mode, &context->sfinfo))) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Error Opening File [%s] [%s]\n", path,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Error Opening File [%s] [%s]\n", path, sf_strerror(context->handle));
|
||||||
sf_strerror(context->handle));
|
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Opening File [%s] %dhz\n", path, context->sfinfo.samplerate);
|
||||||
handle->samples = (unsigned int) context->sfinfo.frames;
|
handle->samples = (unsigned int)context->sfinfo.frames;
|
||||||
handle->samplerate = context->sfinfo.samplerate;
|
handle->samplerate = context->sfinfo.samplerate;
|
||||||
handle->channels = context->sfinfo.channels;
|
handle->channels = context->sfinfo.channels;
|
||||||
handle->format = context->sfinfo.format;
|
handle->format = context->sfinfo.format;
|
||||||
|
@ -126,63 +125,63 @@ switch_status sndfile_file_close(switch_file_handle *handle)
|
||||||
sndfile_context *context = handle->private;
|
sndfile_context *context = handle->private;
|
||||||
|
|
||||||
sf_close(context->handle);
|
sf_close(context->handle);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_status sndfile_file_seek(switch_file_handle *handle, unsigned int *cur_sample, unsigned int samples, int whence)
|
switch_status sndfile_file_seek(switch_file_handle *handle, unsigned int *cur_sample, unsigned int samples, int whence)
|
||||||
{
|
{
|
||||||
sndfile_context *context = handle->private;
|
sndfile_context *context = handle->private;
|
||||||
|
|
||||||
if (!handle->seekable) {
|
if (!handle->seekable) {
|
||||||
return SWITCH_STATUS_NOTIMPL;
|
return SWITCH_STATUS_NOTIMPL;
|
||||||
}
|
}
|
||||||
|
|
||||||
*cur_sample = (unsigned int) sf_seek(context->handle, samples, whence);
|
*cur_sample = (unsigned int)sf_seek(context->handle, samples, whence);
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_status sndfile_file_read(switch_file_handle *handle, void *data, size_t *len)
|
switch_status sndfile_file_read (switch_file_handle *handle, void *data, size_t *len)
|
||||||
{
|
{
|
||||||
size_t inlen = *len;
|
size_t inlen = *len;
|
||||||
sndfile_context *context = handle->private;
|
sndfile_context *context = handle->private;
|
||||||
|
|
||||||
if (switch_test_flag(handle, SWITCH_FILE_DATA_RAW)) {
|
if (switch_test_flag(handle, SWITCH_FILE_DATA_RAW)) {
|
||||||
*len = (size_t) sf_read_raw(context->handle, data, inlen);
|
*len = (size_t)sf_read_raw (context->handle, data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_INT)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_INT)) {
|
||||||
*len = (size_t) sf_readf_int(context->handle, (int *) data, inlen);
|
*len = (size_t)sf_readf_int(context->handle, (int *) data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_SHORT)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_SHORT)) {
|
||||||
*len = (size_t) sf_readf_short(context->handle, (short *) data, inlen);
|
*len = (size_t)sf_readf_short(context->handle, (short *) data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_FLOAT)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_FLOAT)) {
|
||||||
*len = (size_t) sf_readf_float(context->handle, (float *) data, inlen);
|
*len = (size_t)sf_readf_float(context->handle, (float *) data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_DOUBLE)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_DOUBLE)) {
|
||||||
*len = (size_t) sf_readf_double(context->handle, (double *) data, inlen);
|
*len = (size_t)sf_readf_double(context->handle, (double *) data, inlen);
|
||||||
} else {
|
} else {
|
||||||
*len = (size_t) sf_readf_int(context->handle, (int *) data, inlen);
|
*len = (size_t)sf_readf_int(context->handle, (int *) data, inlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_status sndfile_file_write(switch_file_handle *handle, void *data, size_t *len)
|
switch_status sndfile_file_write (switch_file_handle *handle, void *data, size_t *len)
|
||||||
{
|
{
|
||||||
size_t inlen = *len;
|
size_t inlen = *len;
|
||||||
sndfile_context *context = handle->private;
|
sndfile_context *context = handle->private;
|
||||||
|
|
||||||
if (switch_test_flag(handle, SWITCH_FILE_DATA_RAW)) {
|
if (switch_test_flag(handle, SWITCH_FILE_DATA_RAW)) {
|
||||||
*len = (size_t) sf_write_raw(context->handle, data, inlen);
|
*len = (size_t)sf_write_raw (context->handle, data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_INT)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_INT)) {
|
||||||
*len = (size_t) sf_writef_int(context->handle, (int *) data, inlen);
|
*len = (size_t)sf_writef_int(context->handle, (int *) data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_SHORT)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_SHORT)) {
|
||||||
*len = (size_t) sf_writef_short(context->handle, (short *) data, inlen);
|
*len = (size_t)sf_writef_short(context->handle, (short *) data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_FLOAT)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_FLOAT)) {
|
||||||
*len = (size_t) sf_writef_float(context->handle, (float *) data, inlen);
|
*len = (size_t)sf_writef_float(context->handle, (float *) data, inlen);
|
||||||
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_DOUBLE)) {
|
} else if (switch_test_flag(handle, SWITCH_FILE_DATA_DOUBLE)) {
|
||||||
*len = (size_t) sf_writef_double(context->handle, (double *) data, inlen);
|
*len = (size_t)sf_writef_double(context->handle, (double *) data, inlen);
|
||||||
} else {
|
} else {
|
||||||
*len = (size_t) sf_writef_int(context->handle, (int *) data, inlen);
|
*len = (size_t)sf_writef_int(context->handle, (int *) data, inlen);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
@ -193,61 +192,60 @@ switch_status sndfile_file_write(switch_file_handle *handle, void *data, size_t
|
||||||
static char **supported_formats;
|
static char **supported_formats;
|
||||||
|
|
||||||
static switch_file_interface sndfile_file_interface = {
|
static switch_file_interface sndfile_file_interface = {
|
||||||
/*.interface_name */ modname,
|
/*.interface_name*/ modname,
|
||||||
/*.file_open */ sndfile_file_open,
|
/*.file_open*/ sndfile_file_open,
|
||||||
/*.file_close */ sndfile_file_close,
|
/*.file_close*/ sndfile_file_close,
|
||||||
/*.file_read */ sndfile_file_read,
|
/*.file_read*/ sndfile_file_read,
|
||||||
/*.file_write */ sndfile_file_write,
|
/*.file_write*/ sndfile_file_write,
|
||||||
/*.file_seek */ sndfile_file_seek,
|
/*.file_seek*/ sndfile_file_seek,
|
||||||
/*.extens */ NULL,
|
/*.extens*/ NULL,
|
||||||
/*.next */ NULL,
|
/*.next*/ NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
static switch_loadable_module_interface sndfile_module_interface = {
|
static switch_loadable_module_interface sndfile_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ NULL,
|
/*.timer_interface*/ NULL,
|
||||||
/*.dialplan_interface */ NULL,
|
/*.dialplan_interface*/ NULL,
|
||||||
/*.codec_interface */ NULL,
|
/*.codec_interface*/ NULL,
|
||||||
/*.application_interface */ NULL,
|
/*.application_interface*/ NULL,
|
||||||
/*.api_interface */ NULL,
|
/*.api_interface*/ NULL,
|
||||||
/*.file_interface */ &sndfile_file_interface
|
/*.file_interface*/ &sndfile_file_interface
|
||||||
};
|
};
|
||||||
|
|
||||||
static switch_status setup_formats(void)
|
static switch_status setup_formats(void)
|
||||||
{
|
{
|
||||||
SF_FORMAT_INFO info;
|
SF_FORMAT_INFO info ;
|
||||||
SF_INFO sfinfo;
|
SF_INFO sfinfo ;
|
||||||
char buffer[128];
|
char buffer [128] ;
|
||||||
int format, major_count, subtype_count, m, s;
|
int format, major_count, subtype_count, m, s ;
|
||||||
int len, x, skip;
|
int len,x,skip;
|
||||||
char *extras[] = { "r8", "r16", "r24", "r32", "gsm", NULL };
|
char *extras[] = {"r8", "r16", "r24", "r32", "gsm", NULL};
|
||||||
int exlen = (sizeof(extras) / sizeof(extras[0]));
|
int exlen = (sizeof(extras) / sizeof(extras[0]));
|
||||||
buffer[0] = 0;
|
buffer [0] = 0 ;
|
||||||
sf_command(NULL, SFC_GET_LIB_VERSION, buffer, sizeof(buffer));
|
sf_command (NULL, SFC_GET_LIB_VERSION, buffer, sizeof (buffer)) ;
|
||||||
if (strlen(buffer) < 1) {
|
if (strlen (buffer) < 1) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Line %d: could not retrieve lib version.\n", __LINE__);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "Line %d: could not retrieve lib version.\n", __LINE__) ;
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\nLibSndFile Version : %s Supported Formats\n", buffer);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "\nLibSndFile Version : %s Supported Formats\n", buffer) ;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "================================================================================\n");
|
||||||
"================================================================================\n");
|
sf_command (NULL, SFC_GET_FORMAT_MAJOR_COUNT, &major_count, sizeof (int)) ;
|
||||||
sf_command(NULL, SFC_GET_FORMAT_MAJOR_COUNT, &major_count, sizeof(int));
|
sf_command (NULL, SFC_GET_FORMAT_SUBTYPE_COUNT, &subtype_count, sizeof (int)) ;
|
||||||
sf_command(NULL, SFC_GET_FORMAT_SUBTYPE_COUNT, &subtype_count, sizeof(int));
|
|
||||||
|
sfinfo.channels = 1 ;
|
||||||
sfinfo.channels = 1;
|
|
||||||
len = ((major_count + (exlen + 2)) * sizeof(char *));
|
len = ((major_count + (exlen + 2)) * sizeof(char *));
|
||||||
supported_formats = switch_core_permenant_alloc(len);
|
supported_formats = switch_core_permenant_alloc(len);
|
||||||
|
|
||||||
len = 0;
|
len = 0;
|
||||||
for (m = 0; m < major_count; m++) {
|
for (m = 0 ; m < major_count ; m++) {
|
||||||
skip = 0;
|
skip = 0;
|
||||||
info.format = m;
|
info.format = m ;
|
||||||
sf_command(NULL, SFC_GET_FORMAT_MAJOR, &info, sizeof(info));
|
sf_command (NULL, SFC_GET_FORMAT_MAJOR, &info, sizeof (info)) ;
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "%s (extension \"%s\")\n", info.name, info.extension);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "%s (extension \"%s\")\n", info.name, info.extension) ;
|
||||||
for (x = 0; x < len; x++) {
|
for (x = 0 ; x < len ; x++) {
|
||||||
if (supported_formats[x] == info.extension) {
|
if (supported_formats[x] == info.extension) {
|
||||||
skip++;
|
skip++;
|
||||||
break;
|
break;
|
||||||
|
@ -257,33 +255,31 @@ static switch_status setup_formats(void)
|
||||||
supported_formats[len++] = (char *) info.extension;
|
supported_formats[len++] = (char *) info.extension;
|
||||||
}
|
}
|
||||||
format = info.format;
|
format = info.format;
|
||||||
|
|
||||||
for (s = 0; s < subtype_count; s++) {
|
for (s = 0 ; s < subtype_count ; s++) {
|
||||||
info.format = s;
|
info.format = s ;
|
||||||
sf_command(NULL, SFC_GET_FORMAT_SUBTYPE, &info, sizeof(info));
|
sf_command (NULL, SFC_GET_FORMAT_SUBTYPE, &info, sizeof (info)) ;
|
||||||
format = (format & SF_FORMAT_TYPEMASK) | info.format;
|
format = (format & SF_FORMAT_TYPEMASK) | info.format ;
|
||||||
sfinfo.format = format;
|
sfinfo.format = format ;
|
||||||
if (sf_format_check(&sfinfo)) {
|
if (sf_format_check (&sfinfo)) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " %s\n", info.name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, " %s\n", info.name) ;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
for (m = 0; m < exlen; m++) {
|
for(m=0; m< exlen; m++) {
|
||||||
supported_formats[len++] = extras[m];
|
supported_formats[len++] = extras[m];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "================================================================================\n");
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN,
|
|
||||||
"================================================================================\n");
|
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (setup_formats() != SWITCH_STATUS_SUCCESS) {
|
if (setup_formats() != SWITCH_STATUS_SUCCESS) {
|
||||||
return SWITCH_STATUS_FALSE;
|
return SWITCH_STATUS_FALSE;
|
||||||
}
|
}
|
||||||
|
@ -295,3 +291,4 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -71,9 +71,9 @@ static switch_status soft_timer_next(switch_timer *timer)
|
||||||
|
|
||||||
#ifdef WINTIMER
|
#ifdef WINTIMER
|
||||||
private->base.QuadPart += timer->interval * (private->freq.QuadPart / 1000);
|
private->base.QuadPart += timer->interval * (private->freq.QuadPart / 1000);
|
||||||
for (;;) {
|
for(;;) {
|
||||||
QueryPerformanceCounter(&private->now);
|
QueryPerformanceCounter(&private->now);
|
||||||
if (private->now.QuadPart >= private->base.QuadPart) {
|
if(private->now.QuadPart >= private->base.QuadPart) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
switch_yield(100);
|
switch_yield(100);
|
||||||
|
@ -98,27 +98,31 @@ static switch_status soft_timer_destroy(switch_timer *timer)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const switch_timer_interface soft_timer_interface = {
|
static const switch_timer_interface soft_timer_interface = {
|
||||||
/*.interface_name */ "soft",
|
/*.interface_name*/ "soft",
|
||||||
/*.timer_init */ soft_timer_init,
|
/*.timer_init*/ soft_timer_init,
|
||||||
/*.timer_next */ soft_timer_next,
|
/*.timer_next*/ soft_timer_next,
|
||||||
/*.timer_destroy */ soft_timer_destroy
|
/*.timer_destroy*/ soft_timer_destroy
|
||||||
};
|
};
|
||||||
|
|
||||||
static const switch_loadable_module_interface mod_timers_module_interface = {
|
static const switch_loadable_module_interface mod_timers_module_interface = {
|
||||||
/*.module_name */ modname,
|
/*.module_name*/ modname,
|
||||||
/*.endpoint_interface */ NULL,
|
/*.endpoint_interface*/ NULL,
|
||||||
/*.timer_interface */ &soft_timer_interface,
|
/*.timer_interface*/ &soft_timer_interface,
|
||||||
/*.switch_dialplan_interface */ NULL,
|
/*.switch_dialplan_interface*/ NULL,
|
||||||
/*.switch_codec_interface */ NULL,
|
/*.switch_codec_interface*/ NULL,
|
||||||
/*.switch_application_interface */ NULL
|
/*.switch_application_interface*/ NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename)
|
SWITCH_MOD_DECLARE(switch_status) switch_module_load(const switch_loadable_module_interface **interface, char *filename) {
|
||||||
{
|
|
||||||
|
|
||||||
/* connect my internal structure to the blank pointer passed to me */
|
/* connect my internal structure to the blank pointer passed to me */
|
||||||
*interface = &mod_timers_module_interface;
|
*interface = &mod_timers_module_interface;
|
||||||
|
|
||||||
/* indicate that the module should continue to be loaded */
|
/* indicate that the module should continue to be loaded */
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,7 @@
|
||||||
*/
|
*/
|
||||||
#include <switch.h>
|
#include <switch.h>
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[]) {
|
||||||
{
|
|
||||||
char *err = NULL;
|
char *err = NULL;
|
||||||
switch_event *event;
|
switch_event *event;
|
||||||
|
|
||||||
|
@ -48,7 +47,7 @@ int main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (err) {
|
if(err) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Error: %s", err);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Error: %s", err);
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
|
@ -76,3 +75,5 @@ int main(int argc, char *argv[])
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -41,8 +41,7 @@ SWITCH_DECLARE(switch_status) switch_buffer_create(switch_memory_pool *pool, swi
|
||||||
{
|
{
|
||||||
switch_buffer *new_buffer;
|
switch_buffer *new_buffer;
|
||||||
|
|
||||||
if ((new_buffer = switch_core_alloc(pool, sizeof(switch_buffer)))
|
if ((new_buffer = switch_core_alloc(pool, sizeof(switch_buffer))) && (new_buffer->data = switch_core_alloc(pool, max_len))) {
|
||||||
&& (new_buffer->data = switch_core_alloc(pool, max_len))) {
|
|
||||||
new_buffer->datalen = max_len;
|
new_buffer->datalen = max_len;
|
||||||
*buffer = new_buffer;
|
*buffer = new_buffer;
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
@ -55,7 +54,7 @@ SWITCH_DECLARE(int) switch_buffer_len(switch_buffer *buffer)
|
||||||
|
|
||||||
assert(buffer != NULL);
|
assert(buffer != NULL);
|
||||||
|
|
||||||
return (int) buffer->datalen;
|
return (int)buffer->datalen;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,14 +63,14 @@ SWITCH_DECLARE(int) switch_buffer_freespace(switch_buffer *buffer)
|
||||||
{
|
{
|
||||||
assert(buffer != NULL);
|
assert(buffer != NULL);
|
||||||
|
|
||||||
return (int) (buffer->datalen - buffer->used);
|
return (int)(buffer->datalen - buffer->used);
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_buffer_inuse(switch_buffer *buffer)
|
SWITCH_DECLARE(int) switch_buffer_inuse(switch_buffer *buffer)
|
||||||
{
|
{
|
||||||
assert(buffer != NULL);
|
assert(buffer != NULL);
|
||||||
|
|
||||||
return (int) buffer->used;
|
return (int)buffer->used;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_buffer_toss(switch_buffer *buffer, size_t datalen)
|
SWITCH_DECLARE(int) switch_buffer_toss(switch_buffer *buffer, size_t datalen)
|
||||||
|
@ -92,7 +91,7 @@ SWITCH_DECLARE(int) switch_buffer_toss(switch_buffer *buffer, size_t datalen)
|
||||||
memmove(buffer->data, buffer->data + reading, buffer->datalen - reading);
|
memmove(buffer->data, buffer->data + reading, buffer->datalen - reading);
|
||||||
buffer->used -= datalen;
|
buffer->used -= datalen;
|
||||||
|
|
||||||
return (int) buffer->datalen;
|
return (int)buffer->datalen;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_buffer_read(switch_buffer *buffer, void *data, size_t datalen)
|
SWITCH_DECLARE(int) switch_buffer_read(switch_buffer *buffer, void *data, size_t datalen)
|
||||||
|
@ -116,7 +115,7 @@ SWITCH_DECLARE(int) switch_buffer_read(switch_buffer *buffer, void *data, size_t
|
||||||
memmove(buffer->data, buffer->data + reading, buffer->datalen - reading);
|
memmove(buffer->data, buffer->data + reading, buffer->datalen - reading);
|
||||||
buffer->used -= reading;
|
buffer->used -= reading;
|
||||||
//printf("o %d = %d\n", reading, buffer->used);
|
//printf("o %d = %d\n", reading, buffer->used);
|
||||||
return (int) reading;
|
return (int)reading;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_buffer_write(switch_buffer *buffer, void *data, size_t datalen)
|
SWITCH_DECLARE(int) switch_buffer_write(switch_buffer *buffer, void *data, size_t datalen)
|
||||||
|
@ -136,5 +135,6 @@ SWITCH_DECLARE(int) switch_buffer_write(switch_buffer *buffer, void *data, size_
|
||||||
buffer->used += datalen;
|
buffer->used += datalen;
|
||||||
}
|
}
|
||||||
//printf("i %d = %d\n", datalen, buffer->used);
|
//printf("i %d = %d\n", datalen, buffer->used);
|
||||||
return (int) buffer->used;
|
return (int)buffer->used;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,9 @@ SWITCH_DECLARE(switch_caller_profile *) switch_caller_profile_new(switch_core_se
|
||||||
char *caller_id_name,
|
char *caller_id_name,
|
||||||
char *caller_id_number,
|
char *caller_id_number,
|
||||||
char *network_addr,
|
char *network_addr,
|
||||||
char *ani, char *ani2, char *destination_number)
|
char *ani,
|
||||||
|
char *ani2,
|
||||||
|
char *destination_number)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
@ -73,8 +75,8 @@ SWITCH_DECLARE(switch_caller_profile *) switch_caller_profile_clone(switch_core_
|
||||||
return profile;
|
return profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile *caller_profile, char *prefix,
|
SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile *caller_profile, char *prefix, switch_event *event)
|
||||||
switch_event *event)
|
|
||||||
{
|
{
|
||||||
char header_name[1024];
|
char header_name[1024];
|
||||||
|
|
||||||
|
@ -110,7 +112,9 @@ SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_caller_extension *) switch_caller_extension_new(switch_core_session *session,
|
SWITCH_DECLARE(switch_caller_extension *) switch_caller_extension_new(switch_core_session *session,
|
||||||
char *extension_name, char *extension_number)
|
char *extension_name,
|
||||||
|
char *extension_number
|
||||||
|
)
|
||||||
{
|
{
|
||||||
switch_caller_extension *caller_extension = NULL;
|
switch_caller_extension *caller_extension = NULL;
|
||||||
|
|
||||||
|
@ -126,7 +130,8 @@ SWITCH_DECLARE(switch_caller_extension *) switch_caller_extension_new(switch_cor
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session *session,
|
SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session *session,
|
||||||
switch_caller_extension *caller_extension,
|
switch_caller_extension *caller_extension,
|
||||||
char *application_name, char *application_data)
|
char *application_name,
|
||||||
|
char *application_data)
|
||||||
{
|
{
|
||||||
switch_caller_application *caller_application = NULL;
|
switch_caller_application *caller_application = NULL;
|
||||||
|
|
||||||
|
@ -137,7 +142,7 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session
|
||||||
caller_application->application_data = switch_core_session_strdup(session, application_data);
|
caller_application->application_data = switch_core_session_strdup(session, application_data);
|
||||||
if (!caller_extension->applications) {
|
if (!caller_extension->applications) {
|
||||||
caller_extension->applications = caller_application;
|
caller_extension->applications = caller_application;
|
||||||
} else if (caller_extension->last_application) {
|
} else if(caller_extension->last_application) {
|
||||||
caller_extension->last_application->next = caller_application;
|
caller_extension->last_application->next = caller_application;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,3 +151,6 @@ SWITCH_DECLARE(void) switch_caller_extension_add_application(switch_core_session
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -71,8 +71,7 @@ SWITCH_DECLARE(switch_status) switch_channel_alloc(switch_channel **channel, swi
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_channel_set_raw_mode(switch_channel *channel, int freq, int bits, int channels,
|
SWITCH_DECLARE(switch_status) switch_channel_set_raw_mode (switch_channel *channel, int freq, int bits, int channels, int ms, int kbps)
|
||||||
int ms, int kbps)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
@ -87,8 +86,7 @@ SWITCH_DECLARE(switch_status) switch_channel_set_raw_mode(switch_channel *channe
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_channel_get_raw_mode(switch_channel *channel, int *freq, int *bits, int *channels,
|
SWITCH_DECLARE(switch_status) switch_channel_get_raw_mode (switch_channel *channel, int *freq, int *bits, int *channels, int *ms, int *kbps)
|
||||||
int *ms, int *kbps)
|
|
||||||
{
|
{
|
||||||
if (freq) {
|
if (freq) {
|
||||||
*freq = channel->freq;
|
*freq = channel->freq;
|
||||||
|
@ -130,7 +128,7 @@ SWITCH_DECLARE(switch_status) switch_channel_queue_dtmf(switch_channel *channel,
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
|
|
||||||
switch_mutex_lock(channel->dtmf_mutex);
|
switch_mutex_lock(channel->dtmf_mutex);
|
||||||
if (switch_buffer_inuse(channel->dtmf_buffer) + strlen(dtmf) > (size_t) switch_buffer_len(channel->dtmf_buffer)) {
|
if (switch_buffer_inuse(channel->dtmf_buffer) + strlen(dtmf) > (size_t)switch_buffer_len(channel->dtmf_buffer)) {
|
||||||
switch_buffer_toss(channel->dtmf_buffer, strlen(dtmf));
|
switch_buffer_toss(channel->dtmf_buffer, strlen(dtmf));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -166,7 +164,8 @@ SWITCH_DECLARE(int) switch_channel_dequeue_dtmf(switch_channel *channel, char *d
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_channel_init(switch_channel *channel,
|
SWITCH_DECLARE(switch_status) switch_channel_init(switch_channel *channel,
|
||||||
switch_core_session *session,
|
switch_core_session *session,
|
||||||
switch_channel_state state, switch_channel_flag flags)
|
switch_channel_state state,
|
||||||
|
switch_channel_flag flags)
|
||||||
{
|
{
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
channel->state = state;
|
channel->state = state;
|
||||||
|
@ -278,117 +277,115 @@ SWITCH_DECLARE(switch_channel_state) switch_channel_set_state(switch_channel *ch
|
||||||
}
|
}
|
||||||
|
|
||||||
/* STUB for more dev
|
/* STUB for more dev
|
||||||
case CS_INIT:
|
|
||||||
switch(state) {
|
|
||||||
|
|
||||||
case CS_NEW:
|
|
||||||
case CS_INIT:
|
|
||||||
case CS_LOOPBACK:
|
|
||||||
case CS_TRANSMIT:
|
|
||||||
case CS_RING:
|
|
||||||
case CS_EXECUTE:
|
|
||||||
case CS_HANGUP:
|
|
||||||
case CS_DONE:
|
|
||||||
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
*/
|
|
||||||
|
|
||||||
switch (last_state) {
|
|
||||||
case CS_NEW:
|
|
||||||
switch (state) {
|
|
||||||
default:
|
|
||||||
ok++;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case CS_INIT:
|
case CS_INIT:
|
||||||
switch (state) {
|
switch(state) {
|
||||||
case CS_LOOPBACK:
|
|
||||||
case CS_TRANSMIT:
|
|
||||||
case CS_RING:
|
|
||||||
case CS_EXECUTE:
|
|
||||||
case CS_HANGUP:
|
|
||||||
ok++;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
|
case CS_NEW:
|
||||||
|
case CS_INIT:
|
||||||
case CS_LOOPBACK:
|
case CS_LOOPBACK:
|
||||||
switch (state) {
|
|
||||||
case CS_TRANSMIT:
|
|
||||||
case CS_RING:
|
|
||||||
case CS_EXECUTE:
|
|
||||||
case CS_HANGUP:
|
|
||||||
ok++;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case CS_TRANSMIT:
|
case CS_TRANSMIT:
|
||||||
switch (state) {
|
|
||||||
case CS_LOOPBACK:
|
|
||||||
case CS_RING:
|
|
||||||
case CS_EXECUTE:
|
|
||||||
case CS_HANGUP:
|
|
||||||
ok++;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case CS_RING:
|
case CS_RING:
|
||||||
switch (state) {
|
|
||||||
case CS_LOOPBACK:
|
|
||||||
case CS_EXECUTE:
|
|
||||||
case CS_HANGUP:
|
|
||||||
case CS_TRANSMIT:
|
|
||||||
ok++;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case CS_EXECUTE:
|
case CS_EXECUTE:
|
||||||
switch (state) {
|
|
||||||
case CS_LOOPBACK:
|
|
||||||
case CS_TRANSMIT:
|
|
||||||
case CS_RING:
|
|
||||||
case CS_HANGUP:
|
|
||||||
ok++;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case CS_HANGUP:
|
case CS_HANGUP:
|
||||||
switch (state) {
|
case CS_DONE:
|
||||||
case CS_DONE:
|
|
||||||
ok++;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
*/
|
||||||
|
|
||||||
|
switch(last_state) {
|
||||||
|
case CS_NEW:
|
||||||
|
switch(state) {
|
||||||
|
default:
|
||||||
|
ok++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CS_INIT:
|
||||||
|
switch(state) {
|
||||||
|
case CS_LOOPBACK:
|
||||||
|
case CS_TRANSMIT:
|
||||||
|
case CS_RING:
|
||||||
|
case CS_EXECUTE:
|
||||||
|
case CS_HANGUP:
|
||||||
|
ok++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CS_LOOPBACK:
|
||||||
|
switch(state) {
|
||||||
|
case CS_TRANSMIT:
|
||||||
|
case CS_RING:
|
||||||
|
case CS_EXECUTE:
|
||||||
|
case CS_HANGUP:
|
||||||
|
ok++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CS_TRANSMIT:
|
||||||
|
switch(state) {
|
||||||
|
case CS_LOOPBACK:
|
||||||
|
case CS_RING:
|
||||||
|
case CS_EXECUTE:
|
||||||
|
case CS_HANGUP:
|
||||||
|
ok++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CS_RING:
|
||||||
|
switch(state) {
|
||||||
|
case CS_LOOPBACK:
|
||||||
|
case CS_EXECUTE:
|
||||||
|
case CS_HANGUP:
|
||||||
|
case CS_TRANSMIT:
|
||||||
|
ok++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CS_EXECUTE:
|
||||||
|
switch(state) {
|
||||||
|
case CS_LOOPBACK:
|
||||||
|
case CS_TRANSMIT:
|
||||||
|
case CS_RING:
|
||||||
|
case CS_HANGUP:
|
||||||
|
ok++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case CS_HANGUP:
|
||||||
|
switch(state) {
|
||||||
|
case CS_DONE:
|
||||||
|
ok++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (ok) {
|
if (ok) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s State Change %s -> %s\n", channel->name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]);
|
||||||
state_names[last_state], state_names[state]);
|
|
||||||
channel->state = state;
|
channel->state = state;
|
||||||
switch_core_session_signal_state_change(channel->session);
|
switch_core_session_signal_state_change(channel->session);
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s Invalid State Change %s -> %s\n", channel->name,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "%s Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]);
|
||||||
state_names[last_state], state_names[state]);
|
|
||||||
|
|
||||||
//we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee!
|
//we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee!
|
||||||
if (channel->state < CS_HANGUP) {
|
if (channel->state < CS_HANGUP) {
|
||||||
|
@ -402,7 +399,7 @@ SWITCH_DECLARE(switch_channel_state) switch_channel_set_state(switch_channel *ch
|
||||||
SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel *channel, switch_event *event)
|
SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel *channel, switch_event *event)
|
||||||
{
|
{
|
||||||
switch_caller_profile *caller_profile, *originator_caller_profile, *originatee_caller_profile;
|
switch_caller_profile *caller_profile, *originator_caller_profile, *originatee_caller_profile;
|
||||||
switch_hash_index_t *hi;
|
switch_hash_index_t* hi;
|
||||||
void *val;
|
void *val;
|
||||||
const void *var;
|
const void *var;
|
||||||
|
|
||||||
|
@ -410,13 +407,12 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel *channel, swit
|
||||||
originator_caller_profile = switch_channel_get_originator_caller_profile(channel);
|
originator_caller_profile = switch_channel_get_originator_caller_profile(channel);
|
||||||
originatee_caller_profile = switch_channel_get_originatee_caller_profile(channel);
|
originatee_caller_profile = switch_channel_get_originatee_caller_profile(channel);
|
||||||
|
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State",
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-State", (char *) switch_channel_state_name(channel->state));
|
||||||
(char *) switch_channel_state_name(channel->state));
|
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", switch_channel_get_name(channel));
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Channel-Name", switch_channel_get_name(channel));
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(channel->session));
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", switch_core_session_get_uuid(channel->session));
|
||||||
|
|
||||||
|
|
||||||
/* Index Caller's Profile */
|
/* Index Caller's Profile */
|
||||||
if (caller_profile) {
|
if (caller_profile) {
|
||||||
switch_caller_profile_event_set_data(caller_profile, "Caller", event);
|
switch_caller_profile_event_set_data(caller_profile, "Caller", event);
|
||||||
}
|
}
|
||||||
|
@ -432,8 +428,7 @@ SWITCH_DECLARE(void) switch_channel_event_set_data(switch_channel *channel, swit
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Index Variables */
|
/* Index Variables */
|
||||||
for (hi = switch_hash_first(switch_core_session_get_pool(channel->session), channel->variables); hi;
|
for (hi = switch_hash_first(switch_core_session_get_pool(channel->session), channel->variables); hi; hi = switch_hash_next(hi)) {
|
||||||
hi = switch_hash_next(hi)) {
|
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
switch_event_subclass *subclass;
|
switch_event_subclass *subclass;
|
||||||
switch_hash_this(hi, &var, NULL, &val);
|
switch_hash_this(hi, &var, NULL, &val);
|
||||||
|
@ -458,15 +453,13 @@ SWITCH_DECLARE(switch_caller_profile *) switch_channel_get_caller_profile(switch
|
||||||
return channel->caller_profile;
|
return channel->caller_profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_channel_set_originator_caller_profile(switch_channel *channel,
|
SWITCH_DECLARE(void) switch_channel_set_originator_caller_profile(switch_channel *channel, switch_caller_profile *caller_profile)
|
||||||
switch_caller_profile *caller_profile)
|
|
||||||
{
|
{
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
channel->originator_caller_profile = caller_profile;
|
channel->originator_caller_profile = caller_profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_channel_set_originatee_caller_profile(switch_channel *channel,
|
SWITCH_DECLARE(void) switch_channel_set_originatee_caller_profile(switch_channel *channel, switch_caller_profile *caller_profile)
|
||||||
switch_caller_profile *caller_profile)
|
|
||||||
{
|
{
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
channel->originatee_caller_profile = caller_profile;
|
channel->originatee_caller_profile = caller_profile;
|
||||||
|
@ -484,8 +477,7 @@ SWITCH_DECLARE(switch_caller_profile *) switch_channel_get_originatee_caller_pro
|
||||||
return channel->originatee_caller_profile;
|
return channel->originatee_caller_profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_channel_set_event_handlers(switch_channel *channel,
|
SWITCH_DECLARE(void) switch_channel_set_event_handlers(switch_channel *channel, const struct switch_event_handler_table *event_handlers)
|
||||||
const struct switch_event_handler_table *event_handlers)
|
|
||||||
{
|
{
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
channel->event_handlers = event_handlers;
|
channel->event_handlers = event_handlers;
|
||||||
|
@ -497,8 +489,7 @@ SWITCH_DECLARE(const struct switch_event_handler_table *) switch_channel_get_eve
|
||||||
return channel->event_handlers;
|
return channel->event_handlers;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel *channel,
|
SWITCH_DECLARE(void) switch_channel_set_caller_extension(switch_channel *channel, switch_caller_extension *caller_extension)
|
||||||
switch_caller_extension *caller_extension)
|
|
||||||
{
|
{
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
channel->caller_extension = caller_extension;
|
channel->caller_extension = caller_extension;
|
||||||
|
@ -518,7 +509,7 @@ SWITCH_DECLARE(switch_status) switch_channel_hangup(switch_channel *channel)
|
||||||
assert(channel != NULL);
|
assert(channel != NULL);
|
||||||
if (channel->state < CS_HANGUP) {
|
if (channel->state < CS_HANGUP) {
|
||||||
channel->state = CS_HANGUP;
|
channel->state = CS_HANGUP;
|
||||||
switch_core_session_signal_state_change(channel->session);
|
switch_core_session_signal_state_change(channel->session);
|
||||||
}
|
}
|
||||||
return channel->state;
|
return channel->state;
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,7 +83,7 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||||
|
|
||||||
*var = *val = NULL;
|
*var = *val = NULL;
|
||||||
|
|
||||||
for (;;) {
|
for(;;) {
|
||||||
cfg->lineno++;
|
cfg->lineno++;
|
||||||
|
|
||||||
if (!fgets(cfg->buf, sizeof(cfg->buf), cfg->file)) {
|
if (!fgets(cfg->buf, sizeof(cfg->buf), cfg->file)) {
|
||||||
|
@ -154,3 +154,6 @@ SWITCH_DECLARE(int) switch_config_next_pair(switch_config *cfg, char **var, char
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -54,10 +54,15 @@ static int switch_console_process(char *cmd)
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
||||||
"\n"
|
"\n"
|
||||||
"Valid Commands:\n\n"
|
"Valid Commands:\n\n"
|
||||||
"version\n" "help - umm yeah..\n" "%sshutdown - stop the program\n\n", perlhelp);
|
"version\n"
|
||||||
|
"help - umm yeah..\n"
|
||||||
|
"%sshutdown - stop the program\n\n",
|
||||||
|
perlhelp
|
||||||
|
);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef EMBED_PERL
|
#ifdef EMBED_PERL
|
||||||
if (!strncmp(cmd, "perl ", 5)) {
|
if (!strncmp(cmd, "perl ", 5)) {
|
||||||
cmd += 5;
|
cmd += 5;
|
||||||
|
@ -66,7 +71,7 @@ static int switch_console_process(char *cmd)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if ((arg = strchr(cmd, '\r')) || (arg = strchr(cmd, '\n'))) {
|
if ((arg = strchr(cmd, '\r')) || (arg=strchr(cmd, '\n'))) {
|
||||||
*arg = '\0';
|
*arg = '\0';
|
||||||
arg = NULL;
|
arg = NULL;
|
||||||
}
|
}
|
||||||
|
@ -74,16 +79,14 @@ static int switch_console_process(char *cmd)
|
||||||
*arg++ = '\0';
|
*arg++ = '\0';
|
||||||
}
|
}
|
||||||
if (switch_api_execute(cmd, arg, retbuf, sizeof(retbuf)) == SWITCH_STATUS_SUCCESS) {
|
if (switch_api_execute(cmd, arg, retbuf, sizeof(retbuf)) == SWITCH_STATUS_SUCCESS) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "",
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE_CLEAN, "API CALL [%s(%s)] output:\n%s\n", cmd, arg ? arg : "", retbuf);
|
||||||
retbuf);
|
|
||||||
} else {
|
} else {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Unknown Command: %s\n", cmd);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Unknown Command: %s\n", cmd);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_console_printf(switch_text_channel channel, char *file, const char *func, int line,
|
SWITCH_DECLARE(void) switch_console_printf(switch_text_channel channel, char *file, const char *func, int line, char *fmt, ...)
|
||||||
char *fmt, ...)
|
|
||||||
{
|
{
|
||||||
char *data;
|
char *data;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
@ -117,18 +120,18 @@ SWITCH_DECLARE(void) switch_console_printf(switch_text_channel channel, char *fi
|
||||||
switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm);
|
switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm);
|
||||||
|
|
||||||
if (channel == SWITCH_CHANNEL_ID_CONSOLE) {
|
if (channel == SWITCH_CHANNEL_ID_CONSOLE) {
|
||||||
fprintf(handle, "[%d] %s %s:%d %s() %s", (int) getpid(), date, filep, line, func, data);
|
fprintf(handle, "[%d] %s %s:%d %s() %s", (int)getpid(), date, filep, line, func, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (channel == SWITCH_CHANNEL_ID_EVENT &&
|
else if (channel == SWITCH_CHANNEL_ID_EVENT &&
|
||||||
switch_event_running() == SWITCH_STATUS_SUCCESS &&
|
switch_event_running() == SWITCH_STATUS_SUCCESS &&
|
||||||
switch_event_create(&event, SWITCH_EVENT_LOG) == SWITCH_STATUS_SUCCESS) {
|
switch_event_create(&event, SWITCH_EVENT_LOG) == SWITCH_STATUS_SUCCESS) {
|
||||||
|
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Data", "%s", data);
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Data", "%s", data);
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-File", "%s", filep);
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-File", "%s", filep);
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Function", "%s", func);
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Function", "%s", func);
|
||||||
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line);
|
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Log-Line", "%d", line);
|
||||||
switch_event_fire(&event);
|
switch_event_fire(&event);
|
||||||
}
|
}
|
||||||
free(data);
|
free(data);
|
||||||
}
|
}
|
||||||
|
@ -158,14 +161,14 @@ SWITCH_DECLARE(void) switch_console_loop(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(&cmd, 0, sizeof(cmd));
|
memset(&cmd, 0, sizeof(cmd));
|
||||||
for (x = 0; sizeof(cmd); x++) {
|
for (x=0; sizeof(cmd) ;x++) {
|
||||||
cmd[x] = getchar();
|
cmd[x] = getchar();
|
||||||
if (cmd[x] == '\n') {
|
if (cmd[x] == '\n') {
|
||||||
cmd[x] = '\0';
|
cmd[x] = '\0';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (cmd[0]) {
|
if(cmd[0]) {
|
||||||
running = switch_console_process(cmd);
|
running = switch_console_process(cmd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -31,7 +31,7 @@
|
||||||
*/
|
*/
|
||||||
#include <switch_event.h>
|
#include <switch_event.h>
|
||||||
|
|
||||||
static switch_event_node *EVENT_NODES[SWITCH_EVENT_ALL + 1] = { NULL };
|
static switch_event_node *EVENT_NODES[SWITCH_EVENT_ALL+1] = {NULL};
|
||||||
static switch_mutex_t *BLOCK = NULL;
|
static switch_mutex_t *BLOCK = NULL;
|
||||||
static switch_mutex_t *POOL_LOCK = NULL;
|
static switch_mutex_t *POOL_LOCK = NULL;
|
||||||
static switch_memory_pool *RUNTIME_POOL = NULL;
|
static switch_memory_pool *RUNTIME_POOL = NULL;
|
||||||
|
@ -59,10 +59,10 @@ static void *locked_alloc(size_t len)
|
||||||
void *mem;
|
void *mem;
|
||||||
|
|
||||||
switch_mutex_lock(POOL_LOCK);
|
switch_mutex_lock(POOL_LOCK);
|
||||||
/* <LOCKED> ----------------------------------------------- */
|
/* <LOCKED> -----------------------------------------------*/
|
||||||
mem = switch_core_alloc(THRUNTIME_POOL, len);
|
mem = switch_core_alloc(THRUNTIME_POOL, len);
|
||||||
switch_mutex_unlock(POOL_LOCK);
|
switch_mutex_unlock(POOL_LOCK);
|
||||||
/* </LOCKED> ---------------------------------------------- */
|
/* </LOCKED> ----------------------------------------------*/
|
||||||
|
|
||||||
return mem;
|
return mem;
|
||||||
}
|
}
|
||||||
|
@ -72,14 +72,13 @@ static void *locked_dup(char *str)
|
||||||
char *dup;
|
char *dup;
|
||||||
|
|
||||||
switch_mutex_lock(POOL_LOCK);
|
switch_mutex_lock(POOL_LOCK);
|
||||||
/* <LOCKED> ----------------------------------------------- */
|
/* <LOCKED> -----------------------------------------------*/
|
||||||
dup = switch_core_strdup(THRUNTIME_POOL, str);
|
dup = switch_core_strdup(THRUNTIME_POOL, str);
|
||||||
switch_mutex_unlock(POOL_LOCK);
|
switch_mutex_unlock(POOL_LOCK);
|
||||||
/* </LOCKED> ---------------------------------------------- */
|
/* </LOCKED> ----------------------------------------------*/
|
||||||
|
|
||||||
return dup;
|
return dup;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ALLOC(size) locked_alloc(size)
|
#define ALLOC(size) locked_alloc(size)
|
||||||
#define DUP(str) locked_dup(str)
|
#define DUP(str) locked_dup(str)
|
||||||
#endif
|
#endif
|
||||||
|
@ -140,7 +139,7 @@ static int switch_events_match(switch_event *event, switch_event_node *node)
|
||||||
return match;
|
return match;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void *obj)
|
static void * SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void *obj)
|
||||||
{
|
{
|
||||||
switch_event_node *node;
|
switch_event_node *node;
|
||||||
switch_event *out_event = NULL;
|
switch_event *out_event = NULL;
|
||||||
|
@ -150,11 +149,11 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void
|
||||||
assert(POOL_LOCK != NULL);
|
assert(POOL_LOCK != NULL);
|
||||||
assert(RUNTIME_POOL != NULL);
|
assert(RUNTIME_POOL != NULL);
|
||||||
THREAD_RUNNING = 1;
|
THREAD_RUNNING = 1;
|
||||||
while (THREAD_RUNNING == 1 || switch_queue_size(EVENT_QUEUE)) {
|
while(THREAD_RUNNING == 1 || switch_queue_size(EVENT_QUEUE)) {
|
||||||
|
|
||||||
#ifdef MALLOC_EVENTS
|
#ifdef MALLOC_EVENTS
|
||||||
switch_mutex_lock(POOL_LOCK);
|
switch_mutex_lock(POOL_LOCK);
|
||||||
/* <LOCKED> ----------------------------------------------- */
|
/* <LOCKED> -----------------------------------------------*/
|
||||||
if (POOL_COUNT >= POOL_COUNT_MAX) {
|
if (POOL_COUNT >= POOL_COUNT_MAX) {
|
||||||
if (THRUNTIME_POOL == APOOL) {
|
if (THRUNTIME_POOL == APOOL) {
|
||||||
THRUNTIME_POOL = BPOOL;
|
THRUNTIME_POOL = BPOOL;
|
||||||
|
@ -165,14 +164,14 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void
|
||||||
POOL_COUNT = 0;
|
POOL_COUNT = 0;
|
||||||
}
|
}
|
||||||
switch_mutex_unlock(POOL_LOCK);
|
switch_mutex_unlock(POOL_LOCK);
|
||||||
/* </LOCKED> ----------------------------------------------- */
|
/* </LOCKED> -----------------------------------------------*/
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
while (switch_queue_trypop(EVENT_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
|
while (switch_queue_trypop(EVENT_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
|
||||||
out_event = pop;
|
out_event = pop;
|
||||||
|
|
||||||
for (e = out_event->event_id;; e = SWITCH_EVENT_ALL) {
|
for(e = out_event->event_id;; e = SWITCH_EVENT_ALL) {
|
||||||
for (node = EVENT_NODES[e]; node; node = node->next) {
|
for(node = EVENT_NODES[e]; node; node = node->next) {
|
||||||
if (switch_events_match(out_event, node)) {
|
if (switch_events_match(out_event, node)) {
|
||||||
out_event->bind_user_data = node->user_data;
|
out_event->bind_user_data = node->user_data;
|
||||||
node->callback(out_event);
|
node->callback(out_event);
|
||||||
|
@ -235,7 +234,7 @@ SWITCH_DECLARE(switch_status) switch_event_shutdown(void)
|
||||||
{
|
{
|
||||||
THREAD_RUNNING = -1;
|
THREAD_RUNNING = -1;
|
||||||
|
|
||||||
while (THREAD_RUNNING) {
|
while(THREAD_RUNNING) {
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
}
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
@ -268,26 +267,31 @@ SWITCH_DECLARE(switch_status) switch_event_init(switch_memory_pool *pool)
|
||||||
switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
|
switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
|
||||||
switch_mutex_init(&POOL_LOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
|
switch_mutex_init(&POOL_LOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL);
|
||||||
switch_core_hash_init(&CUSTOM_HASH, RUNTIME_POOL);
|
switch_core_hash_init(&CUSTOM_HASH, RUNTIME_POOL);
|
||||||
switch_thread_create(&thread, thd_attr, switch_event_thread, NULL, RUNTIME_POOL);
|
switch_thread_create(&thread,
|
||||||
|
thd_attr,
|
||||||
|
switch_event_thread,
|
||||||
|
NULL,
|
||||||
|
RUNTIME_POOL
|
||||||
|
);
|
||||||
|
|
||||||
while (!THREAD_RUNNING) {
|
while(!THREAD_RUNNING) {
|
||||||
switch_yield(1000);
|
switch_yield(1000);
|
||||||
}
|
}
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_event_create_subclass(switch_event **event, switch_event_t event_id,
|
SWITCH_DECLARE(switch_status) switch_event_create_subclass(switch_event **event, switch_event_t event_id, char *subclass_name)
|
||||||
char *subclass_name)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) {
|
if (event_id != SWITCH_EVENT_CUSTOM && subclass_name) {
|
||||||
return SWITCH_STATUS_GENERR;
|
return SWITCH_STATUS_GENERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(*event = ALLOC(sizeof(switch_event)))) {
|
if(!(*event = ALLOC(sizeof(switch_event)))) {
|
||||||
return SWITCH_STATUS_MEMERR;
|
return SWITCH_STATUS_MEMERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MALLOC_EVENTS
|
#ifdef MALLOC_EVENTS
|
||||||
memset(*event, 0, sizeof(switch_event));
|
memset(*event, 0, sizeof(switch_event));
|
||||||
#endif
|
#endif
|
||||||
|
@ -305,7 +309,7 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event *event, char *header
|
||||||
{
|
{
|
||||||
switch_event_header *hp;
|
switch_event_header *hp;
|
||||||
if (header_name) {
|
if (header_name) {
|
||||||
for (hp = event->headers; hp; hp = hp->next) {
|
for(hp = event->headers; hp; hp = hp->next) {
|
||||||
if (!strcasecmp(hp->name, header_name)) {
|
if (!strcasecmp(hp->name, header_name)) {
|
||||||
return hp->value;
|
return hp->value;
|
||||||
}
|
}
|
||||||
|
@ -314,8 +318,7 @@ SWITCH_DECLARE(char *) switch_event_get_header(switch_event *event, char *header
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_event_add_header(switch_event *event, switch_stack_t stack, char *header_name,
|
SWITCH_DECLARE(switch_status) switch_event_add_header(switch_event *event, switch_stack_t stack, char *header_name, char *fmt, ...)
|
||||||
char *fmt, ...)
|
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
char data[2048];
|
char data[2048];
|
||||||
|
@ -456,7 +459,7 @@ SWITCH_DECLARE(switch_status) switch_event_serialize(switch_event *event, char *
|
||||||
}
|
}
|
||||||
|
|
||||||
for (hp = event->headers; hp; hp = hp->next) {
|
for (hp = event->headers; hp; hp = hp->next) {
|
||||||
snprintf(buf + len, buflen - len, "%s: %s\n", hp->name, hp->value);
|
snprintf(buf+len, buflen-len, "%s: %s\n", hp->name, hp->value);
|
||||||
len = strlen(buf);
|
len = strlen(buf);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -468,14 +471,14 @@ SWITCH_DECLARE(switch_status) switch_event_serialize(switch_event *event, char *
|
||||||
}
|
}
|
||||||
|
|
||||||
if (body) {
|
if (body) {
|
||||||
int blen = (int) strlen(body);
|
int blen = (int)strlen(body);
|
||||||
if (blen) {
|
if (blen) {
|
||||||
snprintf(buf + len, buflen - len, "Content-Length: %d\n\n%s", blen, body);
|
snprintf(buf+len, buflen-len, "Content-Length: %d\n\n%s", blen, body);
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf + len, buflen - len, "\n");
|
snprintf(buf+len, buflen-len, "\n");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
snprintf(buf + len, buflen - len, "\n");
|
snprintf(buf+len, buflen-len, "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data) {
|
if (data) {
|
||||||
|
@ -486,8 +489,7 @@ SWITCH_DECLARE(switch_status) switch_event_serialize(switch_event *event, char *
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_event_fire_detailed(char *file, char *func, int line, switch_event **event,
|
SWITCH_DECLARE(switch_status) switch_event_fire_detailed(char *file, char *func, int line, switch_event **event, void *user_data)
|
||||||
void *user_data)
|
|
||||||
{
|
{
|
||||||
|
|
||||||
switch_time_exp_t tm;
|
switch_time_exp_t tm;
|
||||||
|
@ -533,8 +535,7 @@ SWITCH_DECLARE(switch_status) switch_event_fire_detailed(char *file, char *func,
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_event_bind(char *id, switch_event_t event, char *subclass_name,
|
SWITCH_DECLARE(switch_status) switch_event_bind(char *id, switch_event_t event, char *subclass_name, switch_event_callback_t callback, void *user_data)
|
||||||
switch_event_callback_t callback, void *user_data)
|
|
||||||
{
|
{
|
||||||
switch_event_node *event_node;
|
switch_event_node *event_node;
|
||||||
switch_event_subclass *subclass = NULL;
|
switch_event_subclass *subclass = NULL;
|
||||||
|
@ -555,7 +556,7 @@ SWITCH_DECLARE(switch_status) switch_event_bind(char *id, switch_event_t event,
|
||||||
|
|
||||||
if (event <= SWITCH_EVENT_ALL && (event_node = switch_core_alloc(RUNTIME_POOL, sizeof(switch_event_node)))) {
|
if (event <= SWITCH_EVENT_ALL && (event_node = switch_core_alloc(RUNTIME_POOL, sizeof(switch_event_node)))) {
|
||||||
switch_mutex_lock(BLOCK);
|
switch_mutex_lock(BLOCK);
|
||||||
/* <LOCKED> ----------------------------------------------- */
|
/* <LOCKED> -----------------------------------------------*/
|
||||||
event_node->id = switch_core_strdup(RUNTIME_POOL, id);
|
event_node->id = switch_core_strdup(RUNTIME_POOL, id);
|
||||||
event_node->event_id = event;
|
event_node->event_id = event;
|
||||||
event_node->subclass = subclass;
|
event_node->subclass = subclass;
|
||||||
|
@ -568,9 +569,10 @@ SWITCH_DECLARE(switch_status) switch_event_bind(char *id, switch_event_t event,
|
||||||
|
|
||||||
EVENT_NODES[event] = event_node;
|
EVENT_NODES[event] = event_node;
|
||||||
switch_mutex_unlock(BLOCK);
|
switch_mutex_unlock(BLOCK);
|
||||||
/* </LOCKED> ----------------------------------------------- */
|
/* </LOCKED> -----------------------------------------------*/
|
||||||
return SWITCH_STATUS_SUCCESS;
|
return SWITCH_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
return SWITCH_STATUS_MEMERR;
|
return SWITCH_STATUS_MEMERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -91,8 +91,7 @@ static void *switch_loadable_module_exec(switch_thread *thread, void *obj)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static switch_status switch_loadable_module_load_file(char *filename, switch_memory_pool *pool,
|
static switch_status switch_loadable_module_load_file(char *filename, switch_memory_pool *pool, switch_loadable_module **new_module)
|
||||||
switch_loadable_module **new_module)
|
|
||||||
{
|
{
|
||||||
switch_loadable_module *module = NULL;
|
switch_loadable_module *module = NULL;
|
||||||
apr_dso_handle_t *dso = NULL;
|
apr_dso_handle_t *dso = NULL;
|
||||||
|
@ -130,7 +129,7 @@ static switch_status switch_loadable_module_load_file(char *filename, switch_mem
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!(module = switch_core_permenant_alloc(sizeof(switch_loadable_module)))) {
|
if (! (module = switch_core_permenant_alloc( sizeof(switch_loadable_module) ))) {
|
||||||
err = "Could not allocate memory\n";
|
err = "Could not allocate memory\n";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -193,7 +192,7 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
|
||||||
char *ptr;
|
char *ptr;
|
||||||
apr_finfo_t finfo;
|
apr_finfo_t finfo;
|
||||||
apr_dir_t *module_dir_handle;
|
apr_dir_t *module_dir_handle;
|
||||||
apr_int32_t finfo_flags = APR_FINFO_DIRENT | APR_FINFO_TYPE | APR_FINFO_NAME;
|
apr_int32_t finfo_flags = APR_FINFO_DIRENT|APR_FINFO_TYPE|APR_FINFO_NAME;
|
||||||
switch_loadable_module *new_module;
|
switch_loadable_module *new_module;
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
const char *ext = ".dll";
|
const char *ext = ".dll";
|
||||||
|
@ -251,7 +250,9 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
|
||||||
const switch_endpoint_interface *ptr;
|
const switch_endpoint_interface *ptr;
|
||||||
for (ptr = new_module->interface->endpoint_interface; ptr; ptr = ptr->next) {
|
for (ptr = new_module->interface->endpoint_interface; ptr; ptr = ptr->next) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Endpoint '%s'\n", ptr->interface_name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Endpoint '%s'\n", ptr->interface_name);
|
||||||
switch_core_hash_insert(loadable_modules.endpoint_hash, (char *) ptr->interface_name, (void *) ptr);
|
switch_core_hash_insert(loadable_modules.endpoint_hash,
|
||||||
|
(char *) ptr->interface_name,
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -259,64 +260,76 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
|
||||||
const switch_codec_implementation *impl;
|
const switch_codec_implementation *impl;
|
||||||
const switch_codec_interface *ptr;
|
const switch_codec_interface *ptr;
|
||||||
|
|
||||||
for (ptr = new_module->interface->codec_interface; ptr; ptr = ptr->next) {
|
for(ptr = new_module->interface->codec_interface; ptr; ptr = ptr->next) {
|
||||||
for (impl = ptr->implementations; impl; impl = impl->next) {
|
for(impl = ptr->implementations; impl ; impl = impl->next) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE,
|
||||||
"Adding Codec '%s' (%s) %dkhz %dms\n",
|
"Adding Codec '%s' (%s) %dkhz %dms\n",
|
||||||
ptr->iananame,
|
ptr->iananame,
|
||||||
ptr->interface_name,
|
ptr->interface_name,
|
||||||
impl->samples_per_second, impl->microseconds_per_frame / 1000);
|
impl->samples_per_second,
|
||||||
|
impl->microseconds_per_frame / 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch_core_hash_insert(loadable_modules.codec_hash, (char *) ptr->iananame, (void *) ptr);
|
switch_core_hash_insert(loadable_modules.codec_hash,
|
||||||
|
(char *) ptr->iananame,
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_module->interface->dialplan_interface) {
|
if (new_module->interface->dialplan_interface) {
|
||||||
const switch_dialplan_interface *ptr;
|
const switch_dialplan_interface *ptr;
|
||||||
|
|
||||||
for (ptr = new_module->interface->dialplan_interface; ptr; ptr = ptr->next) {
|
for(ptr = new_module->interface->dialplan_interface; ptr; ptr = ptr->next) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Dialplan '%s'\n", ptr->interface_name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Dialplan '%s'\n", ptr->interface_name);
|
||||||
switch_core_hash_insert(loadable_modules.dialplan_hash, (char *) ptr->interface_name, (void *) ptr);
|
switch_core_hash_insert(loadable_modules.dialplan_hash,
|
||||||
|
(char *) ptr->interface_name,
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_module->interface->timer_interface) {
|
if (new_module->interface->timer_interface) {
|
||||||
const switch_timer_interface *ptr;
|
const switch_timer_interface *ptr;
|
||||||
|
|
||||||
for (ptr = new_module->interface->timer_interface; ptr; ptr = ptr->next) {
|
for(ptr = new_module->interface->timer_interface; ptr; ptr = ptr->next) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Timer '%s'\n", ptr->interface_name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Timer '%s'\n", ptr->interface_name);
|
||||||
switch_core_hash_insert(loadable_modules.timer_hash, (char *) ptr->interface_name, (void *) ptr);
|
switch_core_hash_insert(loadable_modules.timer_hash,
|
||||||
|
(char *) ptr->interface_name,
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_module->interface->application_interface) {
|
if (new_module->interface->application_interface) {
|
||||||
const switch_application_interface *ptr;
|
const switch_application_interface *ptr;
|
||||||
|
|
||||||
for (ptr = new_module->interface->application_interface; ptr; ptr = ptr->next) {
|
for(ptr = new_module->interface->application_interface; ptr; ptr = ptr->next) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Application '%s'\n", ptr->interface_name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding Application '%s'\n", ptr->interface_name);
|
||||||
switch_core_hash_insert(loadable_modules.application_hash,
|
switch_core_hash_insert(loadable_modules.application_hash,
|
||||||
(char *) ptr->interface_name, (void *) ptr);
|
(char *) ptr->interface_name,
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_module->interface->api_interface) {
|
if (new_module->interface->api_interface) {
|
||||||
const switch_api_interface *ptr;
|
const switch_api_interface *ptr;
|
||||||
|
|
||||||
for (ptr = new_module->interface->api_interface; ptr; ptr = ptr->next) {
|
for(ptr = new_module->interface->api_interface; ptr; ptr = ptr->next) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding API Function '%s'\n", ptr->interface_name);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding API Function '%s'\n", ptr->interface_name);
|
||||||
switch_core_hash_insert(loadable_modules.api_hash, (char *) ptr->interface_name, (void *) ptr);
|
switch_core_hash_insert(loadable_modules.api_hash,
|
||||||
|
(char *) ptr->interface_name,
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_module->interface->file_interface) {
|
if (new_module->interface->file_interface) {
|
||||||
const switch_file_interface *ptr;
|
const switch_file_interface *ptr;
|
||||||
|
|
||||||
for (ptr = new_module->interface->file_interface; ptr; ptr = ptr->next) {
|
for(ptr = new_module->interface->file_interface; ptr; ptr = ptr->next) {
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; ptr->extens[i]; i++) {
|
for (i = 0 ; ptr->extens[i]; i++) {
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding File Format '%s'\n", ptr->extens[i]);
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Adding File Format '%s'\n", ptr->extens[i]);
|
||||||
switch_core_hash_insert(loadable_modules.file_hash, (char *) ptr->extens[i], (void *) ptr);
|
switch_core_hash_insert(loadable_modules.file_hash,
|
||||||
|
(char *) ptr->extens[i],
|
||||||
|
(void *) ptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -331,7 +344,7 @@ SWITCH_DECLARE(switch_status) switch_loadable_module_init()
|
||||||
|
|
||||||
SWITCH_DECLARE(void) switch_loadable_module_shutdown(void)
|
SWITCH_DECLARE(void) switch_loadable_module_shutdown(void)
|
||||||
{
|
{
|
||||||
switch_hash_index_t *hi;
|
switch_hash_index_t* hi;
|
||||||
void *val;
|
void *val;
|
||||||
switch_loadable_module *module;
|
switch_loadable_module *module;
|
||||||
|
|
||||||
|
@ -384,10 +397,9 @@ SWITCH_DECLARE(switch_file_interface *) switch_loadable_module_get_file_interfac
|
||||||
return switch_core_hash_find(loadable_modules.file_hash, name);
|
return switch_core_hash_find(loadable_modules.file_hash, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool *pool, switch_codec_interface **array,
|
SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool *pool, switch_codec_interface **array, int arraylen)
|
||||||
int arraylen)
|
|
||||||
{
|
{
|
||||||
switch_hash_index_t *hi;
|
switch_hash_index_t* hi;
|
||||||
void *val;
|
void *val;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
@ -403,13 +415,12 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(switch_memory_pool *pool,
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool *pool, switch_codec_interface **array,
|
SWITCH_DECLARE(int) switch_loadable_module_get_codecs_sorted(switch_memory_pool *pool, switch_codec_interface **array, int arraylen, char **prefs, int preflen)
|
||||||
int arraylen, char **prefs, int preflen)
|
|
||||||
{
|
{
|
||||||
int x, i = 0;
|
int x, i = 0;
|
||||||
switch_codec_interface *codec_interface;
|
switch_codec_interface *codec_interface;
|
||||||
|
|
||||||
for (x = 0; x < preflen; x++) {
|
for(x = 0; x < preflen; x++) {
|
||||||
if ((codec_interface = switch_loadable_module_get_codec_interface(prefs[x]))) {
|
if ((codec_interface = switch_loadable_module_get_codec_interface(prefs[x]))) {
|
||||||
array[i++] = codec_interface;
|
array[i++] = codec_interface;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,9 @@
|
||||||
*/
|
*/
|
||||||
#include <switch_mutex.h>
|
#include <switch_mutex.h>
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_mutex_init(switch_mutex_t **lock, switch_lock_flag flags, switch_memory_pool *pool)
|
SWITCH_DECLARE(switch_status) switch_mutex_init(switch_mutex_t **lock,
|
||||||
|
switch_lock_flag flags,
|
||||||
|
switch_memory_pool *pool)
|
||||||
{
|
{
|
||||||
|
|
||||||
return (apr_thread_mutex_create(lock, flags, pool) == APR_SUCCESS) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_GENERR;
|
return (apr_thread_mutex_create(lock, flags, pool) == APR_SUCCESS) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_GENERR;
|
||||||
|
@ -56,3 +58,5 @@ SWITCH_DECLARE(switch_status) switch_mutex_trylock(switch_mutex_t *lock)
|
||||||
{
|
{
|
||||||
return apr_thread_mutex_trylock(lock);
|
return apr_thread_mutex_trylock(lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,9 @@
|
||||||
SWITCH_DECLARE(switch_status) switch_resample_create(switch_audio_resampler **new_resampler,
|
SWITCH_DECLARE(switch_status) switch_resample_create(switch_audio_resampler **new_resampler,
|
||||||
int from_rate,
|
int from_rate,
|
||||||
size_t from_size,
|
size_t from_size,
|
||||||
int to_rate, size_t to_size, switch_memory_pool *pool)
|
int to_rate,
|
||||||
|
size_t to_size,
|
||||||
|
switch_memory_pool *pool)
|
||||||
{
|
{
|
||||||
switch_audio_resampler *resampler;
|
switch_audio_resampler *resampler;
|
||||||
|
|
||||||
|
@ -59,11 +61,10 @@ SWITCH_DECLARE(switch_status) switch_resample_create(switch_audio_resampler **ne
|
||||||
|
|
||||||
resampler->from_rate = from_rate;
|
resampler->from_rate = from_rate;
|
||||||
resampler->to_rate = to_rate;
|
resampler->to_rate = to_rate;
|
||||||
resampler->factor = ((double) resampler->to_rate / (double) resampler->from_rate);
|
resampler->factor = ((double)resampler->to_rate / (double)resampler->from_rate);
|
||||||
|
|
||||||
resampler->resampler = resample_open(QUALITY, resampler->factor, resampler->factor);
|
resampler->resampler = resample_open(QUALITY, resampler->factor, resampler->factor);
|
||||||
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Resampler %d->%d %f\n", resampler->from_rate,
|
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Resampler %d->%d %f\n", resampler->from_rate, resampler->to_rate, resampler->factor);
|
||||||
resampler->to_rate, resampler->factor);
|
|
||||||
resampler->from_size = from_size;
|
resampler->from_size = from_size;
|
||||||
resampler->from = (float *) switch_core_alloc(pool, resampler->from_size);
|
resampler->from = (float *) switch_core_alloc(pool, resampler->from_size);
|
||||||
resampler->to_size = to_size;
|
resampler->to_size = to_size;
|
||||||
|
@ -74,16 +75,14 @@ SWITCH_DECLARE(switch_status) switch_resample_create(switch_audio_resampler **ne
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_resample_process(switch_audio_resampler *resampler, float *src, int srclen, float *dst,
|
SWITCH_DECLARE(int) switch_resample_process(switch_audio_resampler *resampler, float *src, int srclen, float *dst, int dstlen, int last)
|
||||||
int dstlen, int last)
|
|
||||||
{
|
{
|
||||||
int o = 0, srcused = 0, srcpos = 0, out = 0;
|
int o=0, srcused=0, srcpos=0, out=0;
|
||||||
|
|
||||||
for (;;) {
|
for(;;) {
|
||||||
int srcBlock = MIN(srclen - srcpos, srclen);
|
int srcBlock = MIN(srclen-srcpos, srclen);
|
||||||
int lastFlag = (last && (srcBlock == srclen - srcpos));
|
int lastFlag = (last && (srcBlock == srclen-srcpos));
|
||||||
o = resample_process(resampler->resampler, resampler->factor, &src[srcpos], srcBlock, lastFlag, &srcused,
|
o = resample_process(resampler->resampler, resampler->factor, &src[srcpos], srcBlock, lastFlag, &srcused, &dst[out], dstlen-out);
|
||||||
&dst[out], dstlen - out);
|
|
||||||
//printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor);
|
//printf("resampling %d/%d (%d) %d %f\n", srcpos, srclen, MIN(dstlen-out, dstlen), srcused, factor);
|
||||||
|
|
||||||
srcpos += srcused;
|
srcpos += srcused;
|
||||||
|
@ -107,17 +106,15 @@ SWITCH_DECLARE(size_t) switch_float_to_short(float *f, short *s, size_t len)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
float ft;
|
float ft;
|
||||||
for (i = 0; i < len; i++) {
|
for(i=0;i<len;i++) {
|
||||||
ft = f[i] * NORMFACT;
|
ft = f[i] * NORMFACT;
|
||||||
if (ft >= 0) {
|
if(ft >= 0) {
|
||||||
s[i] = (short) (ft + 0.5);
|
s[i] = (short)(ft+0.5);
|
||||||
} else {
|
} else {
|
||||||
s[i] = (short) (ft - 0.5);
|
s[i] = (short)(ft-0.5);
|
||||||
}
|
}
|
||||||
if ((float) s[i] > MAXSAMPLE)
|
if ((float)s[i] > MAXSAMPLE) s[i] = (short)MAXSAMPLE;
|
||||||
s[i] = (short) MAXSAMPLE;
|
if (s[i] < (short)-MAXSAMPLE) s[i] = (short)-MAXSAMPLE;
|
||||||
if (s[i] < (short) -MAXSAMPLE)
|
|
||||||
s[i] = (short) -MAXSAMPLE;
|
|
||||||
}
|
}
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
@ -127,18 +124,16 @@ SWITCH_DECLARE(int) switch_char_to_float(char *c, float *f, int len)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (len % 2) {
|
if (len % 2) {
|
||||||
return (-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 1; i < len; i += 2) {
|
for(i=1;i<len;i+=2) {
|
||||||
f[(int) (i / 2)] = (float) (((c[i]) * 0x100) + c[i - 1]);
|
f[(int)(i/2)] = (float)(((c[i])*0x100) + c[i-1]);
|
||||||
f[(int) (i / 2)] /= NORMFACT;
|
f[(int)(i/2)] /= NORMFACT;
|
||||||
if (f[(int) (i / 2)] > MAXSAMPLE)
|
if (f[(int)(i/2)] > MAXSAMPLE) f[(int)(i/2)] = MAXSAMPLE;
|
||||||
f[(int) (i / 2)] = MAXSAMPLE;
|
if (f[(int)(i/2)] < -MAXSAMPLE) f[(int)(i/2)] = -MAXSAMPLE;
|
||||||
if (f[(int) (i / 2)] < -MAXSAMPLE)
|
|
||||||
f[(int) (i / 2)] = -MAXSAMPLE;
|
|
||||||
}
|
}
|
||||||
return len / 2;
|
return len/2;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_float_to_char(float *f, char *c, int len)
|
SWITCH_DECLARE(int) switch_float_to_char(float *f, char *c, int len)
|
||||||
|
@ -146,25 +141,25 @@ SWITCH_DECLARE(int) switch_float_to_char(float *f, char *c, int len)
|
||||||
int i;
|
int i;
|
||||||
float ft;
|
float ft;
|
||||||
long l;
|
long l;
|
||||||
for (i = 0; i < len; i++) {
|
for(i=0;i<len;i++) {
|
||||||
ft = f[i] * NORMFACT;
|
ft = f[i] * NORMFACT;
|
||||||
if (ft >= 0) {
|
if (ft >= 0) {
|
||||||
l = (long) (ft + 0.5);
|
l = (long)(ft+0.5);
|
||||||
} else {
|
} else {
|
||||||
l = (long) (ft - 0.5);
|
l = (long)(ft-0.5);
|
||||||
}
|
}
|
||||||
c[i * 2] = (unsigned char) ((l) & 0xff);
|
c[i*2] = (unsigned char)((l)&0xff);
|
||||||
c[i * 2 + 1] = (unsigned char) (((l) >> 8) & 0xff);
|
c[i*2+1] = (unsigned char)(((l)>>8)&0xff);
|
||||||
}
|
}
|
||||||
return len * 2;
|
return len*2;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_short_to_float(short *s, float *f, int len)
|
SWITCH_DECLARE(int) switch_short_to_float(short *s, float *f, int len)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
for (i = 0; i < len; i++) {
|
for(i=0;i<len;i++) {
|
||||||
f[i] = (float) (s[i]) / NORMFACT;
|
f[i] = (float)(s[i]) / NORMFACT;
|
||||||
//f[i] = (float) s[i];
|
//f[i] = (float) s[i];
|
||||||
}
|
}
|
||||||
return len;
|
return len;
|
||||||
|
@ -175,6 +170,6 @@ SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for (i = 0; i < len; i++) {
|
for (i = 0; i < len; i++) {
|
||||||
buf[i] = ((buf[i] >> 8) & 0x00ff) | ((buf[i] << 8) & 0xff00);
|
buf[i] = ((buf[i] >> 8) & 0x00ff) | ((buf[i] << 8) & 0xff00);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,17 +73,16 @@ SWITCH_DECLARE(char *) switch_cut_path(char *in)
|
||||||
char delims[] = "/\\";
|
char delims[] = "/\\";
|
||||||
char *i;
|
char *i;
|
||||||
|
|
||||||
for (i = delims; *i; i++) {
|
for(i = delims; *i; i++) {
|
||||||
p = in;
|
p = in;
|
||||||
while ((p = strchr(p, *i))) {
|
while((p = strchr(p, *i))) {
|
||||||
ret = ++p;
|
ret = ++p;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
SWITCH_DECLARE(switch_status) switch_socket_create_pollfd(switch_pollfd_t *poll, switch_socket_t *sock,
|
SWITCH_DECLARE(switch_status) switch_socket_create_pollfd(switch_pollfd_t *poll, switch_socket_t *sock, unsigned int flags, switch_memory_pool *pool)
|
||||||
unsigned int flags, switch_memory_pool *pool)
|
|
||||||
{
|
{
|
||||||
switch_pollset_t *pollset;
|
switch_pollset_t *pollset;
|
||||||
switch_status status;
|
switch_status status;
|
||||||
|
@ -103,7 +102,7 @@ SWITCH_DECLARE(switch_status) switch_socket_create_pollfd(switch_pollfd_t *poll,
|
||||||
|
|
||||||
SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
|
SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
|
||||||
{
|
{
|
||||||
switch_status status;
|
switch_status status;
|
||||||
int nsds = 0;
|
int nsds = 0;
|
||||||
|
|
||||||
if ((status = switch_poll(poll, 1, &nsds, ms)) != SWITCH_STATUS_SUCCESS) {
|
if ((status = switch_poll(poll, 1, &nsds, ms)) != SWITCH_STATUS_SUCCESS) {
|
||||||
|
@ -118,6 +117,6 @@ SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
|
||||||
void include_me(void)
|
void include_me(void)
|
||||||
{
|
{
|
||||||
apr_socket_shutdown(NULL, 0);
|
apr_socket_shutdown(NULL, 0);
|
||||||
apr_socket_recvfrom(NULL, NULL, 0, NULL, NULL);
|
apr_socket_recvfrom(NULL , NULL, 0, NULL, NULL);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue