<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17208] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17208">17208</a></dd>
<dt>Author</dt> <dd>anthony.minessale</dd>
<dt>Date</dt> <dd>2010-04-02 13:52:35 -0500 (Fri, 02 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge branch 'master' of git.freeswitch.org:freeswitch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkgitignore">freeswitch/trunk/.gitignore</a></li>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkbuildswigallsh">freeswitch/trunk/build/swigall.sh</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunklibsgitignore">freeswitch/trunk/libs/.gitignore</a></li>
<li><a href="#freeswitchtrunklibsaprutiltestdataempty">freeswitch/trunk/libs/apr-util/test/data/.empty</a></li>
<li><a href="#freeswitchtrunklibsesljavaclassesempty">freeswitch/trunk/libs/esl/java/classes/.empty</a></li>
<li><a href="#freeswitchtrunklibsfreetdmMakefileam">freeswitch/trunk/libs/freetdm/Makefile.am</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubincludeempty">freeswitch/trunk/libs/js/nsprpub/include/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubmacbuildempty">freeswitch/trunk/libs/js/nsprpub/macbuild/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWnsprempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWnsprxempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprdevlempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprdxempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprxempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprxdevlempty">freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubprsrccthreadsempty">freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/.empty</a></li>
<li><a href="#freeswitchtrunklibsjsnsprpubprtestsmacbuildempty">freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/.empty</a></li>
<li><a href="#freeswitchtrunklibsportaudiodochtmlempty">freeswitch/trunk/libs/portaudio/doc/html/.empty</a></li>
<li><a href="#freeswitchtrunklibssofiasipconfigureac">freeswitch/trunk/libs/sofia-sip/configure.ac</a></li>
<li><a href="#freeswitchtrunklibssofiasiplibsofiasipuasofiaam">freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am</a></li>
<li><a href="#freeswitchtrunklibssofiasiprulessofiaam">freeswitch/trunk/libs/sofia-sip/rules/sofia.am</a></li>
<li><a href="#freeswitchtrunklibssqlitearttmpempty">freeswitch/trunk/libs/sqlite/art/tmp/.empty</a></li>
<li><a href="#freeswitchtrunklibssqlitenotesempty">freeswitch/trunk/libs/sqlite/notes/.empty</a></li>
<li><a href="#freeswitchtrunklibssqlitesrcexempty">freeswitch/trunk/libs/sqlite/src/ex/.empty</a></li>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_channelh">freeswitch/trunk/src/include/switch_channel.h</a></li>
<li><a href="#freeswitchtrunksrcmodgitignore">freeswitch/trunk/src/mod/.gitignore</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc">freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_enumMakefileam">freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_portaudioMakefileam">freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyMakefileam">freeswitch/trunk/src/mod/endpoints/mod_skinny/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnyMessagepm">freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh">freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_apic">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_api.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_apih">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_api.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesc">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesh">freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skinnytestskinnypl">freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypopenMakefileam">freeswitch/trunk/src/mod/endpoints/mod_skypopen/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_portaudio_streamMakefileam">freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx">freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs">freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs</a></li>
<li><a href="#freeswitchtrunksrcmodtimersempty">freeswitch/trunk/src/mod/timers/.empty</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunkwebetcempty">freeswitch/trunk/web/etc/.empty</a></li>
<li><a href="#freeswitchtrunkwebplanetempty">freeswitch/trunk/web/planet/.empty</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManageddll">freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.dll</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManagedpdb">freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.pdb</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#freeswitchtrunkbuildswigallsh">freeswitch/trunk/build/swigall.sh</a></li>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc">freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/.gitignore (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/.gitignore 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/.gitignore 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -8,6 +8,28 @@
</span><span class="cx"> .deps
</span><span class="cx"> .\#*
</span><span class="cx"> \#*
</span><ins>+Debug/
+Release/
+All/
+bin/
+*.user
+*.suo
+*.ncb
+*.pdb
+*.map
+*.lib
+*.obj
+*.idb
+*.res
+*.exp
+*.exe
+*.manifest
+*.dep
+*.dll
+BuildLog.htm
+Path
+w32/Library/lastversion
+w32/Library/tmpVersion.Bat
</ins><span class="cx"> .version
</span><span class="cx"> AUTHORS
</span><span class="cx"> COPYING
</span><span class="lines">@@ -17,6 +39,7 @@
</span><span class="cx"> NEWS
</span><span class="cx"> README
</span><span class="cx"> aclocal.m4
</span><ins>+autom4te.cache
</ins><span class="cx"> build/Makefile
</span><span class="cx"> build/Makefile.in
</span><span class="cx"> build/config/compile
</span><span class="lines">@@ -29,9 +52,11 @@
</span><span class="cx"> build/getlib.sh
</span><span class="cx"> build/getsounds.sh
</span><span class="cx"> build/modmake.rules
</span><ins>+config.cache
</ins><span class="cx"> config.log
</span><span class="cx"> config.status
</span><span class="cx"> configure
</span><ins>+configure.lineno
</ins><span class="cx"> freeswitch
</span><span class="cx"> fs_cli
</span><span class="cx"> fs_ivrd
</span></span></pre></div>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -349,7 +349,21 @@
</span><span class="cx"> cat src/include/switch_version.h.in > src/include/switch_version.h ; \
</span><span class="cx"> touch .version ; \
</span><span class="cx"> else \
</span><del>- version=`svnversion . -n || echo hacked` ; \
</del><ins>+ if [ -d .git ] ; then \
+ version=`git log --format="%h %ci" -1 HEAD | head -1 || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="git-$$version" ; \
+ fi ;\
+ else \
+ version=`svnversion . -n || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="svn-$$version" ; \
+ fi ;\
+ fi ; \
</ins><span class="cx"> oldversion=`cat .version 2>/dev/null || echo "0"` ; \
</span><span class="cx"> if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
</span><span class="cx"> cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
</span><span class="lines">@@ -437,23 +451,30 @@
</span><span class="cx"> test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
</span><span class="cx"> test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
</span><span class="cx">
</span><del>-is-svn:
- @if [ ! -d .svn ] ; then \
</del><ins>+is-scm:
+ @if [ ! -d .svn -a ! -d .git ] ; then \
</ins><span class="cx"> echo ; echo ; \
</span><del>- echo "**************************************************************************************************" ; \
- echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \
- echo "**************************************************************************************************" ; \
</del><ins>+ echo "*****************************************************************************************************" ; \
+ echo "You can not update a release tarball or without a git or svn working copy please clone our git tree: " ; \
+ echo "git clone git://git.freeswitch.org/freeswitch.git " ; \
+ echo "or check out our read only svn mirror: " ; \
+ echo "svn checkout http://svn.freeswitch.org/svn/freeswitch/trunk " ; \
+ echo "*****************************************************************************************************" ; \
</ins><span class="cx"> echo ; echo ; \
</span><span class="cx"> exit 1; \
</span><span class="cx"> fi
</span><span class="cx">
</span><del>-update: is-svn
</del><ins>+update: is-scm
</ins><span class="cx"> @if test -d .svn ; then \
</span><span class="cx"> test ! -f .version || rm -f .version ; \
</span><span class="cx"> echo Updating... ; \
</span><span class="cx"> svn update ; \
</span><ins>+ elif test -d .git ; then \
+ test ! -f .version || rm -f .version ; \
+ echo "Pulling updates..." ; \
+ git pull ; \
</ins><span class="cx"> else \
</span><del>- echo "This source directory is not an svn working copy" ; \
</del><ins>+ echo "This source directory is not a git tree or svn working copy" ; \
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> .nodepends:
</span><span class="lines">@@ -483,18 +504,18 @@
</span><span class="cx">
</span><span class="cx"> everything: install
</span><span class="cx">
</span><del>-up: is-svn clean
- svn update
</del><ins>+up: is-scm clean
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) -j core
</span><span class="cx"> $(MAKE) -j modules
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><del>-sync: is-svn
- svn update
</del><ins>+sync: is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><del>-speedy-sync: is-svn
- svn update
</del><ins>+speedy-sync: is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) -j install
</span><span class="cx">
</span><span class="cx"> libs/openzap/Makefile:
</span><span class="lines">@@ -570,15 +591,15 @@
</span><span class="cx"> @echo
</span><span class="cx"> @echo http://www.cluecon.com
</span><span class="cx"> @sleep 5
</span><del>-current: cluecon is-svn update-clean
- svn update
</del><ins>+current: cluecon update-clean is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) all
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><span class="cx"> installall: current
</span><span class="cx">
</span><del>-speedy-current: is-svn update-clean
- svn update
</del><ins>+speedy-current: update-clean is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) speedy-sure
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkbuildswigallsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/swigall.sh (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/swigall.sh 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/build/swigall.sh 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> cd src/mod/languages/mod_lua
</span><span class="cx"> make swigclean
</span><del>-make mod_lua_wrap.cpp
</del><ins>+make lua_wrap
</ins><span class="cx"> cd ../../../..
</span><span class="cx">
</span><span class="cx"> cd src/mod/languages/mod_perl
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/configure.in 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -3,11 +3,11 @@
</span><span class="cx">
</span><span class="cx"> # Must change all of the below together
</span><span class="cx"> # For a release, set revision for that tagged release as well and uncomment
</span><del>-AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS)
</del><ins>+AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS)
</ins><span class="cx"> AC_SUBST(SWITCH_VERSION_MAJOR, [1])
</span><span class="cx"> AC_SUBST(SWITCH_VERSION_MINOR, [0])
</span><del>-AC_SUBST(SWITCH_VERSION_MICRO, [trunk])
-#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
</del><ins>+AC_SUBST(SWITCH_VERSION_MICRO, [head])
+#AC_SUBST(SWITCH_VERSION_REVISION, [])
</ins><span class="cx">
</span><span class="cx"> AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
</span><span class="cx"> AC_CONFIG_FILES([.version:.version.in])
</span></span></pre></div>
<a id="freeswitchtrunklibsgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/.gitignore (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/.gitignore 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/libs/.gitignore 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -189,6 +189,9 @@
</span><span class="cx"> ilbc/src/stamp-h1
</span><span class="cx"> ilbc/tests/Makefile
</span><span class="cx"> ilbc/tests/Makefile.in
</span><ins>+js/nsprpub/lib/ds/libplds4.so.1
+js/nsprpub/lib/libc/src/libplc4.so.1
+js/nsprpub/pr/src/libnspr4.so.1
</ins><span class="cx"> js/Makefile
</span><span class="cx"> js/aclocal.m4
</span><span class="cx"> js/config.guess
</span><span class="lines">@@ -990,3 +993,74 @@
</span><span class="cx"> unimrcp/build/acmacros/ltsugar.m4
</span><span class="cx"> unimrcp/build/acmacros/ltversion.m4
</span><span class="cx"> unimrcp/build/acmacros/lt~obsolete.m4
</span><ins>+*.tar.gz
+celt-0.7.1/
+flite-1.3.99/
+freeradius-client-1.1.6/
+iksemel/test/tst-dom
+iksemel/test/tst-filter
+iksemel/test/tst-iks
+iksemel/test/tst-ikstack
+iksemel/test/tst-jid
+iksemel/test/tst-md5
+iksemel/test/tst-sax
+iksemel/test/tst-sha
+iksemel/tools/ikslint
+iksemel/tools/iksperf
+iksemel/tools/iksroster
+json-c-0.9/
+lame-3.97/
+libmemcached-0.32/
+libshout-2.2.2/
+mpg123/
+openldap-2.4.19/
+pocketsphinx-0.5.99/
+portaudio/bin-stamp
+portaudio/bin/
+portaudio/lib-stamp
+silk/Decoder
+silk/Encoder
+silk/signalCompare
+soundtouch-1.3.1/
+sphinxbase-0.4.99/
+unimrcp/platforms/asr-client/asrclient
+unimrcp/platforms/umc/umc
+unimrcp/platforms/unimrcp-client/unimrcpclient
+unimrcp/platforms/unimrcp-server/unimrcpserver
+yaml/config.h
+yaml/stamp-h1
+yaml/tests/example-deconstructor
+yaml/tests/example-deconstructor-alt
+yaml/tests/example-reformatter
+yaml/tests/example-reformatter-alt
+yaml/tests/run-dumper
+yaml/tests/run-emitter
+yaml/tests/run-loader
+yaml/tests/run-parser
+yaml/tests/run-scanner
+Communicator_semi_40.cd_semi_6000/
+libogg-1.1.3/
+pthreads-w32-2-7-0-release/
+sounds/
+sphinxbase-0.4.99/
+sofia-sip/libsofia-sip-ua/http/http_tag_dll.c
+sofia-sip/libsofia-sip-ua/iptsec/auth_tag_dll.c
+sofia-sip/libsofia-sip-ua/msg/msg_tag_dll.c
+sofia-sip/libsofia-sip-ua/msg/msg_tag_ref.c
+sofia-sip/libsofia-sip-ua/nea/nea_tag_dll.c
+sofia-sip/libsofia-sip-ua/nta/nta_tag_dll.c
+sofia-sip/libsofia-sip-ua/nth/nth_tag_dll.c
+sofia-sip/libsofia-sip-ua/nua/nua_tag_dll.c
+sofia-sip/libsofia-sip-ua/sdp/sdp_tag_dll.c
+sofia-sip/libsofia-sip-ua/sip/sip_tag_dll.c
+sofia-sip/libsofia-sip-ua/soa/soa_tag_dll.c
+sofia-sip/libsofia-sip-ua/stun/stun_tag_dll.c
+sofia-sip/libsofia-sip-ua/su/su_tag_dll.c
+sofia-sip/libsofia-sip-ua/tport/tport_tag_dll.c
+sofia-sip/libsofia-sip-ua/url/url_tag_dll.c
+win32/pcre/pcre_chartables.c
+apr-util/include/apu_config.h
+apr-util/include/apu_select_dbm.h
+include/
+js/nsprpub/pr/include/prcpucfg.h
+apr-util/xml/expat/lib/config.h
</ins></span></pre></div>
<a id="freeswitchtrunklibsaprutiltestdataempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/apr-util/test/data/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/esl/java/classes/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/libs/freetdm/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> #
</span><span class="cx"> # tools & test programs
</span><span class="cx"> #
</span><del>-noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testpri testr2 testanalog testapp testcid
</del><ins>+noinst_PROGRAMS = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid #testisdn
</ins><span class="cx"> if HAVE_SCTP
</span><span class="cx"> noinst_PROGRAMS += testboost
</span><span class="cx"> endif
</span><span class="lines">@@ -131,9 +131,9 @@
</span><span class="cx"> detect_dtmf_LDADD = libfreetdm.la
</span><span class="cx"> detect_dtmf_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</span><span class="cx">
</span><del>-testisdn_SOURCES = $(SRC)/testisdn.c
-testisdn_LDADD = libfreetdm.la
-testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</del><ins>+#testisdn_SOURCES = $(SRC)/testisdn.c
+#testisdn_LDADD = libfreetdm.la
+#testisdn_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> testpri_SOURCES = $(SRC)/testpri.c
</span><span class="cx"> testpri_LDADD = libfreetdm.la
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> #
</span><span class="cx"> # ftmod modules
</span><span class="cx"> #
</span><del>-mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_isdn.la ftmod_analog.la ftmod_analog_em.la
</del><ins>+mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la #ftmod_isdn.la
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> if HAVE_SCTP
</span><span class="lines">@@ -196,32 +196,32 @@
</span><span class="cx"> ftmod_wanpipe_la_LIBADD = $(MYLIB)
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-ftmod_isdn_la_SOURCES = \
-$(SRC)/isdn/EuroISDNStateNT.c \
-$(SRC)/isdn/EuroISDNStateTE.c \
-$(SRC)/isdn/mfifo.c \
-$(SRC)/isdn/Q921.c \
-$(SRC)/isdn/Q931api.c \
-$(SRC)/isdn/Q931.c \
-$(SRC)/isdn/Q931ie.c \
-$(SRC)/isdn/Q931mes.c \
-$(SRC)/isdn/Q931StateNT.c \
-$(SRC)/isdn/Q931StateTE.c \
-$(SRC)/isdn/nationalmes.c \
-$(SRC)/isdn/nationalStateNT.c \
-$(SRC)/isdn/nationalStateTE.c \
-$(SRC)/isdn/DMSmes.c \
-$(SRC)/isdn/DMSStateNT.c \
-$(SRC)/isdn/DMSStateTE.c \
-$(SRC)/isdn/5ESSmes.c \
-$(SRC)/isdn/5ESSStateNT.c \
-$(SRC)/isdn/5ESSStateTE.c \
-$(SRC)/isdn/Q932mes.c \
-$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
</del><ins>+#ftmod_isdn_la_SOURCES = \
+#$(SRC)/isdn/EuroISDNStateNT.c \
+#$(SRC)/isdn/EuroISDNStateTE.c \
+#$(SRC)/isdn/mfifo.c \
+#$(SRC)/isdn/Q921.c \
+#$(SRC)/isdn/Q931api.c \
+#$(SRC)/isdn/Q931.c \
+#$(SRC)/isdn/Q931ie.c \
+#$(SRC)/isdn/Q931mes.c \
+#$(SRC)/isdn/Q931StateNT.c \
+#$(SRC)/isdn/Q931StateTE.c \
+#$(SRC)/isdn/nationalmes.c \
+#$(SRC)/isdn/nationalStateNT.c \
+#$(SRC)/isdn/nationalStateTE.c \
+#$(SRC)/isdn/DMSmes.c \
+#$(SRC)/isdn/DMSStateNT.c \
+#$(SRC)/isdn/DMSStateTE.c \
+#$(SRC)/isdn/5ESSmes.c \
+#$(SRC)/isdn/5ESSStateNT.c \
+#$(SRC)/isdn/5ESSStateTE.c \
+#$(SRC)/isdn/Q932mes.c \
+#$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
</ins><span class="cx">
</span><del>-ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
-ftmod_isdn_la_LIBADD = $(MYLIB)
</del><ins>+#ftmod_isdn_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
+#ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
+#ftmod_isdn_la_LIBADD = $(MYLIB)
</ins><span class="cx">
</span><span class="cx"> ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c
</span><span class="cx"> ftmod_analog_la_CFLAGS = $(AM_CFLAGS) $(MY_CFLAGS)
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubincludeempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/include/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/macbuild/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubpkgsolarisSUNWnsprempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnspr/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWnsprx/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprdevlempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWpr-devl/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprdx/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubpkgsolarisSUNWprxempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pkg/solaris/SUNWprx-devl/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsjsnsprpubprsrccthreadsempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/js/nsprpub/pr/src/cthreads/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/js/nsprpub/pr/tests/macbuild/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibsportaudiodochtmlempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/portaudio/doc/html/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/sofia-sip/configure.ac
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/libs/sofia-sip/configure.ac 2010-04-02 18:52:16 UTC (rev 17207)
</del><ins>+++ freeswitch/trunk/libs/sofia-sip/configure.ac 2010-04-02 18:52:35 UTC (rev 17208)
</ins><span class="lines">@@ -100,14 +100,17 @@
</span><span class="cx"> fi
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+SOFIA_PLAT_CFLAGS=
</ins><span class="cx"> # openbsd seems to not define NULL as a void pointer, I blame standards by committee for this.
</span><span class="cx"> # This is a dirty hack, but shuts up all the warnings
</span><span class="cx"> case "$host" in
</span><del>- *-openbsd*) SOFIA_CFLAGS="$SOFIA_CFLAGS -DNULL='(void *) 0L'";;
</del><ins>+ *-openbsd*) SOFIA_PLAT_CFLAGS="-DNULL='(void *) 0L'";;
</ins><span class="cx"> *) ;;
</span><span class="cx"> esac
</span><span class="cx">
</span><ins>+AC_SUBST(SOFIA_PLAT_CFLAGS, $SOFIA_PLAT_CFLAGS)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> ### checks for header files
</span><span class="cx"> ### -----------------------
</span><span class="cx"> AC_HEADER_STDC
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiplibsofiasipuasofiaam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sofia.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> # common Makefile targets for libsofia-sip-ua modules
</span><span class="cx"> # ---------------------------------------------------
</span><span class="cx">
</span><del>-AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE)
</del><ins>+AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) $(SOFIA_PLAT_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> # Use with --enable-ndebug
</span><span class="cx"> if NDEBUG
</span></span></pre></div>
<a id="freeswitchtrunklibssofiasiprulessofiaam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sofia-sip/rules/sofia.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/sofia-sip/rules/sofia.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/libs/sofia-sip/rules/sofia.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
</span><span class="cx"> sofiabuilddir = ${top_builddir}/libsofia-sip-ua
</span><span class="cx">
</span><del>-AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
</del><ins>+AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> SOFIA_COVERAGE = $(COVERAGE_FLAGS)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunklibssqlitearttmpempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sqlite/art/tmp/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/libs/sqlite/notes/.empty
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunklibssqlitesrcexempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/sqlite/src/ex/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/scripts/tagscript.sh
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/scripts/tagscript.sh 2010-04-02 18:52:16 UTC (rev 17207)
</del><ins>+++ freeswitch/trunk/scripts/tagscript.sh 2010-04-02 18:52:35 UTC (rev 17208)
</ins><span class="lines">@@ -35,11 +35,12 @@
</span><span class="cx"> sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
</span><span class="cx"> -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
</span><span class="cx"> -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
</span><del>- -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
</del><ins>+ -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \
</ins><span class="cx"> -i configure.in
</span><span class="cx">
</span><span class="cx"> if [ -n "$rev" ]; then
</span><del>- sed -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
</del><ins>+ sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
</ins><span class="cx"> -i configure.in
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -61,16 +62,17 @@
</span><span class="cx"> rm -f docs/ChangeLog
</span><span class="cx"> rm -rf .git
</span><span class="cx"> cd ..
</span><del>-tar -czvf $dst_name.tar.gz $dst_dir
-tar -cjvf $dst_name.tar.bz2 $dst_dir
-tar -cJvf $dst_name.tar.xz $dst_dir
-rm -rf $dst_dir
</del><ins>+tar -cvf $dst_name.tar $dst_dir
+gzip -9 -c $dst_name.tar > $dst_name.tar.gz || echo "gzip not available"
+bzip2 -z -k $dst_name.tar || echo "bzip2 not available"
+xz -z -9 -k $dst_name.tar || echo "xz / xz-utils not available"
+rm -rf $dst_name.tar $dst_dir
</ins><span class="cx">
</span><span class="cx"> cat 1>&2 <<EOF
</span><span class="cx"> ----------------------------------------------------------------------
</span><span class="cx"> The v$ver tag has been committed locally, but it will not be
</span><del>-globally visible until you 'git push' this repository up to the server
-(I didn't do that for you).
</del><ins>+globally visible until you 'git push --tags' this repository up to the
+server (I didn't do that for you, as you might want to review first).
</ins><span class="cx"> ----------------------------------------------------------------------
</span><span class="cx"> EOF
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_channelh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_channel.h (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_channel.h 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/include/switch_channel.h 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -245,6 +245,11 @@
</span><span class="cx"> #define switch_channel_set_variable(_channel, _var, _val) switch_channel_set_variable_var_check(_channel, _var, _val, SWITCH_TRUE)
</span><span class="cx"> #define switch_channel_set_variable_partner(_channel, _var, _val) switch_channel_set_variable_partner_var_check(_channel, _var, _val, SWITCH_TRUE)
</span><span class="cx">
</span><ins>+
+SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal);
+
+#define switch_channel_export_variable(_channel, _varname, _value, _nolocal) switch_channel_export_variable_var_check(_channel, _varname, _value, SWITCH_TRUE, _nolocal)
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Retrieve a variable from a given channel
</span><span class="cx"> \param channel channel to retrieve variable from
</span></span></pre></div>
<a id="freeswitchtrunksrcmodgitignore"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/.gitignore (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/.gitignore 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/.gitignore 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -50,3 +50,10 @@
</span><span class="cx"> loggers/mod_syslog/Makefile
</span><span class="cx"> say/mod_say_en/Makefile
</span><span class="cx"> say/mod_say_ru/Makefile
</span><ins>+applications/mod_stress/mod_stress.log
+asr_tts/mod_unimrcp/mod_unimrcp.log
+endpoints/mod_portaudio/mod_portaudio.log
+endpoints/mod_skypopen/mod_skypopen.log
+formats/mod_portaudio_stream/mod_portaudio_stream.log
+languages/mod_java/freeswitch.jar
+languages/mod_managed/freeswitch_wrap.cpp
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_cidlookupmod_cidlookupc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/applications/mod_cidlookup/mod_cidlookup.c 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Rupa Schomaker <rupa@rupa.com>
</span><span class="cx"> *
</span><del>- * mod_cidlookup.c -- API for querying cid->name services
</del><ins>+ * mod_cidlookup.c -- API for querying cid->name services and local data
</ins><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_enumMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/applications/mod_enum/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -2,13 +2,12 @@
</span><span class="cx"> MODNAME=mod_enum
</span><span class="cx">
</span><span class="cx"> UDNS_DIR=$(switch_srcdir)/libs/udns
</span><del>-AM_CFLAGS += -I$(UDNS_DIR) -DHAVE_POLL
</del><ins>+mod_enum_la_CFLAGS = -I$(UDNS_DIR) -DHAVE_POLL $(AM_CFLAGS)
</ins><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_enum.la
</span><span class="cx"> mod_enum_la_SOURCES = mod_enum.c
</span><span class="cx"> mod_enum_la_SOURCES += $(UDNS_DIR)/udns_dn.c $(UDNS_DIR)/udns_dntosp.c $(UDNS_DIR)/udns_parse.c $(UDNS_DIR)/udns_misc.c
</span><span class="cx"> mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_a.c $(UDNS_DIR)/udns_rr_ptr.c $(UDNS_DIR)/udns_rr_mx.c $(UDNS_DIR)/udns_rr_txt.c $(UDNS_DIR)/udns_bl.c
</span><span class="cx"> mod_enum_la_SOURCES += $(UDNS_DIR)/udns_rr_srv.c $(UDNS_DIR)/udns_rr_naptr.c $(UDNS_DIR)/udns_codes.c $(UDNS_DIR)/udns_resolver.c
</span><del>-mod_enum_la_CFLAGS = $(AM_CFLAGS)
</del><span class="cx"> mod_enum_la_LIBADD = $(switch_builddir)/libfreeswitch.la
</span><span class="cx"> mod_enum_la_LDFLAGS = -avoid-version -module -no-undefined -shared
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_portaudioMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_portaudio.la
</span><span class="cx"> mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
</span><del>-mod_portaudio_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1
</del><ins>+mod_portaudio_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 $(AM_CFLAGS)
</ins><span class="cx"> mod_portaudio_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
</span><span class="cx"> mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> MODNAME=mod_skinny
</span><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_skinny.la
</span><del>-mod_skinny_la_SOURCES = mod_skinny.c skinny_protocol.c skinny_tables.c
-mod_skinny_la_CFLAGS = $(AM_CFLAGS) -DSKINNY_SVN_VERSION=\"`cat $(switch_builddir)/.version`\"
</del><ins>+mod_skinny_la_SOURCES = mod_skinny.c skinny_protocol.c skinny_tables.c skinny_api.c
+mod_skinny_la_CFLAGS = $(AM_CFLAGS)
</ins><span class="cx"> mod_skinny_la_LIBADD = $(switch_builddir)/libfreeswitch.la
</span><span class="cx"> mod_skinny_la_LDFLAGS = -avoid-version -module -no-undefined -shared
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyNetSkinnyMessagepm"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -49,7 +49,9 @@
</span><span class="cx"> $parsed_count++;
</span><span class="cx"> }
</span><span class="cx"> if($parsed_count != scalar(keys %{$self->{'data'}})) {
</span><del>- printf "Incomplete message: %d out of %d\n", $parsed_count, scalar(keys %{$self->{'data'}});
</del><ins>+ printf "Incomplete message (type=%s (%X)) %d out of %d\n", Net::Skinny::Protocol::skinny_message_type2str($self->{'type'}), $self->{'type'},
+ $parsed_count, scalar(keys %{$self->{'data'}});
+ print Dumper(@$struct);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> $self->{'socket'}->send_data($self->{'type'}, $raw);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -33,15 +33,14 @@
</span><span class="cx"> #include "mod_skinny.h"
</span><span class="cx"> #include "skinny_protocol.h"
</span><span class="cx"> #include "skinny_tables.h"
</span><ins>+#include "skinny_api.h"
</ins><span class="cx">
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_skinny_load);
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skinny_shutdown);
</span><del>-SWITCH_MODULE_RUNTIME_FUNCTION(mod_skinny_runtime);
</del><span class="cx">
</span><del>-SWITCH_MODULE_DEFINITION(mod_skinny, mod_skinny_load, mod_skinny_shutdown, mod_skinny_runtime);
</del><ins>+SWITCH_MODULE_DEFINITION(mod_skinny, mod_skinny_load, mod_skinny_shutdown, NULL);
</ins><span class="cx">
</span><span class="cx"> switch_endpoint_interface_t *skinny_endpoint_interface;
</span><del>-static switch_memory_pool_t *module_pool = NULL;
</del><span class="cx">
</span><span class="cx"> skinny_globals_t globals;
</span><span class="cx">
</span><span class="lines">@@ -65,6 +64,7 @@
</span><span class="cx"> " device_name VARCHAR(16),\n"
</span><span class="cx"> " device_instance INTEGER,\n"
</span><span class="cx"> " position INTEGER,\n"
</span><ins>+ " line_instance INTEGER,\n"
</ins><span class="cx"> " label VARCHAR(40),\n"
</span><span class="cx"> " value VARCHAR(24),\n"
</span><span class="cx"> " caller_name VARCHAR(44),\n"
</span><span class="lines">@@ -88,10 +88,20 @@
</span><span class="cx"> " settings VARCHAR(44)\n"
</span><span class="cx"> ");\n";
</span><span class="cx">
</span><ins>+static char active_lines_sql[] =
+ "CREATE TABLE skinny_active_lines (\n"
+ " device_name VARCHAR(16),\n"
+ " device_instance INTEGER,\n"
+ " line_instance INTEGER,\n"
+ " channel_uuid VARCHAR(256),\n"
+ " call_id INTEGER,\n"
+ " call_state INTEGER\n"
+ ");\n";
+
</ins><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* PROFILES FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><del>-static switch_status_t dump_profile(const skinny_profile_t *profile, switch_stream_handle_t *stream)
</del><ins>+switch_status_t skinny_profile_dump(const skinny_profile_t *profile, switch_stream_handle_t *stream)
</ins><span class="cx"> {
</span><span class="cx"> const char *line = "=================================================================================================";
</span><span class="cx"> switch_assert(profile);
</span><span class="lines">@@ -120,12 +130,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-static skinny_profile_t *skinny_find_profile(const char *profile_name)
</del><ins>+skinny_profile_t *skinny_find_profile(const char *profile_name)
</ins><span class="cx"> {
</span><del>- return (skinny_profile_t *) switch_core_hash_find(globals.profile_hash, profile_name);
</del><ins>+ skinny_profile_t *profile;
+ switch_mutex_lock(globals.mutex);
+ profile = (skinny_profile_t *) switch_core_hash_find(globals.profile_hash, profile_name);
+ switch_mutex_unlock(globals.mutex);
+ return profile;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t skinny_profile_find_listener_by_device_name(skinny_profile_t *profile, const char *device_name, listener_t **listener)
</del><ins>+switch_status_t skinny_profile_find_listener_by_device_name(skinny_profile_t *profile, const char *device_name, listener_t **listener)
</ins><span class="cx"> {
</span><span class="cx"> switch_mutex_lock(profile->listener_mutex);
</span><span class="cx"> for (listener_t *l = profile->listeners; l; l = l->next) {
</span><span class="lines">@@ -138,48 +152,105 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct skinny_profile_find_listener_helper {
</del><ins>+switch_status_t skinny_profile_find_listener_by_device_name_and_instance(skinny_profile_t *profile, const char *device_name, uint32_t device_instance, listener_t **listener)
+{
+ switch_mutex_lock(profile->listener_mutex);
+ for (listener_t *l = profile->listeners; l; l = l->next) {
+ if (!strcmp(l->device_name, device_name) && (l->device_instance == device_instance)) {
+ *listener = l;
+ }
+ }
+ switch_mutex_unlock(profile->listener_mutex);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+struct skinny_profile_find_session_uuid_helper {
</ins><span class="cx"> skinny_profile_t *profile;
</span><del>- listener_t *listener;
- uint32_t line;
</del><ins>+ char *channel_uuid;
+ uint32_t line_instance;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-static int skinny_profile_find_listener_callback(void *pArg, int argc, char **argv, char **columnNames)
</del><ins>+int skinny_profile_find_session_uuid_callback(void *pArg, int argc, char **argv, char **columnNames)
</ins><span class="cx"> {
</span><del>- struct skinny_profile_find_listener_helper *helper = pArg;
- skinny_profile_t *profile = helper->profile;
- char *device_name = argv[0];
- /* uint32_t position = atoi(argv[1]); */
- uint32_t relative_position = atoi(argv[2]);
</del><ins>+ struct skinny_profile_find_session_uuid_helper *helper = pArg;
</ins><span class="cx">
</span><del>- skinny_profile_find_listener_by_device_name(profile, device_name, &helper->listener);
</del><ins>+ char *channel_uuid = argv[0];
+ uint32_t line_instance = atoi(argv[1]);
</ins><span class="cx">
</span><del>- if(helper->listener) {
- helper->line = relative_position;
</del><ins>+ if(helper->channel_uuid == NULL) {
+ helper->channel_uuid = switch_mprintf("%s", channel_uuid);
+ helper->line_instance = line_instance;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t skinny_profile_find_listener_by_dest(skinny_profile_t *profile, const char *dest, listener_t **l, uint32_t *line)
</del><ins>+char * skinny_profile_find_session_uuid(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id)
</ins><span class="cx"> {
</span><ins>+ struct skinny_profile_find_session_uuid_helper helper = {0};
</ins><span class="cx"> char *sql;
</span><del>- struct skinny_profile_find_listener_helper helper = {0};
</del><ins>+ char *device_condition = NULL;
+ char *line_instance_condition = NULL;
+ char *call_id_condition = NULL;
+
+ switch_assert(profile);
</ins><span class="cx"> helper.profile = profile;
</span><del>-
- if ((sql = switch_mprintf("SELECT device_name, position, "
- "(SELECT count(*) from skinny_lines sl2 "
- "WHERE sl2.device_name= sl1.device_name AND sl2.device_instance= sl1.device_instance AND sl2.position <= sl1.position) AS relative_position "
- "FROM skinny_lines sl1 WHERE value='%s'",
- dest))) {
- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_profile_find_listener_callback, &helper);
</del><ins>+ helper.channel_uuid = NULL;
+
+ if(listener) {
+ device_condition = switch_mprintf("device_name='%s' AND device_instance=%d",
+ listener->device_name, listener->device_instance);
+ } else {
+ device_condition = switch_mprintf("1=1");
+ }
+ switch_assert(device_condition);
+ if(*line_instance_p > 0) {
+ line_instance_condition = switch_mprintf("line_instance=%d", *line_instance_p);
+ } else {
+ line_instance_condition = switch_mprintf("1=1");
+ }
+ switch_assert(line_instance_condition);
+ if(call_id > 0) {
+ call_id_condition = switch_mprintf("call_id=%d", call_id);
+ } else {
+ call_id_condition = switch_mprintf("1=1");
+ }
+ switch_assert(call_id_condition);
+ if((sql = switch_mprintf(
+ "SELECT channel_uuid, line_instance "
+ "FROM skinny_active_lines "
+ "WHERE %s AND %s AND %s "
+ "ORDER BY channel_uuid DESC",
+ device_condition, line_instance_condition, call_id_condition
+ ))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql,
+ skinny_profile_find_session_uuid_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><ins>+ switch_safe_free(device_condition);
+ switch_safe_free(line_instance_condition);
+ switch_safe_free(call_id_condition);
+ *line_instance_p = helper.line_instance;
+ return helper.channel_uuid;
+}
</ins><span class="cx">
</span><ins>+switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id)
+{
+ char *uuid;
+ switch_core_session_t *result = NULL;
+ uuid = skinny_profile_find_session_uuid(profile, listener, line_instance_p, call_id);
</ins><span class="cx">
</span><del>- *line = helper.line;
- *l = helper.listener;
-
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ if(!zstr(uuid)) {
+ result = switch_core_session_locate(uuid);
+ if(!result) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Unable to find session %s on %s:%d, line %d\n",
+ uuid, listener->device_name, listener->device_instance, *line_instance_p);
+ }
+ switch_safe_free(uuid);
+ }
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -262,28 +333,73 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><del>-uint32_t skinny_line_perform_set_state(listener_t *listener, const char *file, const char *func, int line, uint32_t instance, uint32_t state, uint32_t call_id)
</del><ins>+void skinny_line_perform_set_state(const char *file, const char *func, int line, listener_t *listener, uint32_t line_instance, uint32_t call_id, uint32_t call_state)
</ins><span class="cx"> {
</span><ins>+ switch_event_t *event = NULL;
</ins><span class="cx"> switch_assert(listener);
</span><del>-
</del><ins>+
+ skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_CALL_STATE);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Line-Instance", "%d", line_instance);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Call-Id", "%d", call_id);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Call-State", "%d", call_state);
+ switch_event_fire(&event);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG,
</span><del>- "Device %s, line %d State Change %s (%d) -> %s (%d) (no session)\n",
- listener->device_name, instance,
- skinny_soft_key_set2str(listener->line_state[instance]), listener->line_state[instance],
- skinny_soft_key_set2str(state), state);
</del><ins>+ "Device %s:%d, Line %d, Call %d Change State to %s (%d)\n",
+ listener->device_name, listener->device_instance, line_instance, call_id,
+ skinny_call_state2str(call_state), call_state);
+}
</ins><span class="cx">
</span><del>- send_select_soft_keys(listener, instance, call_id, state, 0xffff);
- listener->line_state[instance] = state;
-
- return listener->line_state[instance];
</del><ins>+
+struct skinny_line_get_state_helper {
+ uint32_t call_state;
+};
+
+int skinny_line_get_state_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct skinny_line_get_state_helper *helper = pArg;
+ helper->call_state = atoi(argv[0]);
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance)
</del><ins>+uint32_t skinny_line_get_state(listener_t *listener, uint32_t line_instance, uint32_t call_id)
</ins><span class="cx"> {
</span><ins>+ char *line_instance_condition;
+ char *call_id_condition;
+ char *sql;
+ struct skinny_line_get_state_helper helper = {0};
+
</ins><span class="cx"> switch_assert(listener);
</span><span class="cx">
</span><del>- return listener->line_state[instance];
</del><ins>+ if(line_instance > 0) {
+ line_instance_condition = switch_mprintf("line_instance=%d", line_instance);
+ } else {
+ line_instance_condition = switch_mprintf("1=1");
+ }
+ switch_assert(line_instance_condition);
+ if(call_id > 0) {
+ call_id_condition = switch_mprintf("call_id=%d", call_id);
+ } else {
+ call_id_condition = switch_mprintf("1=1");
+ }
+ switch_assert(call_id_condition);
+
+ if ((sql = switch_mprintf(
+ "SELECT call_state FROM skinny_active_lines "
+ "WHERE device_name='%s' AND device_instance=%d "
+ "AND %s AND %s",
+ listener->device_name, listener->device_instance,
+ line_instance_condition, call_id_condition
+ ))) {
+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_get_state_callback, &helper);
+ switch_safe_free(sql);
+ }
+ switch_safe_free(line_instance_condition);
+ switch_safe_free(call_id_condition);
+
+ return helper.call_state;
</ins><span class="cx"> }
</span><ins>+
+
</ins><span class="cx"> switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force)
</span><span class="cx"> {
</span><span class="cx"> int ms;
</span><span class="lines">@@ -302,11 +418,11 @@
</span><span class="cx"> if (strcasecmp(tech_pvt->read_impl.iananame, tech_pvt->iananame) ||
</span><span class="cx"> tech_pvt->read_impl.samples_per_second != tech_pvt->rm_rate ||
</span><span class="cx"> tech_pvt->codec_ms != (uint32_t)tech_pvt->read_impl.microseconds_per_packet / 1000) {
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Changing Codec from %s@%dms to %s@%dms\n",
</span><span class="cx"> tech_pvt->read_impl.iananame, tech_pvt->read_impl.microseconds_per_packet / 1000,
</span><span class="cx"> tech_pvt->rm_encoding, tech_pvt->codec_ms);
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_core_session_lock_codec_write(tech_pvt->session);
</span><span class="cx"> switch_core_session_lock_codec_read(tech_pvt->session);
</span><span class="cx"> resetting = 1;
</span><span class="lines">@@ -317,7 +433,7 @@
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, end);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (switch_core_codec_init(&tech_pvt->read_codec,
</span><span class="cx"> tech_pvt->iananame,
</span><span class="cx"> tech_pvt->rm_fmtp,
</span><span class="lines">@@ -358,9 +474,7 @@
</span><span class="cx"> tech_pvt->read_impl.microseconds_per_packet,
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet
</span><span class="cx"> ) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_channel_t *channel = NULL;
- channel = switch_core_session_get_channel(tech_pvt->session);
- assert(channel != NULL);
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(tech_pvt->session);
</ins><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="lines">@@ -407,28 +521,19 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line)
</del><ins>+void tech_init(private_t *tech_pvt, skinny_profile_t *profile, switch_core_session_t *session)
</ins><span class="cx"> {
</span><del>- struct line_stat_res_message *button = NULL;
-
</del><span class="cx"> switch_assert(tech_pvt);
</span><span class="cx"> switch_assert(session);
</span><del>- switch_assert(listener);
-
</del><ins>+
</ins><span class="cx"> tech_pvt->read_frame.data = tech_pvt->databuf;
</span><span class="cx"> tech_pvt->read_frame.buflen = sizeof(tech_pvt->databuf);
</span><span class="cx"> switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
</span><span class="cx"> switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
</span><del>- tech_pvt->call_id = listener->profile->next_call_id++;
- tech_pvt->listener = listener;
- tech_pvt->line = line;
</del><ins>+ tech_pvt->call_id = ++profile->next_call_id;
+ tech_pvt->profile = profile;
</ins><span class="cx"> switch_core_session_set_private(session, tech_pvt);
</span><span class="cx"> tech_pvt->session = session;
</span><del>-
- skinny_line_get(listener, line, &button);
- tech_pvt->line_name = switch_core_strdup(listener->pool, button->name);
- tech_pvt->line_shortname = switch_core_strdup(listener->pool, button->shortname);
- tech_pvt->line_displayname = switch_core_strdup(listener->pool, button->displayname);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -438,14 +543,9 @@
</span><span class="cx"> */
</span><span class="cx"> switch_status_t channel_on_init(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
</del><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx">
</span><span class="cx"> /* Move channel's state machine to ROUTING. This means the call is trying
</span><span class="lines">@@ -453,9 +553,6 @@
</span><span class="cx"> where a destination has been identified. If the channel is simply
</span><span class="cx"> left in the initial state, nothing will happen. */
</span><span class="cx"> switch_channel_set_state(channel, CS_ROUTING);
</span><del>- switch_mutex_lock(globals.calls_mutex);
- globals.calls++;
- switch_mutex_unlock(globals.calls_mutex);
</del><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL INIT\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><span class="lines">@@ -464,15 +561,8 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_on_routing(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -480,16 +570,8 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_on_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -498,19 +580,14 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_on_destroy(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
-
</del><span class="cx"> if (tech_pvt) {
</span><span class="cx"> if (switch_core_codec_ready(&tech_pvt->read_codec)) {
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->read_codec);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if (switch_core_codec_ready(&tech_pvt->write_codec)) {
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> }
</span><span class="lines">@@ -521,74 +598,93 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+struct channel_on_hangup_helper {
+ private_t *tech_pvt;
+};
</ins><span class="cx">
</span><del>-switch_status_t channel_on_hangup(switch_core_session_t *session)
</del><ins>+int channel_on_hangup_callback(void *pArg, int argc, char **argv, char **columnNames)
</ins><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ struct channel_on_hangup_helper *helper = pArg;
</ins><span class="cx"> listener_t *listener = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
</del><ins>+ char *device_name = argv[0];
+ uint32_t device_instance = atoi(argv[1]);
+ /* uint32_t position = atoi(argv[2]); */
+ uint32_t line_instance = atoi(argv[3]);
+ /* char *label = argv[4]; */
+ /* char *value = argv[5]; */
+ /* char *caller_name = argv[6]; */
+ /* uint32_t ring_on_idle = atoi(argv[7]); */
+ /* uint32_t ring_on_active = atoi(argv[8]); */
+ /* uint32_t busy_trigger = atoi(argv[9]); */
+ /* char *forward_all = argv[10]; */
+ /* char *forward_busy = argv[11]; */
+ /* char *forward_noanswer = argv[12]; */
+ /* uint32_t noanswer_duration = atoi(argv[13]); */
+ /* char *channel_uuid = argv[14]; */
+ uint32_t call_id = atoi(argv[15]);
+ uint32_t call_state = atoi(argv[16]);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
</del><ins>+ skinny_profile_find_listener_by_device_name_and_instance(helper->tech_pvt->profile, device_name, device_instance, &listener);
+ if(listener) {
+ if(call_state == SKINNY_CONNECTED) {
+ send_stop_tone(listener, line_instance, call_id);
+ }
+ send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_OFF);
+ send_clear_prompt_status(listener, line_instance, call_id);
+ if(call_state == SKINNY_CONNECTED) { /* calling parties */
+ send_close_receive_channel(listener,
+ call_id, /* uint32_t conference_id, */
+ helper->tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
+ call_id /* uint32_t conference_id2, */
+ );
+ send_stop_media_transmission(listener,
+ call_id, /* uint32_t conference_id, */
+ helper->tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
+ call_id /* uint32_t conference_id2, */
+ );
+ }
</ins><span class="cx">
</span><del>- listener = tech_pvt->listener;
- assert(listener != NULL);
-
</del><ins>+ skinny_line_set_state(listener, line_instance, call_id, SKINNY_ON_HOOK);
+ send_select_soft_keys(listener, line_instance, call_id, SKINNY_KEY_SET_ON_HOOK, 0xffff);
+ /* TODO: DefineTimeDate */
+ send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
+ send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, call_id);
+
+ }
+ return 0;
+}
+
+switch_status_t channel_on_hangup(switch_core_session_t *session)
+{
+ struct channel_on_hangup_helper helper = {0};
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
+ char *sql;
+
</ins><span class="cx"> switch_clear_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx"> switch_clear_flag_locked(tech_pvt, TFLAG_VOICE);
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><del>- listener->session[tech_pvt->line] = NULL;
</del><ins>+ helper.tech_pvt= tech_pvt;
</ins><span class="cx">
</span><del>- stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
- set_lamp(listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_OFF);
- clear_prompt_status(listener, tech_pvt->line, tech_pvt->call_id);
-
- if( skinny_line_get_state(tech_pvt->listener, tech_pvt->line) == SKINNY_KEY_SET_CONNECTED ) {
- close_receive_channel(listener,
- tech_pvt->call_id, /* uint32_t conference_id, */
- tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
- tech_pvt->call_id /* uint32_t conference_id2, */
- );
- stop_media_transmission(listener,
- tech_pvt->call_id, /* uint32_t conference_id, */
- tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
- tech_pvt->call_id /* uint32_t conference_id2, */
- );
- switch_mutex_lock(globals.calls_mutex);
- globals.calls--;
- if (globals.calls < 0) {
- globals.calls = 0;
- }
- switch_mutex_unlock(globals.calls_mutex);
</del><ins>+ skinny_session_walk_lines(tech_pvt->profile, switch_core_session_get_uuid(session), channel_on_hangup_callback, &helper);
+ if ((sql = switch_mprintf(
+ "DELETE FROM skinny_active_lines WHERE channel_uuid='%s'",
+ switch_core_session_get_uuid(session)
+ ))) {
+ skinny_execute_sql(tech_pvt->profile, sql, tech_pvt->profile->sql_mutex);
+ switch_safe_free(sql);
</ins><span class="cx"> }
</span><del>- send_call_state(listener,
- SKINNY_ON_HOOK,
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_ON_HOOK, tech_pvt->call_id);
- /* TODO: DefineTimeDate */
- set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_kill_channel(switch_core_session_t *session, int sig)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch (sig) {
</span><span class="cx"> case SWITCH_SIG_KILL:
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><span class="lines">@@ -601,7 +697,7 @@
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL %d\n", switch_channel_get_name(channel), sig);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -631,16 +727,10 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ switch_channel_t *channel = switch_core_session_get_channel(session);
+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx"> int payload = 0;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> while (!(tech_pvt->read_codec.implementation && switch_rtp_ready(tech_pvt->rtp_session))) {
</span><span class="cx"> if (switch_channel_ready(channel)) {
</span><span class="cx"> switch_yield(10000);
</span><span class="lines">@@ -705,17 +795,10 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel = NULL;
- private_t *tech_pvt = NULL;
</del><ins>+ private_t *tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx"> //switch_frame_t *pframe;
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
</del><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> if (!switch_test_flag(tech_pvt, TFLAG_IO)) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -737,31 +820,12 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_answer_channel(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- private_t *tech_pvt;
- switch_channel_t *channel = NULL;
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
-
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg)
</span><span class="cx"> {
</span><del>- switch_channel_t *channel;
- private_t *tech_pvt;
-
- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
-
- tech_pvt = (private_t *) switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> switch (msg->message_id) {
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_ANSWER:
</span><span class="cx"> {
</span><span class="lines">@@ -785,11 +849,10 @@
</span><span class="cx"> switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> switch_core_session_t *nsession = NULL;
</span><span class="cx"> private_t *tech_pvt;
</span><del>-
</del><ins>+
</ins><span class="cx"> char *profile_name, *dest;
</span><span class="cx"> skinny_profile_t *profile = NULL;
</span><del>- listener_t *listener = NULL;
- uint32_t line = 0;
</del><ins>+ char *sql;
</ins><span class="cx"> char name[128];
</span><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> switch_caller_profile_t *caller_profile;
</span><span class="lines">@@ -827,33 +890,14 @@
</span><span class="cx"> cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> snprintf(name, sizeof(name), "SKINNY/%s/%s", profile->name, dest);
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(nsession);
</span><span class="cx"> switch_channel_set_name(channel, name);
</span><del>-
</del><span class="cx">
</span><del>- if ((skinny_profile_find_listener_by_dest(profile, dest, &listener, &line) != SWITCH_STATUS_SUCCESS)) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Problem while retrieving listener and line for destination %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
- goto error;
- }
-
- if (!listener) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid destination or phone not registred %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
- goto error;
- }
</del><ins>+ tech_init(tech_pvt, profile, nsession);
</ins><span class="cx">
</span><del>- if (line == 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid destination or phone not registred %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_UNALLOCATED_NUMBER;
- goto error;
- }
-
- tech_init(tech_pvt, nsession, listener, line);
-
</del><span class="cx"> caller_profile = switch_caller_profile_clone(nsession, outbound_profile);
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="lines">@@ -861,19 +905,23 @@
</span><span class="cx"> switch_channel_set_flag(channel, CF_OUTBOUND);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
</span><span class="cx">
</span><del>- if(tech_pvt->listener->session[tech_pvt->line]) { /* Line is busy */
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Device line is busy %s in profile %s\n", dest, profile_name);
- cause = SWITCH_CAUSE_USER_BUSY;
</del><ins>+ if ((sql = switch_mprintf(
+ "INSERT INTO skinny_active_lines "
+ "(device_name, device_instance, line_instance, channel_uuid, call_id, call_state) "
+ "SELECT device_name, device_instance, line_instance, '%s', %d, %d "
+ "FROM skinny_lines "
+ "WHERE value='%s'",
+ switch_core_session_get_uuid(nsession), tech_pvt->call_id, SKINNY_ON_HOOK, dest
+ ))) {
+ skinny_execute_sql(profile, sql, profile->sql_mutex);
+ switch_safe_free(sql);
+ }
+
+ cause = skinny_ring_lines(tech_pvt);
+
+ if(cause != SWITCH_CAUSE_SUCCESS) {
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><del>- tech_pvt->listener->session[tech_pvt->line] = nsession;
- send_call_state(tech_pvt->listener, SKINNY_RING_IN, tech_pvt->line, tech_pvt->call_id);
- skinny_line_set_state(tech_pvt->listener, tech_pvt->line, SKINNY_KEY_SET_RING_IN, tech_pvt->call_id);
- display_prompt_status(tech_pvt->listener, 0, "\200\027tel", tech_pvt->line, tech_pvt->call_id);
- /* displayprinotifiymessage */
- skinny_send_call_info(nsession);
- set_lamp(tech_pvt->listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_BLINK);
- set_ringer(tech_pvt->listener, SKINNY_RING_OUTSIDE, SKINNY_RING_FOREVER, 0);
</del><span class="cx">
</span><span class="cx"> *new_session = nsession;
</span><span class="cx">
</span><span class="lines">@@ -950,6 +998,15 @@
</span><span class="cx"> /* LISTENER FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><ins>+uint8_t listener_is_ready(listener_t *listener)
+{
+ return globals.running
+ && listener
+ && listener->sock
+ && switch_test_flag(listener, LFLAG_RUNNING)
+ && listener->profile->listener_ready;
+}
+
</ins><span class="cx"> static void add_listener(listener_t *listener)
</span><span class="cx"> {
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="lines">@@ -992,8 +1049,9 @@
</span><span class="cx"> void *val;
</span><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> listener_t *l;
</span><del>-
</del><ins>+
</ins><span class="cx"> /* walk listeners */
</span><ins>+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
</span><span class="cx"> switch_hash_this(hi, NULL, NULL, &val);
</span><span class="cx"> profile = (skinny_profile_t *) val;
</span><span class="lines">@@ -1004,6 +1062,7 @@
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(profile->listener_mutex);
</span><span class="cx"> }
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void flush_listener(listener_t *listener, switch_bool_t flush_log, switch_bool_t flush_events)
</span><span class="lines">@@ -1012,12 +1071,12 @@
</span><span class="cx"> if(!zstr(listener->device_name)) {
</span><span class="cx"> skinny_profile_t *profile = listener->profile;
</span><span class="cx"> char *sql;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "DELETE FROM skinny_devices "
</span><span class="cx"> "WHERE name='%s' and instance=%d",
</span><span class="cx"> listener->device_name, listener->device_instance))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1025,7 +1084,7 @@
</span><span class="cx"> "DELETE FROM skinny_lines "
</span><span class="cx"> "WHERE device_name='%s' and device_instance=%d",
</span><span class="cx"> listener->device_name, listener->device_instance))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1033,7 +1092,7 @@
</span><span class="cx"> "DELETE FROM skinny_buttons "
</span><span class="cx"> "WHERE device_name='%s' and device_instance=%d",
</span><span class="cx"> listener->device_name, listener->device_instance))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1069,12 +1128,13 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream)
</del><ins>+switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream)
</ins><span class="cx"> {
</span><span class="cx"> char *sql;
</span><del>- if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE name LIKE '%s'",
</del><ins>+ if ((sql = switch_mprintf("SELECT name, user_id, instance, ip, type, max_streams, port, codec_string "
+ "FROM skinny_devices WHERE name='%s'",
</ins><span class="cx"> device_name))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, dump_device_callback, stream);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, dump_device_callback, stream);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1120,7 +1180,7 @@
</span><span class="cx"> switch_assert(listener);
</span><span class="cx"> assert(listener->profile);
</span><span class="cx"> profile = listener->profile;
</span><del>-
</del><ins>+
</ins><span class="cx"> listener->expire_time = switch_epoch_time_now(NULL)+profile->keep_alive*110/100;
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1141,9 +1201,9 @@
</span><span class="cx"> switch_mutex_lock(profile->listener_mutex);
</span><span class="cx"> profile->listener_threads++;
</span><span class="cx"> switch_mutex_unlock(profile->listener_mutex);
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_assert(listener != NULL);
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_socket_opt_set(listener->sock, SWITCH_SO_TCP_NODELAY, TRUE);
</span><span class="cx"> switch_socket_opt_set(listener->sock, SWITCH_SO_NONBLOCK, TRUE);
</span><span class="cx">
</span><span class="lines">@@ -1161,7 +1221,7 @@
</span><span class="cx"> add_listener(listener);
</span><span class="cx">
</span><span class="cx">
</span><del>- while (globals.running && switch_test_flag(listener, LFLAG_RUNNING) && profile->listener_ready) {
</del><ins>+ while (listener_is_ready(listener)) {
</ins><span class="cx"> status = skinny_read_packet(listener, &request);
</span><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -1200,6 +1260,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* TODO
</ins><span class="cx"> for(int line = 0 ; line < SKINNY_MAX_BUTTON_COUNT ; line++) {
</span><span class="cx"> if(listener->session[line]) {
</span><span class="cx"> switch_channel_clear_flag(switch_core_session_get_channel(listener->session[line]), CF_CONTROLLED);
</span><span class="lines">@@ -1208,6 +1269,7 @@
</span><span class="cx"> destroy_pool = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ */
</ins><span class="cx"> if(destroy_pool == 0) {
</span><span class="cx"> goto no_destroy_pool;
</span><span class="cx"> }
</span><span class="lines">@@ -1237,25 +1299,26 @@
</span><span class="cx"> switch_thread_create(&thread, thd_attr, listener_run, listener, listener->pool);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int skinny_socket_create_and_bind(skinny_profile_t *profile)
</del><ins>+static void *SWITCH_THREAD_FUNC skinny_profile_run(switch_thread_t *thread, void *obj)
</ins><span class="cx"> {
</span><ins>+ skinny_profile_t *profile = (skinny_profile_t *) obj;
</ins><span class="cx"> switch_status_t rv;
</span><span class="cx"> switch_sockaddr_t *sa;
</span><span class="cx"> switch_socket_t *inbound_socket = NULL;
</span><span class="cx"> listener_t *listener;
</span><del>- switch_memory_pool_t *pool = NULL, *listener_pool = NULL;
</del><ins>+ switch_memory_pool_t *tmp_pool = NULL, *listener_pool = NULL;
</ins><span class="cx"> uint32_t errs = 0;
</span><span class="cx">
</span><del>- if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_core_new_memory_pool(&tmp_pool) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n");
</span><del>- return SWITCH_STATUS_TERM;
</del><ins>+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while(globals.running) {
</span><del>- rv = switch_sockaddr_info_get(&sa, profile->ip, SWITCH_INET, profile->port, 0, pool);
</del><ins>+ rv = switch_sockaddr_info_get(&sa, profile->ip, SWITCH_INET, profile->port, 0, tmp_pool);
</ins><span class="cx"> if (rv)
</span><span class="cx"> goto fail;
</span><del>- rv = switch_socket_create(&profile->sock, switch_sockaddr_get_family(sa), SOCK_STREAM, SWITCH_PROTO_TCP, pool);
</del><ins>+ rv = switch_socket_create(&profile->sock, switch_sockaddr_get_family(sa), SOCK_STREAM, SWITCH_PROTO_TCP, tmp_pool);
</ins><span class="cx"> if (rv)
</span><span class="cx"> goto sock_fail;
</span><span class="cx"> rv = switch_socket_opt_set(profile->sock, SWITCH_SO_REUSEADDR, 1);
</span><span class="lines">@@ -1299,7 +1362,7 @@
</span><span class="cx"> errs = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!(listener = switch_core_alloc(listener_pool, sizeof(*listener)))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n");
</span><span class="cx"> break;
</span><span class="lines">@@ -1325,9 +1388,9 @@
</span><span class="cx"> end:
</span><span class="cx">
</span><span class="cx"> close_socket(&profile->sock, profile);
</span><del>-
- if (pool) {
- switch_core_destroy_memory_pool(&pool);
</del><ins>+
+ if (tmp_pool) {
+ switch_core_destroy_memory_pool(&tmp_pool);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (listener_pool) {
</span><span class="lines">@@ -1336,7 +1399,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> fail:
</span><del>- return SWITCH_STATUS_TERM;
</del><ins>+ return NULL;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -1353,18 +1416,18 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!strcasecmp(var, "domain")) {
</span><del>- profile->domain = switch_core_strdup(module_pool, val);
</del><ins>+ profile->domain = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "ip")) {
</span><del>- profile->ip = switch_core_strdup(module_pool, val);
</del><ins>+ profile->ip = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "dialplan")) {
</span><del>- profile->dialplan = switch_core_strdup(module_pool, val);
</del><ins>+ profile->dialplan = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "context")) {
</span><del>- profile->context = switch_core_strdup(module_pool, val);
</del><ins>+ profile->context = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> } else if (!strcasecmp(var, "date-format")) {
</span><span class="cx"> strncpy(profile->date_format, val, 6);
</span><span class="cx"> } else if (!strcasecmp(var, "odbc-dsn") && !zstr(val)) {
</span><span class="cx"> if (switch_odbc_available()) {
</span><del>- profile->odbc_dsn = switch_core_strdup(module_pool, val);
</del><ins>+ profile->odbc_dsn = switch_core_strdup(profile->pool, val);
</ins><span class="cx"> if ((profile->odbc_user = strchr(profile->odbc_dsn, ':'))) {
</span><span class="cx"> *profile->odbc_user++ = '\0';
</span><span class="cx"> if ((profile->odbc_pass = strchr(profile->odbc_user, ':'))) {
</span><span class="lines">@@ -1382,18 +1445,12 @@
</span><span class="cx"> char *cf = "skinny.conf";
</span><span class="cx"> switch_xml_t xcfg, xml, xprofiles, xprofile;
</span><span class="cx">
</span><del>- memset(&globals, 0, sizeof(globals));
- globals.running = 1;
-
- switch_core_hash_init(&globals.profile_hash, module_pool);
-
- switch_mutex_init(&globals.calls_mutex, SWITCH_MUTEX_NESTED, module_pool);
-
</del><span class="cx"> if (!(xml = switch_xml_open_cfg(cf, &xcfg, NULL))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf);
</span><span class="cx"> return SWITCH_STATUS_TERM;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> if ((xprofiles = switch_xml_child(xcfg, "profiles"))) {
</span><span class="cx"> for (xprofile = switch_xml_child(xprofiles, "profile"); xprofile; xprofile = xprofile->next) {
</span><span class="cx"> char *profile_name = (char *) switch_xml_attr_soft(xprofile, "name");
</span><span class="lines">@@ -1404,14 +1461,23 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (xsettings) {
</span><ins>+ switch_memory_pool_t *profile_pool = NULL;
</ins><span class="cx"> char dbname[256];
</span><span class="cx"> switch_core_db_t *db;
</span><span class="cx"> skinny_profile_t *profile = NULL;
</span><span class="cx"> switch_xml_t param;
</span><del>-
- profile = switch_core_alloc(module_pool, sizeof(skinny_profile_t));
</del><ins>+
+ if (switch_core_new_memory_pool(&profile_pool) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n");
+ return SWITCH_STATUS_TERM;
+ }
+ profile = switch_core_alloc(profile_pool, sizeof(skinny_profile_t));
+ profile->pool = profile_pool;
</ins><span class="cx"> profile->name = profile_name;
</span><del>-
</del><ins>+ switch_mutex_init(&profile->listener_mutex, SWITCH_MUTEX_NESTED, profile->pool);
+ switch_mutex_init(&profile->sql_mutex, SWITCH_MUTEX_NESTED, profile->pool);
+ switch_mutex_init(&profile->sock_mutex, SWITCH_MUTEX_NESTED, profile->pool);
+
</ins><span class="cx"> for (param = switch_xml_child(xsettings, "param"); param; param = param->next) {
</span><span class="cx"> char *var = (char *) switch_xml_attr_soft(param, "name");
</span><span class="cx"> char *val = (char *) switch_xml_attr_soft(param, "value");
</span><span class="lines">@@ -1436,7 +1502,7 @@
</span><span class="cx"> profile->debug = atoi(val);
</span><span class="cx"> }
</span><span class="cx"> } /* param */
</span><del>-
</del><ins>+
</ins><span class="cx"> if (!profile->dialplan) {
</span><span class="cx"> skinny_profile_set(profile, "dialplan","default");
</span><span class="cx"> }
</span><span class="lines">@@ -1450,7 +1516,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_snprintf(dbname, sizeof(dbname), "skinny_%s", profile->name);
</span><del>- profile->dbname = switch_core_strdup(module_pool, dbname);
</del><ins>+ profile->dbname = switch_core_strdup(profile->pool, dbname);
</ins><span class="cx">
</span><span class="cx"> if (switch_odbc_available() && profile->odbc_dsn) {
</span><span class="cx"> if (!(profile->master_odbc = switch_odbc_handle_new(profile->odbc_dsn, profile->odbc_user, profile->odbc_pass))) {
</span><span class="lines">@@ -1467,23 +1533,28 @@
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, devices_sql, NULL, NULL);
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, lines_sql, NULL, NULL);
</span><span class="cx"> switch_odbc_handle_exec(profile->master_odbc, buttons_sql, NULL, NULL);
</span><ins>+ switch_odbc_handle_exec(profile->master_odbc, active_lines_sql, NULL, NULL);
</ins><span class="cx"> } else {
</span><span class="cx"> if ((db = switch_core_db_open_file(profile->dbname))) {
</span><span class="cx"> switch_core_db_test_reactive(db, "SELECT * FROM skinny_devices", NULL, devices_sql);
</span><span class="cx"> switch_core_db_test_reactive(db, "SELECT * FROM skinny_lines", NULL, lines_sql);
</span><span class="cx"> switch_core_db_test_reactive(db, "SELECT * FROM skinny_buttons", NULL, buttons_sql);
</span><ins>+ switch_core_db_test_reactive(db, "SELECT * FROM skinny_active_lines", NULL, active_lines_sql);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot Open SQL Database!\n");
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> switch_core_db_close(db);
</span><span class="cx"> }
</span><del>-
- skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_devices", NULL, NULL);
- skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_lines", NULL, NULL);
- skinny_execute_sql_callback(profile, profile->listener_mutex, "DELETE FROM skinny_buttons", NULL, NULL);
</del><ins>+
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_devices", NULL, NULL);
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_lines", NULL, NULL);
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_buttons", NULL, NULL);
+ skinny_execute_sql_callback(profile, profile->sql_mutex, "DELETE FROM skinny_active_lines", NULL, NULL);
</ins><span class="cx">
</span><del>- switch_core_hash_insert(globals.profile_hash, profile->name, profile);
</del><ins>+ switch_mutex_lock(globals.mutex);
+ switch_core_hash_insert(globals.profile_hash, profile->name, profile);
+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx"> profile = NULL;
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="lines">@@ -1492,506 +1563,180 @@
</span><span class="cx"> } /* profile */
</span><span class="cx"> }
</span><span class="cx"> switch_xml_free(xml);
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t cmd_status_profile(const char *profile_name, switch_stream_handle_t *stream)
</del><ins>+static void event_handler(switch_event_t *event)
</ins><span class="cx"> {
</span><del>- skinny_profile_t *profile;
- if ((profile = skinny_find_profile(profile_name))) {
- dump_profile(profile, stream);
- } else {
- stream->write_function(stream, "Profile not found!\n");
- }
</del><ins>+ char *subclass;
</ins><span class="cx">
</span><del>- return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t cmd_status_profile_device(const char *profile_name, const char *device_name, switch_stream_handle_t *stream)
-{
- skinny_profile_t *profile;
- if ((profile = skinny_find_profile(profile_name))) {
- dump_device(profile, device_name, stream);
- } else {
- stream->write_function(stream, "Profile not found!\n");
- }
-
- return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t cmd_profile_device_send_ringer_message(const char *profile_name, const char *device_name, const char *ring_type, const char *ring_mode, switch_stream_handle_t *stream)
-{
- skinny_profile_t *profile;
-
- if ((profile = skinny_find_profile(profile_name))) {
</del><ins>+ if (event->event_id == SWITCH_EVENT_HEARTBEAT) {
+ walk_listeners(kill_expired_listener, NULL);
+ } else if ((subclass = switch_event_get_header_nil(event, "Event-Subclass")) && !strcasecmp(subclass, SKINNY_EVENT_CALL_STATE)) {
+ char *profile_name = switch_event_get_header_nil(event, "Skinny-Profile-Name");
+ char *device_name = switch_event_get_header_nil(event, "Skinny-Device-Name");
+ uint32_t device_instance = atoi(switch_event_get_header_nil(event, "Skinny-Station-Instance"));
+ uint32_t line_instance = atoi(switch_event_get_header_nil(event, "Skinny-Line-Instance"));
+ uint32_t call_id = atoi(switch_event_get_header_nil(event, "Skinny-Call-Id"));
+ uint32_t call_state = atoi(switch_event_get_header_nil(event, "Skinny-Call-State"));
+ skinny_profile_t *profile;
</ins><span class="cx"> listener_t *listener = NULL;
</span><del>- skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
- if(listener) {
- set_ringer(listener, skinny_str2ring_type(ring_type), skinny_str2ring_mode(ring_mode), 0);
- } else {
- stream->write_function(stream, "Listener not found!\n");
- }
- } else {
- stream->write_function(stream, "Profile not found!\n");
- }
</del><ins>+ char *line_instance_condition, *call_id_condition;
+ char *sql;
</ins><span class="cx">
</span><del>- return SWITCH_STATUS_SUCCESS;
-}
</del><ins>+ if ((profile = skinny_find_profile(profile_name))) {
+ skinny_profile_find_listener_by_device_name_and_instance(profile, device_name, device_instance, &listener);
+ if(listener) {
+ if(line_instance > 0) {
+ line_instance_condition = switch_mprintf("line_instance=%d", line_instance);
+ } else {
+ line_instance_condition = switch_mprintf("1=1");
+ }
+ switch_assert(line_instance_condition);
+ if(call_id > 0) {
+ call_id_condition = switch_mprintf("call_id=%d", call_id);
+ } else {
+ call_id_condition = switch_mprintf("1=1");
+ }
+ switch_assert(call_id_condition);
</ins><span class="cx">
</span><del>-static switch_status_t cmd_profile_device_send_lamp_message(const char *profile_name, const char *device_name, const char *stimulus, const char *instance, const char *lamp_mode, switch_stream_handle_t *stream)
-{
- skinny_profile_t *profile;
-
- if ((profile = skinny_find_profile(profile_name))) {
- listener_t *listener = NULL;
- skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
- if(listener) {
- set_lamp(listener, skinny_str2button(stimulus), atoi(instance), skinny_str2lamp_mode(lamp_mode));
</del><ins>+ if ((sql = switch_mprintf(
+ "UPDATE skinny_active_lines "
+ "SET call_state=%d "
+ "WHERE device_name='%s' AND device_instance=%d "
+ "AND %s AND %s",
+ call_state,
+ listener->device_name, listener->device_instance,
+ line_instance_condition, call_id_condition
+ ))) {
+ skinny_execute_sql(listener->profile, sql, listener->profile->sql_mutex);
+ switch_safe_free(sql);
+ send_call_state(listener, call_state, line_instance, call_id);
+ }
+ switch_safe_free(line_instance_condition);
+ switch_safe_free(call_id_condition);
+ } else {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Device %s:%d in profile '%s' not found.\n", device_name, device_instance, profile_name);
+ }
</ins><span class="cx"> } else {
</span><del>- stream->write_function(stream, "Listener not found!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Profile '%s' not found.\n", profile_name);
</ins><span class="cx"> }
</span><del>- } else {
- stream->write_function(stream, "Profile not found!\n");
</del><span class="cx"> }
</span><del>-
- return SWITCH_STATUS_SUCCESS;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-static switch_status_t cmd_profile_device_send_speaker_mode_message(const char *profile_name, const char *device_name, const char *speaker_mode, switch_stream_handle_t *stream)
-{
- skinny_profile_t *profile;
</del><span class="cx">
</span><del>- if ((profile = skinny_find_profile(profile_name))) {
- listener_t *listener = NULL;
- skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
- if(listener) {
- set_speaker_mode(listener, skinny_str2speaker_mode(speaker_mode));
- } else {
- stream->write_function(stream, "Listener not found!\n");
- }
- } else {
- stream->write_function(stream, "Profile not found!\n");
- }
-
- return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t cmd_profile_device_send_call_state_message(const char *profile_name, const char *device_name, const char *call_state, const char *line_instance, const char *call_id, switch_stream_handle_t *stream)
-{
- skinny_profile_t *profile;
-
- if ((profile = skinny_find_profile(profile_name))) {
- listener_t *listener = NULL;
- skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
- if(listener) {
- send_call_state(listener, skinny_str2call_state(call_state), atoi(line_instance), atoi(call_id));
- } else {
- stream->write_function(stream, "Listener not found!\n");
- }
- } else {
- stream->write_function(stream, "Profile not found!\n");
- }
-
- return SWITCH_STATUS_SUCCESS;
-}
-
-static switch_status_t cmd_profile_device_send_reset_message(const char *profile_name, const char *device_name, const char *reset_type, switch_stream_handle_t *stream)
-{
- skinny_profile_t *profile;
-
- if ((profile = skinny_find_profile(profile_name))) {
- listener_t *listener = NULL;
- skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
- if(listener) {
- send_reset(listener, skinny_str2device_reset_type(reset_type));
- } else {
- stream->write_function(stream, "Listener not found!\n");
- }
- } else {
- stream->write_function(stream, "Profile not found!\n");
- }
-
- return SWITCH_STATUS_SUCCESS;
-}
-
-SWITCH_STANDARD_API(skinny_function)
-{
- char *argv[1024] = { 0 };
- int argc = 0;
- char *mycmd = NULL;
- switch_status_t status = SWITCH_STATUS_SUCCESS;
- const char *usage_string = "USAGE:\n"
- "--------------------------------------------------------------------------------\n"
- "skinny help\n"
- "skinny status profile <profile_name>\n"
- "skinny status profile <profile_name> device <device_name>\n"
- "skinny profile <profile_name> device <device_name> send ResetMessage [DeviceReset|DeviceRestart]\n"
- "skinny profile <profile_name> device <device_name> send SetRingerMessage <ring_type> <ring_mode>\n"
- "skinny profile <profile_name> device <device_name> send SetLampMessage <stimulus> <instance> <lamp_mode>\n"
- "skinny profile <profile_name> device <device_name> send SetSpeakerModeMessage <speaker_mode>\n"
- "skinny profile <profile_name> device <device_name> send CallStateMessage <call_state> <line_instance> <call_id>\n"
- "--------------------------------------------------------------------------------\n";
- if (session) {
- return SWITCH_STATUS_FALSE;
- }
-
- if (zstr(cmd)) {
- stream->write_function(stream, "%s", usage_string);
- goto done;
- }
-
- if (!(mycmd = strdup(cmd))) {
- status = SWITCH_STATUS_MEMERR;
- goto done;
- }
-
- if (!(argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) || !argv[0]) {
- stream->write_function(stream, "%s", usage_string);
- goto done;
- }
-
- if (!strcasecmp(argv[0], "help")) {/* skinny help */
- stream->write_function(stream, "%s", usage_string);
- goto done;
- } else if (argc == 3 && !strcasecmp(argv[0], "status") && !strcasecmp(argv[1], "profile")) {
- /* skinny status profile <profile_name> */
- status = cmd_status_profile(argv[2], stream);
- } else if (argc == 5 && !strcasecmp(argv[0], "status") && !strcasecmp(argv[1], "profile") && !strcasecmp(argv[3], "device")) {
- /* skinny status profile <profile_name> device <device_name> */
- status = cmd_status_profile_device(argv[2], argv[4], stream);
- } else if (argc >= 6 && !strcasecmp(argv[0], "profile") && !strcasecmp(argv[2], "device") && !strcasecmp(argv[4], "send")) {
- /* skinny profile <profile_name> device <device_name> send ... */
- switch(skinny_str2message_type(argv[5])) {
- case SET_RINGER_MESSAGE:
- if(argc == 8) {
- /* SetRingerMessage <ring_type> <ring_mode> */
- status = cmd_profile_device_send_ringer_message(argv[1], argv[3], argv[6], argv[7], stream);
- }
- break;
- case SET_LAMP_MESSAGE:
- if (argc == 9) {
- /* SetLampMessage <stimulus> <instance> <lamp_mode> */
- status = cmd_profile_device_send_lamp_message(argv[1], argv[3], argv[6], argv[7], argv[8], stream);
- }
- break;
- case SET_SPEAKER_MODE_MESSAGE:
- if (argc == 7) {
- /* SetSpeakerModeMessage <speaker_mode> */
- status = cmd_profile_device_send_speaker_mode_message(argv[1], argv[3], argv[6], stream);
- }
- break;
- case CALL_STATE_MESSAGE:
- if (argc == 9) {
- /* CallStateMessage <call_state> <line_instance> <call_id> */
- status = cmd_profile_device_send_call_state_message(argv[1], argv[3], argv[6], argv[7], argv[8], stream);
- }
- break;
- case RESET_MESSAGE:
- if (argc == 7) {
- /* ResetMessage <reset_type> */
- status = cmd_profile_device_send_reset_message(argv[1], argv[3], argv[6], stream);
- }
- break;
- default:
- stream->write_function(stream, "Unhandled message %s\n", argv[5]);
- }
- } else {
- stream->write_function(stream, "Unknown Command [%s]\n", argv[0]);
- }
-
-done:
- switch_safe_free(mycmd);
- return status;
-}
-
-static void event_handler(switch_event_t *event)
-{
- if (event->event_id == SWITCH_EVENT_HEARTBEAT) {
- walk_listeners(kill_expired_listener, NULL);
- }
-}
-
-static switch_status_t skinny_list_profiles(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_console_callback_match_t *my_matches = NULL;
- switch_status_t status = SWITCH_STATUS_FALSE;
- switch_hash_index_t *hi;
- void *val;
- skinny_profile_t *profile;
-
- /* walk profiles */
- for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
- switch_hash_this(hi, NULL, NULL, &val);
- profile = (skinny_profile_t *) val;
-
- switch_console_push_match(&my_matches, profile->name);
- }
-
- if (my_matches) {
- *matches = my_matches;
- status = SWITCH_STATUS_SUCCESS;
- }
-
- return status;
-}
-
-struct match_helper {
- switch_console_callback_match_t *my_matches;
-};
-
-static int skinny_list_devices_callback(void *pArg, int argc, char **argv, char **columnNames)
-{
- struct match_helper *h = (struct match_helper *) pArg;
- char *device_name = argv[0];
-
- switch_console_push_match(&h->my_matches, device_name);
- return 0;
-}
-
-static switch_status_t skinny_list_devices(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- struct match_helper h = { 0 };
- switch_status_t status = SWITCH_STATUS_FALSE;
- skinny_profile_t *profile = NULL;
- char *sql;
-
- char *myline;
- char *argv[1024] = { 0 };
- int argc = 0;
-
- if (!(myline = strdup(line))) {
- status = SWITCH_STATUS_MEMERR;
- return status;
- }
- if (!(argc = switch_separate_string(myline, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) || argc != 5) {
- return status;
- }
-
- if(!strcasecmp(argv[1], "profile")) {/* skinny profile <profile_name> ... */
- profile = skinny_find_profile(argv[2]);
- } else if(!strcasecmp(argv[2], "profile")) {/* skinny status profile <profile_name> ... */
- profile = skinny_find_profile(argv[3]);
- }
-
- if(profile) {
- if ((sql = switch_mprintf("SELECT name FROM skinny_devices"))) {
- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_list_devices_callback, &h);
- switch_safe_free(sql);
- }
- }
-
- if (h.my_matches) {
- *matches = h.my_matches;
- status = SWITCH_STATUS_SUCCESS;
- }
-
- return status;
-}
-
-static switch_status_t skinny_list_reset_types(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_DEVICE_RESET_TYPES
- return status;
-}
-
-static switch_status_t skinny_list_stimuli(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_STIMULI
- return status;
-}
-
-static switch_status_t skinny_list_ring_types(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_RING_TYPES
- return status;
-}
-
-static switch_status_t skinny_list_ring_modes(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_RING_MODES
- return status;
-}
-
-static switch_status_t skinny_list_stimulus_instances(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- switch_console_callback_match_t *my_matches = NULL;
-
- switch_console_push_match(&my_matches, "<stimulus_instance>");
- switch_console_push_match(&my_matches, "0");
-
- if (my_matches) {
- *matches = my_matches;
- status = SWITCH_STATUS_SUCCESS;
- }
- return status;
-}
-
-static switch_status_t skinny_list_stimulus_modes(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_LAMP_MODES
- return status;
-}
-
-static switch_status_t skinny_list_speaker_modes(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_SPEAKER_MODES
- return status;
-}
-
-static switch_status_t skinny_list_call_states(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- SKINNY_PUSH_CALL_STATES
- return status;
-}
-
-static switch_status_t skinny_list_line_instances(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- switch_console_callback_match_t *my_matches = NULL;
-
- /* TODO */
- switch_console_push_match(&my_matches, "1");
- switch_console_push_match(&my_matches, "<line_instance>");
-
- if (my_matches) {
- *matches = my_matches;
- status = SWITCH_STATUS_SUCCESS;
- }
- return status;
-}
-
-static switch_status_t skinny_list_call_ids(const char *line, const char *cursor, switch_console_callback_match_t **matches)
-{
- switch_status_t status = SWITCH_STATUS_FALSE;
- switch_console_callback_match_t *my_matches = NULL;
-
- /* TODO */
- switch_console_push_match(&my_matches, "1345");
- switch_console_push_match(&my_matches, "<call_id>");
-
- if (my_matches) {
- *matches = my_matches;
- status = SWITCH_STATUS_SUCCESS;
- }
- return status;
-}
-
</del><span class="cx"> /*****************************************************************************/
</span><span class="cx"> SWITCH_MODULE_LOAD_FUNCTION(mod_skinny_load)
</span><span class="cx"> {
</span><span class="cx"> switch_hash_index_t *hi;
</span><del>- void *val;
- skinny_profile_t *profile;
</del><ins>+ /* globals init */
+ memset(&globals, 0, sizeof(globals));
</ins><span class="cx">
</span><del>- switch_api_interface_t *api_interface;
</del><ins>+ if (switch_core_new_memory_pool(&globals.pool) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "OH OH no pool\n");
+ return SWITCH_STATUS_TERM;
+ }
+ switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool);
+ switch_core_hash_init(&globals.profile_hash, globals.pool);
+ globals.running = 1;
</ins><span class="cx">
</span><del>- module_pool = pool;
-
</del><span class="cx"> load_skinny_config();
</span><span class="cx">
</span><del>- /* init listeners */
- for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
- switch_hash_this(hi, NULL, NULL, &val);
- profile = (skinny_profile_t *) val;
-
- switch_mutex_init(&profile->listener_mutex, SWITCH_MUTEX_NESTED, module_pool);
- switch_mutex_init(&profile->sock_mutex, SWITCH_MUTEX_NESTED, module_pool);
-
- }
-
</del><ins>+ /* bind to events */
</ins><span class="cx"> if ((switch_event_bind_removable(modname, SWITCH_EVENT_HEARTBEAT, NULL, event_handler, NULL, &globals.heartbeat_node) != SWITCH_STATUS_SUCCESS)) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind our heartbeat handler!\n");
</span><span class="cx"> /* Not such severe to prevent loading */
</span><span class="cx"> }
</span><ins>+ if ((switch_event_bind_removable(modname, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_CALL_STATE, event_handler, NULL, &globals.call_state_node) != SWITCH_STATUS_SUCCESS)) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind our call_state handler!\n");
+ return SWITCH_STATUS_TERM;
+ }
</ins><span class="cx">
</span><ins>+ /* reserve events */
</ins><span class="cx"> if (switch_event_reserve_subclass(SKINNY_EVENT_REGISTER) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_REGISTER);
</span><span class="cx"> return SWITCH_STATUS_TERM;
</span><span class="cx"> }
</span><ins>+ if (switch_event_reserve_subclass(SKINNY_EVENT_UNREGISTER) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_UNREGISTER);
+ return SWITCH_STATUS_TERM;
+ }
+ if (switch_event_reserve_subclass(SKINNY_EVENT_EXPIRE) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_EXPIRE);
+ return SWITCH_STATUS_TERM;
+ }
+ if (switch_event_reserve_subclass(SKINNY_EVENT_ALARM) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_ALARM);
+ return SWITCH_STATUS_TERM;
+ }
+ if (switch_event_reserve_subclass(SKINNY_EVENT_CALL_STATE) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't register subclass %s!\n", SKINNY_EVENT_CALL_STATE);
+ return SWITCH_STATUS_TERM;
+ }
</ins><span class="cx">
</span><span class="cx"> /* connect my internal structure to the blank pointer passed to me */
</span><del>- *module_interface = switch_loadable_module_create_module_interface(pool, modname);
</del><ins>+ *module_interface = switch_loadable_module_create_module_interface(globals.pool, modname);
</ins><span class="cx"> skinny_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE);
</span><span class="cx"> skinny_endpoint_interface->interface_name = "skinny";
</span><span class="cx"> skinny_endpoint_interface->io_routines = &skinny_io_routines;
</span><span class="cx"> skinny_endpoint_interface->state_handler = &skinny_state_handlers;
</span><span class="cx">
</span><ins>+ skinny_api_register(module_interface);
</ins><span class="cx">
</span><del>- SWITCH_ADD_API(api_interface, "skinny", "Skinny Controls", skinny_function, "<cmd> <args>");
- switch_console_set_complete("add skinny help");
</del><ins>+ /* launch listeners */
+ switch_mutex_lock(globals.mutex);
+ for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
+ void *val;
+ skinny_profile_t *profile;
+ switch_thread_t *thread;
+ switch_threadattr_t *thd_attr = NULL;
</ins><span class="cx">
</span><del>- switch_console_set_complete("add skinny status profile ::skinny::list_profiles");
- switch_console_set_complete("add skinny status profile ::skinny::list_profiles device ::skinny::list_devices");
</del><ins>+ switch_hash_this(hi, NULL, NULL, &val);
+ profile = (skinny_profile_t *) val;
</ins><span class="cx">
</span><del>- switch_console_set_complete("add skinny profile ::skinny::list_profiles device ::skinny::list_devices send ResetMessage ::skinny::list_reset_types");
- switch_console_set_complete("add skinny profile ::skinny::list_profiles device ::skinny::list_devices send SetRingerMessage ::skinny::list_ring_types ::skinny::list_ring_modes");
- switch_console_set_complete("add skinny profile ::skinny::list_profiles device ::skinny::list_devices send SetLampMessage ::skinny::list_stimuli ::skinny::list_stimulus_instances ::skinny::list_stimulus_modes");
- switch_console_set_complete("add skinny profile ::skinny::list_profiles device ::skinny::list_devices send SetSpeakerModeMessage ::skinny::list_speaker_modes");
- switch_console_set_complete("add skinny profile ::skinny::list_profiles device ::skinny::list_devices send CallStateMessage ::skinny::list_call_states ::skinny::list_line_instances ::skinny::list_call_ids");
</del><ins>+ switch_threadattr_create(&thd_attr, profile->pool);
+ switch_threadattr_detach_set(thd_attr, 1);
+ switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);
+ switch_thread_create(&thread, thd_attr, skinny_profile_run, profile, profile->pool);
+ }
+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx">
</span><del>- switch_console_add_complete_func("::skinny::list_profiles", skinny_list_profiles);
- switch_console_add_complete_func("::skinny::list_devices", skinny_list_devices);
- switch_console_add_complete_func("::skinny::list_reset_types", skinny_list_reset_types);
- switch_console_add_complete_func("::skinny::list_ring_types", skinny_list_ring_types);
- switch_console_add_complete_func("::skinny::list_ring_modes", skinny_list_ring_modes);
- switch_console_add_complete_func("::skinny::list_stimuli", skinny_list_stimuli);
- switch_console_add_complete_func("::skinny::list_stimulus_instances", skinny_list_stimulus_instances);
- switch_console_add_complete_func("::skinny::list_stimulus_modes", skinny_list_stimulus_modes);
- switch_console_add_complete_func("::skinny::list_speaker_modes", skinny_list_speaker_modes);
- switch_console_add_complete_func("::skinny::list_call_states", skinny_list_call_states);
- switch_console_add_complete_func("::skinny::list_line_instances", skinny_list_line_instances);
- switch_console_add_complete_func("::skinny::list_call_ids", skinny_list_call_ids);
-
</del><span class="cx"> /* indicate that the module should continue to be loaded */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SWITCH_MODULE_RUNTIME_FUNCTION(mod_skinny_runtime)
-{
- switch_status_t status = SWITCH_STATUS_SUCCESS;
- switch_hash_index_t *hi;
- void *val;
- skinny_profile_t *profile;
-
- /* launch listeners */
- for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
- switch_hash_this(hi, NULL, NULL, &val);
- profile = (skinny_profile_t *) val;
-
- status = skinny_socket_create_and_bind(profile);
- if(status != SWITCH_STATUS_SUCCESS) {
- return status;
- }
- }
- return status;
-}
-
</del><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skinny_shutdown)
</span><span class="cx"> {
</span><span class="cx"> switch_hash_index_t *hi;
</span><span class="cx"> void *val;
</span><del>- skinny_profile_t *profile;
</del><ins>+ switch_memory_pool_t *pool = globals.pool;
+ switch_mutex_t *mutex = globals.mutex;
</ins><span class="cx"> int sanity = 0;
</span><span class="cx">
</span><del>- switch_event_free_subclass(SKINNY_EVENT_REGISTER);
</del><ins>+ /* release events */
</ins><span class="cx"> switch_event_unbind(&globals.heartbeat_node);
</span><ins>+ switch_event_unbind(&globals.call_state_node);
+ switch_event_free_subclass(SKINNY_EVENT_REGISTER);
+ switch_event_free_subclass(SKINNY_EVENT_UNREGISTER);
+ switch_event_free_subclass(SKINNY_EVENT_EXPIRE);
+ switch_event_free_subclass(SKINNY_EVENT_ALARM);
+ switch_event_free_subclass(SKINNY_EVENT_CALL_STATE);
</ins><span class="cx">
</span><ins>+ switch_mutex_lock(mutex);
+
</ins><span class="cx"> globals.running = 0;
</span><span class="cx">
</span><span class="cx"> /* kill listeners */
</span><span class="cx"> walk_listeners(kill_listener, NULL);
</span><span class="cx">
</span><span class="cx"> /* close sockets */
</span><ins>+ switch_mutex_lock(globals.mutex);
</ins><span class="cx"> for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) {
</span><ins>+ skinny_profile_t *profile;
</ins><span class="cx"> switch_hash_this(hi, NULL, NULL, &val);
</span><span class="cx"> profile = (skinny_profile_t *) val;
</span><span class="cx">
</span><span class="lines">@@ -2004,8 +1749,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ switch_core_destroy_memory_pool(&profile->pool);
</ins><span class="cx"> }
</span><ins>+ switch_mutex_unlock(globals.mutex);
</ins><span class="cx">
</span><ins>+ switch_core_hash_destroy(&globals.profile_hash);
+ memset(&globals, 0, sizeof(globals));
+ switch_mutex_unlock(mutex);
+ switch_core_destroy_memory_pool(&pool);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnymod_skinnyh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.h 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -42,50 +42,54 @@
</span><span class="cx"> #define SKINNY_EVENT_UNREGISTER "skinny::unregister"
</span><span class="cx"> #define SKINNY_EVENT_EXPIRE "skinny::expire"
</span><span class="cx"> #define SKINNY_EVENT_ALARM "skinny::alarm"
</span><ins>+#define SKINNY_EVENT_CALL_STATE "skinny::call_state"
</ins><span class="cx">
</span><span class="cx"> struct skinny_globals {
</span><del>- /* data */
- int calls;
- switch_mutex_t *calls_mutex;
- switch_hash_t *profile_hash;
- switch_event_node_t *heartbeat_node;
- int running;
</del><ins>+ int running;
+ switch_memory_pool_t *pool;
+ switch_mutex_t *mutex;
+ switch_hash_t *profile_hash;
+ switch_event_node_t *heartbeat_node;
+ switch_event_node_t *call_state_node;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct skinny_globals skinny_globals_t;
</span><span class="cx">
</span><span class="cx"> skinny_globals_t globals;
</span><span class="cx">
</span><span class="cx"> struct skinny_profile {
</span><del>- /* prefs */
- char *name;
- char *domain;
- char *ip;
- unsigned int port;
- char *dialplan;
- char *context;
- uint32_t keep_alive;
- char date_format[6];
- int debug;
- /* db */
- char *dbname;
- char *odbc_dsn;
- char *odbc_user;
- char *odbc_pass;
- switch_odbc_handle_t *master_odbc;
- /* stats */
- uint32_t ib_calls;
- uint32_t ob_calls;
- uint32_t ib_failed_calls;
- uint32_t ob_failed_calls;
- /* listener */
- int listener_threads;
- switch_mutex_t *listener_mutex;
- switch_socket_t *sock;
- switch_mutex_t *sock_mutex;
- struct listener *listeners;
- uint8_t listener_ready;
- /* call id */
- uint32_t next_call_id;
</del><ins>+ /* prefs */
+ char *name;
+ char *domain;
+ char *ip;
+ unsigned int port;
+ char *dialplan;
+ char *context;
+ uint32_t keep_alive;
+ char date_format[6];
+ int debug;
+ /* db */
+ char *dbname;
+ char *odbc_dsn;
+ char *odbc_user;
+ char *odbc_pass;
+ switch_odbc_handle_t *master_odbc;
+ switch_mutex_t *sql_mutex;
+ /* stats */
+ uint32_t ib_calls;
+ uint32_t ob_calls;
+ uint32_t ib_failed_calls;
+ uint32_t ob_failed_calls;
+ /* listener */
+ int listener_threads;
+ switch_mutex_t *listener_mutex;
+ switch_socket_t *sock;
+ switch_mutex_t *sock_mutex;
+ struct listener *listeners;
+ uint8_t listener_ready;
+ /* call id */
+ uint32_t next_call_id;
+ /* others */
+ switch_memory_pool_t *pool;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct skinny_profile skinny_profile_t;
</span><span class="cx">
</span><span class="lines">@@ -95,28 +99,26 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><del>- LFLAG_RUNNING = (1 << 0),
</del><ins>+ LFLAG_RUNNING = (1 << 0),
</ins><span class="cx"> } event_flag_t;
</span><span class="cx">
</span><span class="cx"> #define SKINNY_MAX_LINES 42
</span><span class="cx"> struct listener {
</span><del>- skinny_profile_t *profile;
- char device_name[16];
- uint32_t device_instance;
- switch_core_session_t *session[SKINNY_MAX_LINES];
- uint32_t line_state[SKINNY_MAX_LINES]; /* See enum skinny_key_set */
</del><ins>+ skinny_profile_t *profile;
+ char device_name[16];
+ uint32_t device_instance;
</ins><span class="cx">
</span><del>- switch_socket_t *sock;
- switch_memory_pool_t *pool;
- switch_thread_rwlock_t *rwlock;
- switch_sockaddr_t *sa;
- char remote_ip[50];
- switch_mutex_t *flag_mutex;
- uint32_t flags;
- switch_port_t remote_port;
- uint32_t id;
- time_t expire_time;
- struct listener *next;
</del><ins>+ switch_socket_t *sock;
+ switch_memory_pool_t *pool;
+ switch_thread_rwlock_t *rwlock;
+ switch_sockaddr_t *sa;
+ char remote_ip[50];
+ switch_mutex_t *flag_mutex;
+ uint32_t flags;
+ switch_port_t remote_port;
+ uint32_t id;
+ time_t expire_time;
+ struct listener *next;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct listener listener_t;
</span><span class="lines">@@ -127,83 +129,92 @@
</span><span class="cx"> /* CHANNEL TYPES */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> typedef enum {
</span><del>- TFLAG_IO = (1 << 0),
- TFLAG_INBOUND = (1 << 1),
- TFLAG_OUTBOUND = (1 << 2),
- TFLAG_DTMF = (1 << 3),
- TFLAG_VOICE = (1 << 4),
- TFLAG_HANGUP = (1 << 5),
- TFLAG_LINEAR = (1 << 6),
- TFLAG_CODEC = (1 << 7),
-
- TFLAG_READING = (1 << 9),
- TFLAG_WRITING = (1 << 10)
</del><ins>+ TFLAG_IO = (1 << 0),
+ TFLAG_INBOUND = (1 << 1),
+ TFLAG_OUTBOUND = (1 << 2),
+ TFLAG_DTMF = (1 << 3),
+ TFLAG_VOICE = (1 << 4),
+ TFLAG_HANGUP = (1 << 5),
+ TFLAG_LINEAR = (1 << 6),
+ TFLAG_CODEC = (1 << 7),
+
+ TFLAG_READING = (1 << 9),
+ TFLAG_WRITING = (1 << 10)
</ins><span class="cx"> } TFLAGS;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><del>- GFLAG_MY_CODEC_PREFS = (1 << 0)
</del><ins>+ GFLAG_MY_CODEC_PREFS = (1 << 0)
</ins><span class="cx"> } GFLAGS;
</span><span class="cx">
</span><span class="cx"> struct private_object {
</span><del>- unsigned int flags;
- switch_frame_t read_frame;
- unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
- switch_core_session_t *session;
- switch_caller_profile_t *caller_profile;
- switch_mutex_t *mutex;
- switch_mutex_t *flag_mutex;
- /* identification */
- struct listener *listener;
- uint32_t line;
- uint32_t call_id;
- uint32_t party_id;
- char *line_name;
- char *line_shortname;
- char *line_displayname;
- char dest[10];
- /* codec */
- char *iananame;
- switch_codec_t read_codec;
- switch_codec_t write_codec;
- switch_codec_implementation_t read_impl;
- switch_codec_implementation_t write_impl;
- unsigned long rm_rate;
- uint32_t codec_ms;
- char *rm_encoding;
- char *rm_fmtp;
- switch_payload_t agreed_pt;
- /* RTP */
- switch_rtp_t *rtp_session;
- char *local_sdp_audio_ip;
- switch_port_t local_sdp_audio_port;
- char *remote_sdp_audio_ip;
- switch_port_t remote_sdp_audio_port;
</del><ins>+ unsigned int flags;
+ switch_frame_t read_frame;
+ unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
+ switch_core_session_t *session;
+ switch_caller_profile_t *caller_profile;
+ switch_mutex_t *mutex;
+ switch_mutex_t *flag_mutex;
+ /* identification */
+ uint32_t call_id;
+ uint32_t party_id;
+
+ skinny_profile_t *profile;
+
+ /* codec */
+ char *iananame;
+ switch_codec_t read_codec;
+ switch_codec_t write_codec;
+ switch_codec_implementation_t read_impl;
+ switch_codec_implementation_t write_impl;
+ unsigned long rm_rate;
+ uint32_t codec_ms;
+ char *rm_encoding;
+ char *rm_fmtp;
+ switch_payload_t agreed_pt;
+ /* RTP */
+ switch_rtp_t *rtp_session;
+ char *local_sdp_audio_ip;
+ switch_port_t local_sdp_audio_port;
+ char *remote_sdp_audio_ip;
+ switch_port_t remote_sdp_audio_port;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><ins>+/* PROFILES FUNCTIONS */
+/*****************************************************************************/
+skinny_profile_t *skinny_find_profile(const char *profile_name);
+switch_status_t skinny_profile_dump(const skinny_profile_t *profile, switch_stream_handle_t *stream);
+switch_status_t skinny_profile_find_listener_by_device_name(skinny_profile_t *profile, const char *device_name, listener_t **listener);
+switch_status_t skinny_profile_find_listener_by_device_name_and_instance(skinny_profile_t *profile, const char *device_name, uint32_t device_instance, listener_t **listener);
+char * skinny_profile_find_session_uuid(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
+switch_core_session_t * skinny_profile_find_session(skinny_profile_t *profile, listener_t *listener, uint32_t *line_instance_p, uint32_t call_id);
+switch_status_t dump_device(skinny_profile_t *profile, const char *device_name, switch_stream_handle_t *stream);
+
+/*****************************************************************************/
</ins><span class="cx"> /* SQL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> void skinny_execute_sql(skinny_profile_t *profile, char *sql, switch_mutex_t *mutex);
</span><span class="cx"> switch_bool_t skinny_execute_sql_callback(skinny_profile_t *profile,
</span><del>- switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
</del><ins>+ switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
</ins><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* LISTENER FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><ins>+uint8_t listener_is_ready(listener_t *listener);
</ins><span class="cx"> switch_status_t keepalive_listener(listener_t *listener, void *pvt);
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* CHANNEL FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><del>-uint32_t skinny_line_perform_set_state(listener_t *listener, const char *file, const char *func, int line, uint32_t instance, uint32_t state, uint32_t call_id);
-#define skinny_line_set_state(listener, instance, state, call_id) skinny_line_perform_set_state(listener, __FILE__, __SWITCH_FUNC__, __LINE__, instance, state, call_id)
</del><ins>+void skinny_line_perform_set_state(const char *file, const char *func, int line, listener_t *listener, uint32_t line_instance, uint32_t call_id, uint32_t call_state);
+#define skinny_line_set_state(listener, line_instance, call_id, call_state) skinny_line_perform_set_state(__FILE__, __SWITCH_FUNC__, __LINE__, listener, line_instance, call_id, call_state)
</ins><span class="cx">
</span><del>-uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance);
</del><ins>+uint32_t skinny_line_get_state(listener_t *listener, uint32_t line_instance, uint32_t call_id);
</ins><span class="cx">
</span><span class="cx"> switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force);
</span><del>-void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line);
</del><ins>+void tech_init(private_t *tech_pvt, skinny_profile_t *profile, switch_core_session_t *session);
</ins><span class="cx"> switch_status_t channel_on_init(switch_core_session_t *session);
</span><span class="cx"> switch_status_t channel_on_hangup(switch_core_session_t *session);
</span><span class="cx"> switch_status_t channel_on_destroy(switch_core_session_t *session);
</span><span class="lines">@@ -211,8 +222,8 @@
</span><span class="cx"> switch_status_t channel_on_exchange_media(switch_core_session_t *session);
</span><span class="cx"> switch_status_t channel_on_soft_execute(switch_core_session_t *session);
</span><span class="cx"> switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
</span><del>- switch_caller_profile_t *outbound_profile,
- switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
</del><ins>+ switch_caller_profile_t *outbound_profile,
+ switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
</ins><span class="cx"> switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
</span><span class="cx"> switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
</span><span class="cx"> switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
</span><span class="lines">@@ -224,3 +235,14 @@
</span><span class="cx">
</span><span class="cx"> #endif /* _MOD_SKINNY_H */
</span><span class="cx">
</span><ins>+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_apic"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_api.c ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_api.h
</span><span class="cx">===================================================================
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -141,14 +141,14 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate memory.\n");
</span><span class="cx"> return SWITCH_STATUS_MEMERR;
</span><span class="cx"> }
</span><del>-
- if (!globals.running) {
</del><ins>+
+ if (!listener_is_ready(listener)) {
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ptr = mbuf;
</span><span class="cx">
</span><del>- while (listener->sock && globals.running) {
</del><ins>+ while (listener_is_ready(listener)) {
</ins><span class="cx"> uint8_t do_sleep = 1;
</span><span class="cx"> if(bytes < SKINNY_MESSAGE_FIELD_SIZE) {
</span><span class="cx"> /* We have nothing yet, get length header field */
</span><span class="lines">@@ -159,15 +159,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> status = switch_socket_recv(listener->sock, ptr, &mlen);
</span><del>-
- if (!globals.running || (!SWITCH_STATUS_IS_BREAK(status) && status != SWITCH_STATUS_SUCCESS)) {
</del><ins>+
+ if (!listener_is_ready(listener) || (!SWITCH_STATUS_IS_BREAK(status) && status != SWITCH_STATUS_SUCCESS)) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Socket break.\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if(mlen) {
</span><span class="cx"> bytes += mlen;
</span><del>-
</del><ins>+
</ins><span class="cx"> if(bytes >= SKINNY_MESSAGE_FIELD_SIZE) {
</span><span class="cx"> do_sleep = 0;
</span><span class="cx"> ptr += mlen;
</span><span class="lines">@@ -218,23 +218,25 @@
</span><span class="cx"> {
</span><span class="cx"> switch_event_t *event = (switch_event_t *) pArg;
</span><span class="cx">
</span><del>- char *device_name = argv[0];
- char *user_id = argv[1];
- char *instance = argv[2];
- char *ip = argv[3];
- char *device_type = argv[4];
- char *max_streams = argv[5];
- char *port = argv[6];
- char *codec_string = argv[7];
</del><ins>+ char *profile_name = argv[0];
+ char *device_name = argv[1];
+ char *user_id = argv[2];
+ char *device_instance = argv[3];
+ char *ip = argv[4];
+ char *device_type = argv[5];
+ char *max_streams = argv[6];
+ char *port = argv[7];
+ char *codec_string = argv[8];
</ins><span class="cx">
</span><del>- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Skinny-Device-Name", device_name);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-User-Id", "%s", user_id);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Instance", "%s", instance);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Skinny-IP", ip);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Device-Type", "%s", device_type);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Max-Streams", "%s", max_streams);
- switch_event_add_header( event, SWITCH_STACK_BOTTOM, "Skinny-Port", "%s", port);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Skinny-Codecs", codec_string);
</del><ins>+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Profile-Name", "%s", profile_name);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Device-Name", "%s", device_name);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Station-User-Id", "%s", user_id);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Station-Instance", "%s", device_instance);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-IP-Address", "%s", ip);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Device-Type", "%s", device_type);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Max-Streams", "%s", max_streams);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Port", "%s", port);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Codecs", "%s", codec_string);
</ins><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -249,8 +251,12 @@
</span><span class="cx">
</span><span class="cx"> switch_event_create_subclass(&event, event_id, subclass_name);
</span><span class="cx"> switch_assert(event);
</span><del>- if ((sql = switch_mprintf("SELECT * FROM skinny_devices WHERE name='%s' AND instance=%d", listener->device_name, listener->device_instance))) {
- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_device_event_callback, event);
</del><ins>+ if ((sql = switch_mprintf("SELECT '%s', name, user_id, instance, ip, type, max_streams, port, codec_string "
+ "FROM skinny_devices "
+ "WHERE name='%s' AND instance=%d",
+ listener->profile->name,
+ listener->device_name, listener->device_instance))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_device_event_callback, event);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -259,30 +265,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t skinny_send_call_info(switch_core_session_t *session)
</del><ins>+switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> switch_channel_t *channel;
</span><del>- listener_t *listener;
-
</del><ins>+
</ins><span class="cx"> char calling_party_name[40] = "UNKNOWN";
</span><span class="cx"> char calling_party[24] = "0000000000";
</span><span class="cx"> char called_party_name[40] = "UNKNOWN";
</span><span class="cx"> char called_party[24] = "0000000000";
</span><del>-
</del><ins>+
+ channel = switch_core_session_get_channel(session);
</ins><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><del>- switch_assert(tech_pvt != NULL);
- channel = switch_core_session_get_channel(session);
- switch_assert(channel != NULL);
</del><span class="cx">
</span><del>- listener = tech_pvt->listener;
- switch_assert(listener != NULL);
</del><ins>+ switch_assert(tech_pvt->caller_profile != NULL);
</ins><span class="cx">
</span><del>- switch_assert(tech_pvt->caller_profile != NULL);
-
</del><span class="cx"> if( switch_channel_test_flag(channel, CF_OUTBOUND) ) {
</span><del>- strncpy(calling_party_name, tech_pvt->line_displayname, 40);
- strncpy(calling_party, tech_pvt->line_name, 24);
</del><ins>+ struct line_stat_res_message *button = NULL;
+
+ skinny_line_get(listener, line_instance, &button);
+
+ if (button) {
+ strncpy(calling_party_name, button->displayname, 40);
+ strncpy(calling_party, button->name, 24);
+ }
</ins><span class="cx"> strncpy(called_party_name, tech_pvt->caller_profile->caller_id_name, 40);
</span><span class="cx"> strncpy(called_party, tech_pvt->caller_profile->caller_id_number, 24);
</span><span class="cx"> } else {
</span><span class="lines">@@ -290,12 +296,12 @@
</span><span class="cx"> strncpy(calling_party, tech_pvt->caller_profile->caller_id_number, 24);
</span><span class="cx"> /* TODO called party */
</span><span class="cx"> }
</span><del>- send_call_info(tech_pvt->listener,
</del><ins>+ send_call_info(listener,
</ins><span class="cx"> calling_party_name, /* char calling_party_name[40], */
</span><span class="cx"> calling_party, /* char calling_party[24], */
</span><span class="cx"> called_party_name, /* char called_party_name[40], */
</span><span class="cx"> called_party, /* char called_party[24], */
</span><del>- tech_pvt->line, /* uint32_t line_instance, */
</del><ins>+ line_instance, /* uint32_t line_instance, */
</ins><span class="cx"> tech_pvt->call_id, /* uint32_t call_id, */
</span><span class="cx"> SKINNY_OUTBOUND_CALL, /* uint32_t call_type, */
</span><span class="cx"> "", /* TODO char original_called_party_name[40], */
</span><span class="lines">@@ -316,169 +322,429 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t skinny_create_session(listener_t *listener, uint32_t line, uint32_t to_state)
</del><ins>+switch_status_t skinny_session_walk_lines(skinny_profile_t *profile, char *channel_uuid, switch_core_db_callback_func_t callback, void *data)
</ins><span class="cx"> {
</span><del>- switch_core_session_t *session;
</del><ins>+ char *sql;
+ if ((sql = switch_mprintf(
+ "SELECT skinny_lines.*, channel_uuid, call_id, call_state "
+ "FROM skinny_active_lines "
+ "INNER JOIN skinny_lines "
+ "ON skinny_active_lines.device_name = skinny_lines.device_name "
+ "AND skinny_active_lines.device_instance = skinny_lines.device_instance "
+ "AND skinny_active_lines.line_instance = skinny_lines.line_instance "
+ "WHERE channel_uuid='%s'",
+ channel_uuid))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, callback, data);
+ switch_safe_free(sql);
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t skinny_session_walk_lines_by_call_id(skinny_profile_t *profile, uint32_t call_id, switch_core_db_callback_func_t callback, void *data)
+{
+ char *sql;
+ if ((sql = switch_mprintf(
+ "SELECT skinny_lines.*, channel_uuid, call_id, call_state "
+ "FROM skinny_active_lines "
+ "INNER JOIN skinny_lines "
+ "ON skinny_active_lines.device_name = skinny_lines.device_name "
+ "AND skinny_active_lines.device_instance = skinny_lines.device_instance "
+ "AND skinny_active_lines.line_instance = skinny_lines.line_instance "
+ "WHERE call_id='%d'",
+ call_id))) {
+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, callback, data);
+ switch_safe_free(sql);
+ }
+ return SWITCH_STATUS_SUCCESS;
+}
+
+/*****************************************************************************/
+struct skinny_ring_lines_helper {
+ private_t *tech_pvt;
+ uint32_t lines_count;
+};
+
+int skinny_ring_lines_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct skinny_ring_lines_helper *helper = pArg;
+ char *tmp;
+
+ char *device_name = argv[0];
+ uint32_t device_instance = atoi(argv[1]);
+ /* uint32_t position = atoi(argv[2]); */
+ uint32_t line_instance = atoi(argv[3]);
+ /* char *label = argv[4]; */
+ /* char *value = argv[5]; */
+ /* char *caller_name = argv[6]; */
+ /* uint32_t ring_on_idle = atoi(argv[7]); */
+ /* uint32_t ring_on_active = atoi(argv[8]); */
+ /* uint32_t busy_trigger = atoi(argv[9]); */
+ /* char *forward_all = argv[10]; */
+ /* char *forward_busy = argv[11]; */
+ /* char *forward_noanswer = argv[12]; */
+ /* uint32_t noanswer_duration = atoi(argv[13]); */
+ /* char *channel_uuid = argv[14]; */
+ /* uint32_t call_id = atoi(argv[15]); */
+ /* uint32_t call_state = atoi(argv[16]); */
+
+ listener_t *listener = NULL;
+
+ skinny_profile_find_listener_by_device_name_and_instance(helper->tech_pvt->profile,
+ device_name, device_instance, &listener);
+ if(listener) {
+ helper->lines_count++;
+ skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_RING_IN);
+ send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, SKINNY_KEY_SET_RING_IN, 0xffff);
+ if ((tmp = switch_mprintf("\200\027%s", helper->tech_pvt->caller_profile->destination_number))) {
+ send_display_prompt_status(listener, 0, tmp, line_instance, helper->tech_pvt->call_id);
+ switch_safe_free(tmp);
+ }
+ if ((tmp = switch_mprintf("\005\000\000\000%s", helper->tech_pvt->caller_profile->destination_number))) {
+ send_display_pri_notify(listener, 10 /* message_timeout */, 5 /* priority */, tmp);
+ switch_safe_free(tmp);
+ }
+ skinny_send_call_info(helper->tech_pvt->session, listener, line_instance);
+ send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_BLINK);
+ send_set_ringer(listener, SKINNY_RING_INSIDE, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+ }
+ return 0;
+}
+
+switch_call_cause_t skinny_ring_lines(private_t *tech_pvt)
+{
+ switch_status_t status;
+ struct skinny_ring_lines_helper helper = {0};
+
+ switch_assert(tech_pvt);
+ switch_assert(tech_pvt->profile);
+ switch_assert(tech_pvt->session);
+
+ helper.tech_pvt = tech_pvt;
+ helper.lines_count = 0;
+
+ status = skinny_session_walk_lines(tech_pvt->profile,
+ switch_core_session_get_uuid(tech_pvt->session), skinny_ring_lines_callback, &helper);
+ if(status != SWITCH_STATUS_SUCCESS) {
+ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
+ } else if(helper.lines_count == 0) {
+ return SWITCH_CAUSE_UNALLOCATED_NUMBER;
+ } else {
+ return SWITCH_CAUSE_SUCCESS;
+ }
+}
+
+/*****************************************************************************/
+switch_status_t skinny_create_ingoing_session(listener_t *listener, uint32_t *line_instance_p, switch_core_session_t **session)
+{
+ uint32_t line_instance;
+ switch_core_session_t *nsession;
</ins><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> char name[128];
</span><ins>+ char *sql;
+ struct line_stat_res_message *button = NULL;
</ins><span class="cx">
</span><del>- if(listener->session[line]) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "There is already a session on line %d of device %s\n",
- line, listener->device_name);
</del><ins>+ line_instance = *line_instance_p;
+ if((nsession = skinny_profile_find_session(listener->profile, listener, line_instance_p, 0))) {
+ switch_core_session_rwunlock(nsession);
+ if(skinny_line_get_state(listener, *line_instance_p, 0) == SKINNY_OFF_HOOK) {
+ /* Reuse existing session */
+ *session = nsession;
+ return SWITCH_STATUS_SUCCESS;
+ }
+ skinny_session_hold_line(nsession, listener, *line_instance_p);
+ }
+ *line_instance_p = line_instance;
+ if(*line_instance_p == 0) {
+ *line_instance_p = 1;
+ }
</ins><span class="cx">
</span><del>- session = listener->session[line];
</del><ins>+ skinny_line_get(listener, *line_instance_p, &button);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
- assert(channel != NULL);
</del><ins>+ if (!button || !button->shortname) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Line %d not found on device %s %d\n",
+ *line_instance_p, listener->device_name, listener->device_instance);
+ goto error;
+ }
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(session);
- assert(tech_pvt != NULL);
- } else {
-
- if (!(session = switch_core_session_request(skinny_get_endpoint_interface(), SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
- goto error;
- }
</del><ins>+ if (!(nsession = switch_core_session_request(skinny_get_endpoint_interface(),
+ SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(session, sizeof(*tech_pvt)))) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session private object\n");
- goto error;
- }
</del><ins>+ if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(nsession, sizeof(*tech_pvt)))) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Creating Session private object\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- switch_core_session_add_stream(session, NULL);
</del><ins>+ switch_core_session_add_stream(nsession, NULL);
</ins><span class="cx">
</span><del>- tech_init(tech_pvt, session, listener, line);
</del><ins>+ tech_init(tech_pvt, listener->profile, nsession);
</ins><span class="cx">
</span><del>- channel = switch_core_session_get_channel(session);
</del><ins>+ channel = switch_core_session_get_channel(nsession);
</ins><span class="cx">
</span><del>- snprintf(name, sizeof(name), "SKINNY/%s/%s:%d/%d", listener->profile->name, listener->device_name, listener->device_instance, tech_pvt->line);
- switch_channel_set_name(channel, name);
</del><ins>+ snprintf(name, sizeof(name), "SKINNY/%s/%s:%d/%d", listener->profile->name,
+ listener->device_name, listener->device_instance, *line_instance_p);
+ switch_channel_set_name(channel, name);
</ins><span class="cx">
</span><del>- if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session thread\n");
- goto error;
- }
</del><ins>+ if (switch_core_session_thread_launch(nsession) != SWITCH_STATUS_SUCCESS) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Creating Session thread\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
- NULL, listener->profile->dialplan, tech_pvt->line_displayname, tech_pvt->line_name, listener->remote_ip, NULL, NULL, NULL, "skinny" /* modname */, listener->profile->context, tech_pvt->dest)) != 0) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session caller profile\n");
- goto error;
- }
</del><ins>+ if (!(tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(nsession),
+ NULL, listener->profile->dialplan,
+ button->shortname, button->name,
+ listener->remote_ip, NULL, NULL, NULL,
+ "skinny" /* modname */,
+ listener->profile->context,
+ "")) != 0) {
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(nsession), SWITCH_LOG_CRIT,
+ "Error Creating Session caller profile\n");
+ goto error;
+ }
</ins><span class="cx">
</span><del>- switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
</del><ins>+ switch_channel_set_caller_profile(channel, tech_pvt->caller_profile);
</ins><span class="cx">
</span><ins>+ if ((sql = switch_mprintf(
+ "INSERT INTO skinny_active_lines "
+ "(device_name, device_instance, line_instance, channel_uuid, call_id, call_state) "
+ "SELECT device_name, device_instance, line_instance, '%s', %d, %d "
+ "FROM skinny_lines "
+ "WHERE value='%s'",
+ switch_core_session_get_uuid(nsession), tech_pvt->call_id, SKINNY_ON_HOOK, button->shortname
+ ))) {
+ skinny_execute_sql(listener->profile, sql, listener->profile->sql_mutex);
+ switch_safe_free(sql);
</ins><span class="cx"> }
</span><del>-
- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0);
- set_speaker_mode(listener, SKINNY_SPEAKER_ON);
- set_lamp(listener, SKINNY_BUTTON_LINE, tech_pvt->line, SKINNY_LAMP_ON);
- send_call_state(listener,
- SKINNY_OFF_HOOK,
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, to_state, tech_pvt->call_id);
- display_prompt_status(listener,
- 0,
- "\200\000",
- tech_pvt->line,
- tech_pvt->call_id);
- activate_call_plane(listener, tech_pvt->line);
- start_tone(listener, SKINNY_TONE_DIALTONE, 0, tech_pvt->line, tech_pvt->call_id);
</del><span class="cx">
</span><ins>+ send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, tech_pvt->call_id);
+ send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
+ send_set_lamp(listener, SKINNY_BUTTON_LINE, *line_instance_p, SKINNY_LAMP_ON);
+ skinny_line_set_state(listener, *line_instance_p, tech_pvt->call_id, SKINNY_OFF_HOOK);
+ send_select_soft_keys(listener, *line_instance_p, tech_pvt->call_id, SKINNY_KEY_SET_OFF_HOOK, 0xffff);
+ send_display_prompt_status(listener, 0, "\200\000",
+ *line_instance_p, tech_pvt->call_id);
+ send_activate_call_plane(listener, *line_instance_p);
+
</ins><span class="cx"> goto done;
</span><span class="cx"> error:
</span><del>- if (session) {
- switch_core_session_destroy(&session);
</del><ins>+ if (nsession) {
+ switch_core_session_destroy(&nsession);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="cx"> done:
</span><del>- listener->session[line] = session;
</del><ins>+ *session = nsession;
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_process_dest(listener_t *listener, uint32_t line)
</del><ins>+switch_status_t skinny_session_process_dest(switch_core_session_t *session, listener_t *listener, uint32_t line_instance, char *dest, char append_dest, uint32_t backspace)
</ins><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
</del><ins>+ if(!dest) {
+ if(append_dest == '\0') {/* no digit yet */
+ send_start_tone(listener, SKINNY_TONE_DIALTONE, 0, line_instance, tech_pvt->call_id);
+ } else {
+ if(strlen(tech_pvt->caller_profile->destination_number) == 0) {/* first digit */
+ send_stop_tone(listener, line_instance, tech_pvt->call_id);
+ send_select_soft_keys(listener, line_instance, tech_pvt->call_id,
+ SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, 0xffff);
+ }
+ tech_pvt->caller_profile->destination_number = switch_core_sprintf(tech_pvt->caller_profile->pool,
+ "%s%c", tech_pvt->caller_profile->destination_number, append_dest);
+ }
+ } else {
+ tech_pvt->caller_profile->destination_number = switch_core_strdup(tech_pvt->caller_profile->pool,
+ dest);
+ }
+ /* TODO Number is complete -> check against dialplan */
+ if((strlen(tech_pvt->caller_profile->destination_number) >= 4) || dest) {
+ send_dialed_number(listener, tech_pvt->caller_profile->destination_number, line_instance, tech_pvt->call_id);
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_PROCEED);
+ skinny_send_call_info(session, listener, line_instance);
+ skinny_session_start_media(session, listener, line_instance);
+ }
</ins><span class="cx">
</span><del>- tech_pvt->caller_profile->destination_number = switch_core_strdup(tech_pvt->caller_profile->pool, tech_pvt->dest);
- if(strlen(tech_pvt->dest) >= 4) { /* TODO Number is complete -> check against dialplan */
- if (switch_channel_get_state(channel) == CS_NEW) {
- switch_channel_set_state(channel, CS_INIT);
- }
</del><ins>+ switch_core_session_rwunlock(session);
</ins><span class="cx">
</span><del>- send_dialed_number(listener, tech_pvt->dest, tech_pvt->line, tech_pvt->call_id);
- skinny_answer(listener->session[line]);
- }
</del><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_answer(switch_core_session_t *session)
</del><ins>+switch_status_t skinny_session_ring_out(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><ins>+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
+
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_RING_OUT);
+ send_select_soft_keys(listener, line_instance, tech_pvt->call_id,
+ SKINNY_KEY_SET_RING_OUT, 0xffff);
+ send_display_prompt_status(listener, 0, "\200\026",
+ line_instance, tech_pvt->call_id);
+ skinny_send_call_info(session, listener, line_instance);
+
+ switch_core_session_rwunlock(session);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
+struct skinny_session_answer_helper {
</ins><span class="cx"> private_t *tech_pvt;
</span><span class="cx"> listener_t *listener;
</span><ins>+ uint32_t line_instance;
+};
+
+int skinny_session_answer_callback(void *pArg, int argc, char **argv, char **columnNames)
+{
+ struct skinny_session_answer_helper *helper = pArg;
+ listener_t *listener = NULL;
+
+ char *device_name = argv[0];
+ uint32_t device_instance = atoi(argv[1]);
+ /* uint32_t position = atoi(argv[2]); */
+ uint32_t line_instance = atoi(argv[3]);
+ /* char *label = argv[4]; */
+ /* char *value = argv[5]; */
+ /* char *caller_name = argv[6]; */
+ /* uint32_t ring_on_idle = atoi(argv[7]); */
+ /* uint32_t ring_on_active = atoi(argv[8]); */
+ /* uint32_t busy_trigger = atoi(argv[9]); */
+ /* char *forward_all = argv[10]; */
+ /* char *forward_busy = argv[11]; */
+ /* char *forward_noanswer = argv[12]; */
+ /* uint32_t noanswer_duration = atoi(argv[13]); */
+ /* char *channel_uuid = argv[14]; */
+ /* uint32_t call_id = atoi(argv[15]); */
+ /* uint32_t call_state = atoi(argv[16]); */
+
+ skinny_profile_find_listener_by_device_name_and_instance(helper->tech_pvt->profile, device_name, device_instance, &listener);
+ if(listener) {
+ if(!strcmp(device_name, helper->listener->device_name)
+ && (device_instance == helper->listener->device_instance)
+ && (line_instance == helper->line_instance)) {/* the answering line */
+
+
+ send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, helper->tech_pvt->call_id);
+ send_set_speaker_mode(listener, SKINNY_SPEAKER_ON);
+ send_set_lamp(listener, SKINNY_BUTTON_LINE, line_instance, SKINNY_LAMP_ON);
+ skinny_line_set_state(listener, line_instance, helper->tech_pvt->call_id, SKINNY_OFF_HOOK);
+ /* send_select_soft_keys(listener, line_instance, helper->tech_pvt->call_id, SKINNY_KEY_SET_OFF_HOOK, 0xffff); */
+ /* display_prompt_status(listener, 0, "\200\000",
+ line_instance, tech_pvt->call_id); */
+ send_activate_call_plane(listener, line_instance);
+ }
+ }
+ return 0;
+}
+
+switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+{
+ struct skinny_session_answer_helper helper = {0};
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
</ins><span class="cx">
</span><ins>+ channel = switch_core_session_get_channel(session);
</ins><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><del>- switch_assert(tech_pvt != NULL);
</del><ins>+
+ helper.tech_pvt = tech_pvt;
+ helper.listener = listener;
+ helper.line_instance = line_instance;
+
+ skinny_session_walk_lines(tech_pvt->profile, switch_core_session_get_uuid(session), skinny_session_answer_callback, &helper);
+
+ skinny_session_start_media(session, listener, line_instance);
+
+ switch_core_session_rwunlock(session);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+switch_status_t skinny_session_start_media(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
+{
+ switch_channel_t *channel = NULL;
+ private_t *tech_pvt = NULL;
+
+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
</ins><span class="cx">
</span><del>- listener = tech_pvt->listener;
- switch_assert(listener != NULL);
</del><ins>+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
+
+ send_stop_tone(listener, line_instance, tech_pvt->call_id);
+ send_open_receive_channel(listener,
+ tech_pvt->call_id, /* uint32_t conference_id, */
+ tech_pvt->call_id, /* uint32_t pass_thru_party_id, */
+ 20, /* uint32_t packets, */
+ SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
+ 0, /* uint32_t echo_cancel_type, */
+ 0, /* uint32_t g723_bitrate, */
+ 0, /* uint32_t conference_id2, */
+ 0 /* uint32_t reserved[10] */
+ );
+ skinny_line_set_state(listener, line_instance, tech_pvt->call_id, SKINNY_CONNECTED);
+ send_select_soft_keys(listener, line_instance, tech_pvt->call_id,
+ SKINNY_KEY_SET_CONNECTED, 0xffff);
+ send_display_prompt_status(listener,
+ 0,
+ "\200\030",
+ line_instance,
+ tech_pvt->call_id);
+ skinny_send_call_info(session, listener, line_instance);
</ins><span class="cx">
</span><del>- set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0); /* TODO : here ? */
- stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
- open_receive_channel(listener,
- tech_pvt->call_id, /* uint32_t conference_id, */
- 0, /* uint32_t pass_thru_party_id, */
- 20, /* uint32_t packets, */
- SKINNY_CODEC_ULAW_64K, /* uint32_t payload_capacity, */
- 0, /* uint32_t echo_cancel_type, */
- 0, /* uint32_t g723_bitrate, */
- 0, /* uint32_t conference_id2, */
- 0 /* uint32_t reserved[10] */
- );
- send_call_state(listener,
- SKINNY_CONNECTED,
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_CONNECTED, tech_pvt->call_id);
- display_prompt_status(listener,
- 0,
- "\200\030",
- tech_pvt->line,
- tech_pvt->call_id);
- skinny_send_call_info(session);
</del><ins>+ switch_core_session_rwunlock(session);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_hold_line(listener_t *listener, uint32_t line)
</del><ins>+switch_status_t skinny_session_hold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ switch_assert(session);
+ switch_assert(listener);
+ switch_assert(listener->profile);
+
+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
-
</del><span class="cx"> /* TODO */
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Hold is not implemented yet. Hanging up the line.\n");
</span><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><span class="cx">
</span><ins>+ switch_core_session_rwunlock(session);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t skinny_unhold_line(listener_t *listener, uint32_t line)
</del><ins>+switch_status_t skinny_session_unhold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance)
</ins><span class="cx"> {
</span><span class="cx"> /* TODO */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -516,7 +782,7 @@
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="cx">
</span><span class="cx"> helper.button = switch_core_alloc(listener->pool, sizeof(struct line_stat_res_message));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT '%d' AS wanted_position, position, label, value, caller_name "
</span><span class="cx"> "FROM skinny_lines "
</span><span class="lines">@@ -525,7 +791,7 @@
</span><span class="cx"> instance,
</span><span class="cx"> listener->device_name, listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_line_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_line_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -559,7 +825,7 @@
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="cx">
</span><span class="cx"> helper.button = switch_core_alloc(listener->pool, sizeof(struct speed_dial_stat_res_message));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT '%d' AS wanted_position, position, label, value, settings "
</span><span class="cx"> "FROM skinny_buttons "
</span><span class="lines">@@ -569,7 +835,7 @@
</span><span class="cx"> listener->device_name, listener->device_instance,
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_speed_dial_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_speed_dial_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -603,7 +869,7 @@
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="cx">
</span><span class="cx"> helper.button = switch_core_alloc(listener->pool, sizeof(struct service_url_stat_res_message));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT '%d' AS wanted_position, position, label, value, settings "
</span><span class="cx"> "FROM skinny_buttons "
</span><span class="lines">@@ -614,7 +880,7 @@
</span><span class="cx"> listener->device_instance,
</span><span class="cx"> SKINNY_BUTTON_SERVICE_URL
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_service_url_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_service_url_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -649,7 +915,7 @@
</span><span class="cx"> switch_assert(listener->device_name);
</span><span class="cx">
</span><span class="cx"> helper.button = switch_core_alloc(listener->pool, sizeof(struct feature_stat_res_message));
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT '%d' AS wanted_position, position, label, value, settings "
</span><span class="cx"> "FROM skinny_buttons "
</span><span class="lines">@@ -660,7 +926,7 @@
</span><span class="cx"> listener->device_instance,
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL, SKINNY_BUTTON_SERVICE_URL
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(listener->profile, listener->profile->listener_mutex, sql, skinny_feature_get_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(listener->profile, listener->profile->sql_mutex, sql, skinny_feature_get_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> *button = helper.button;
</span><span class="lines">@@ -669,7 +935,26 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* SKINNY MESSAGE SENDER */
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t start_tone(listener_t *listener,
</del><ins>+switch_status_t send_register_ack(listener_t *listener,
+ uint32_t keep_alive,
+ char *date_format,
+ char *reserved,
+ uint32_t secondary_keep_alive,
+ char *reserved2)
+{
+ skinny_message_t *message;
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_ack));
+ message->type = REGISTER_ACK_MESSAGE;
+ message->length = 4 + sizeof(message->data.reg_ack);
+ message->data.reg_ack.keep_alive = keep_alive;
+ strncpy(message->data.reg_ack.date_format, date_format, 6);
+ strncpy(message->data.reg_ack.reserved, reserved, 2);
+ message->data.reg_ack.secondary_keep_alive = keep_alive;
+ strncpy(message->data.reg_ack.reserved2, reserved2, 4);
+ return skinny_send_reply(listener, message);
+}
+
+switch_status_t send_start_tone(listener_t *listener,
</ins><span class="cx"> uint32_t tone,
</span><span class="cx"> uint32_t reserved,
</span><span class="cx"> uint32_t line_instance,
</span><span class="lines">@@ -683,11 +968,10 @@
</span><span class="cx"> message->data.start_tone.reserved = reserved;
</span><span class="cx"> message->data.start_tone.line_instance = line_instance;
</span><span class="cx"> message->data.start_tone.call_id = call_id;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t stop_tone(listener_t *listener,
</del><ins>+switch_status_t send_stop_tone(listener_t *listener,
</ins><span class="cx"> uint32_t line_instance,
</span><span class="cx"> uint32_t call_id)
</span><span class="cx"> {
</span><span class="lines">@@ -697,14 +981,14 @@
</span><span class="cx"> message->length = 4 + sizeof(message->data.stop_tone);
</span><span class="cx"> message->data.stop_tone.line_instance = line_instance;
</span><span class="cx"> message->data.stop_tone.call_id = call_id;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t set_ringer(listener_t *listener,
</del><ins>+switch_status_t send_set_ringer(listener_t *listener,
</ins><span class="cx"> uint32_t ring_type,
</span><span class="cx"> uint32_t ring_mode,
</span><del>- uint32_t unknown)
</del><ins>+ uint32_t line_instance,
+ uint32_t call_id)
</ins><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.ringer));
</span><span class="lines">@@ -712,12 +996,12 @@
</span><span class="cx"> message->length = 4 + sizeof(message->data.ringer);
</span><span class="cx"> message->data.ringer.ring_type = ring_type;
</span><span class="cx"> message->data.ringer.ring_mode = ring_mode;
</span><del>- message->data.ringer.unknown = unknown;
- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ message->data.ringer.line_instance = line_instance;
+ message->data.ringer.call_id = call_id;
+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t set_lamp(listener_t *listener,
</del><ins>+switch_status_t send_set_lamp(listener_t *listener,
</ins><span class="cx"> uint32_t stimulus,
</span><span class="cx"> uint32_t stimulus_instance,
</span><span class="cx"> uint32_t mode)
</span><span class="lines">@@ -729,11 +1013,10 @@
</span><span class="cx"> message->data.lamp.stimulus = stimulus;
</span><span class="cx"> message->data.lamp.stimulus_instance = stimulus_instance;
</span><span class="cx"> message->data.lamp.mode = mode;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t set_speaker_mode(listener_t *listener,
</del><ins>+switch_status_t send_set_speaker_mode(listener_t *listener,
</ins><span class="cx"> uint32_t mode)
</span><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><span class="lines">@@ -741,11 +1024,10 @@
</span><span class="cx"> message->type = SET_SPEAKER_MODE_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.speaker_mode);
</span><span class="cx"> message->data.speaker_mode.mode = mode;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t start_media_transmission(listener_t *listener,
</del><ins>+switch_status_t send_start_media_transmission(listener_t *listener,
</ins><span class="cx"> uint32_t conference_id,
</span><span class="cx"> uint32_t pass_thru_party_id,
</span><span class="cx"> uint32_t remote_ip,
</span><span class="lines">@@ -772,11 +1054,10 @@
</span><span class="cx"> message->data.start_media.max_frames_per_packet = max_frames_per_packet;
</span><span class="cx"> message->data.start_media.g723_bitrate = g723_bitrate;
</span><span class="cx"> /* ... */
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t stop_media_transmission(listener_t *listener,
</del><ins>+switch_status_t send_stop_media_transmission(listener_t *listener,
</ins><span class="cx"> uint32_t conference_id,
</span><span class="cx"> uint32_t pass_thru_party_id,
</span><span class="cx"> uint32_t conference_id2)
</span><span class="lines">@@ -789,8 +1070,7 @@
</span><span class="cx"> message->data.stop_media.pass_thru_party_id = pass_thru_party_id;
</span><span class="cx"> message->data.stop_media.conference_id2 = conference_id2;
</span><span class="cx"> /* ... */
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t send_call_info(listener_t *listener,
</span><span class="lines">@@ -819,31 +1099,95 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.call_info));
</span><span class="cx"> message->type = CALL_INFO_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.call_info);
</span><del>- strcpy(message->data.call_info.calling_party_name, calling_party_name);
- strcpy(message->data.call_info.calling_party, calling_party);
- strcpy(message->data.call_info.called_party_name, called_party_name);
- strcpy(message->data.call_info.called_party, called_party);
</del><ins>+ strncpy(message->data.call_info.calling_party_name, calling_party_name, 40);
+ strncpy(message->data.call_info.calling_party, calling_party, 24);
+ strncpy(message->data.call_info.called_party_name, called_party_name, 40);
+ strncpy(message->data.call_info.called_party, called_party, 24);
</ins><span class="cx"> message->data.call_info.line_instance = line_instance;
</span><span class="cx"> message->data.call_info.call_id = call_id;
</span><span class="cx"> message->data.call_info.call_type = call_type;
</span><del>- strcpy(message->data.call_info.original_called_party_name, original_called_party_name);
- strcpy(message->data.call_info.original_called_party, original_called_party);
- strcpy(message->data.call_info.last_redirecting_party_name, last_redirecting_party_name);
- strcpy(message->data.call_info.last_redirecting_party, last_redirecting_party);
</del><ins>+ strncpy(message->data.call_info.original_called_party_name, original_called_party_name, 40);
+ strncpy(message->data.call_info.original_called_party, original_called_party, 24);
+ strncpy(message->data.call_info.last_redirecting_party_name, last_redirecting_party_name, 40);
+ strncpy(message->data.call_info.last_redirecting_party, last_redirecting_party, 24);
</ins><span class="cx"> message->data.call_info.original_called_party_redirect_reason = original_called_party_redirect_reason;
</span><span class="cx"> message->data.call_info.last_redirecting_reason = last_redirecting_reason;
</span><del>- strcpy(message->data.call_info.calling_party_voice_mailbox, calling_party_voice_mailbox);
- strcpy(message->data.call_info.called_party_voice_mailbox, called_party_voice_mailbox);
- strcpy(message->data.call_info.original_called_party_voice_mailbox, original_called_party_voice_mailbox);
- strcpy(message->data.call_info.last_redirecting_voice_mailbox, last_redirecting_voice_mailbox);
</del><ins>+ strncpy(message->data.call_info.calling_party_voice_mailbox, calling_party_voice_mailbox, 24);
+ strncpy(message->data.call_info.called_party_voice_mailbox, called_party_voice_mailbox, 24);
+ strncpy(message->data.call_info.original_called_party_voice_mailbox, original_called_party_voice_mailbox, 24);
+ strncpy(message->data.call_info.last_redirecting_voice_mailbox, last_redirecting_voice_mailbox, 24);
</ins><span class="cx"> message->data.call_info.call_instance = call_instance;
</span><span class="cx"> message->data.call_info.call_security_status = call_security_status;
</span><span class="cx"> message->data.call_info.party_pi_restriction_bits = party_pi_restriction_bits;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t open_receive_channel(listener_t *listener,
</del><ins>+switch_status_t send_define_time_date(listener_t *listener,
+ uint32_t year,
+ uint32_t month,
+ uint32_t day_of_week, /* monday = 1 */
+ uint32_t day,
+ uint32_t hour,
+ uint32_t minute,
+ uint32_t seconds,
+ uint32_t milliseconds,
+ uint32_t timestamp)
+{
+ skinny_message_t *message;
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.define_time_date));
+ message->type = DEFINE_TIME_DATE_MESSAGE;
+ message->length = 4+sizeof(message->data.define_time_date);
+ message->data.define_time_date.year = year;
+ message->data.define_time_date.month = month;
+ message->data.define_time_date.day_of_week = day_of_week;
+ message->data.define_time_date.day = day;
+ message->data.define_time_date.hour = hour;
+ message->data.define_time_date.minute = minute;
+ message->data.define_time_date.seconds = seconds;
+ message->data.define_time_date.milliseconds = milliseconds;
+ message->data.define_time_date.timestamp = timestamp;
+ return skinny_send_reply(listener, message);
+}
+
+switch_status_t send_define_current_time_date(listener_t *listener)
+{
+ switch_time_t ts;
+ switch_time_exp_t tm;
+ ts = switch_micro_time_now();
+ switch_time_exp_lt(&tm, ts);
+ return send_define_time_date(listener,
+ tm.tm_year + 1900,
+ tm.tm_mon + 1,
+ tm.tm_wday,
+ tm.tm_yday + 1,
+ tm.tm_hour,
+ tm.tm_min,
+ tm.tm_sec + 1,
+ tm.tm_usec / 1000,
+ ts / 1000000);
+}
+
+switch_status_t send_capabilities_req(listener_t *listener)
+{
+ skinny_message_t *message;
+ message = switch_core_alloc(listener->pool, 12);
+ message->type = CAPABILITIES_REQ_MESSAGE;
+ message->length = 4;
+ return skinny_send_reply(listener, message);
+}
+
+switch_status_t send_register_reject(listener_t *listener,
+ char *error)
+{
+ skinny_message_t *message;
+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_rej));
+ message->type = REGISTER_REJECT_MESSAGE;
+ message->length = 4 + sizeof(message->data.reg_rej);
+ strncpy(message->data.reg_rej.error, error, 33);
+ return skinny_send_reply(listener, message);
+}
+
+switch_status_t send_open_receive_channel(listener_t *listener,
</ins><span class="cx"> uint32_t conference_id,
</span><span class="cx"> uint32_t pass_thru_party_id,
</span><span class="cx"> uint32_t packets,
</span><span class="lines">@@ -876,11 +1220,10 @@
</span><span class="cx"> message->data.open_receive_channel.reserved[8] = reserved[8];
</span><span class="cx"> message->data.open_receive_channel.reserved[9] = reserved[9];
</span><span class="cx"> */
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t close_receive_channel(listener_t *listener,
</del><ins>+switch_status_t send_close_receive_channel(listener_t *listener,
</ins><span class="cx"> uint32_t conference_id,
</span><span class="cx"> uint32_t pass_thru_party_id,
</span><span class="cx"> uint32_t conference_id2)
</span><span class="lines">@@ -892,8 +1235,7 @@
</span><span class="cx"> message->data.close_receive_channel.conference_id = conference_id;
</span><span class="cx"> message->data.close_receive_channel.pass_thru_party_id = pass_thru_party_id;
</span><span class="cx"> message->data.close_receive_channel.conference_id2 = conference_id2;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t send_select_soft_keys(listener_t *listener,
</span><span class="lines">@@ -910,8 +1252,7 @@
</span><span class="cx"> message->data.select_soft_keys.call_id = call_id;
</span><span class="cx"> message->data.select_soft_keys.soft_key_set = soft_key_set;
</span><span class="cx"> message->data.select_soft_keys.valid_key_mask = valid_key_mask;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t send_call_state(listener_t *listener,
</span><span class="lines">@@ -926,11 +1267,10 @@
</span><span class="cx"> message->data.call_state.call_state = call_state;
</span><span class="cx"> message->data.call_state.line_instance = line_instance;
</span><span class="cx"> message->data.call_state.call_id = call_id;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t display_prompt_status(listener_t *listener,
</del><ins>+switch_status_t send_display_prompt_status(listener_t *listener,
</ins><span class="cx"> uint32_t timeout,
</span><span class="cx"> char display[32],
</span><span class="cx"> uint32_t line_instance,
</span><span class="lines">@@ -941,14 +1281,13 @@
</span><span class="cx"> message->type = DISPLAY_PROMPT_STATUS_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.display_prompt_status);
</span><span class="cx"> message->data.display_prompt_status.timeout = timeout;
</span><del>- strcpy(message->data.display_prompt_status.display, display);
</del><ins>+ strncpy(message->data.display_prompt_status.display, display, 32);
</ins><span class="cx"> message->data.display_prompt_status.line_instance = line_instance;
</span><span class="cx"> message->data.display_prompt_status.call_id = call_id;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t clear_prompt_status(listener_t *listener,
</del><ins>+switch_status_t send_clear_prompt_status(listener_t *listener,
</ins><span class="cx"> uint32_t line_instance,
</span><span class="cx"> uint32_t call_id)
</span><span class="cx"> {
</span><span class="lines">@@ -958,11 +1297,10 @@
</span><span class="cx"> message->length = 4 + sizeof(message->data.clear_prompt_status);
</span><span class="cx"> message->data.clear_prompt_status.line_instance = line_instance;
</span><span class="cx"> message->data.clear_prompt_status.call_id = call_id;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t activate_call_plane(listener_t *listener,
</del><ins>+switch_status_t send_activate_call_plane(listener_t *listener,
</ins><span class="cx"> uint32_t line_instance)
</span><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><span class="lines">@@ -970,8 +1308,7 @@
</span><span class="cx"> message->type = ACTIVATE_CALL_PLANE_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.activate_call_plane);
</span><span class="cx"> message->data.activate_call_plane.line_instance = line_instance;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t send_dialed_number(listener_t *listener,
</span><span class="lines">@@ -983,23 +1320,36 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.dialed_number));
</span><span class="cx"> message->type = DIALED_NUMBER_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.dialed_number);
</span><del>- strcpy(message->data.dialed_number.called_party, called_party);
</del><ins>+ strncpy(message->data.dialed_number.called_party, called_party, 24);
</ins><span class="cx"> message->data.dialed_number.line_instance = line_instance;
</span><span class="cx"> message->data.dialed_number.call_id = call_id;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-switch_status_t send_reset(listener_t *listener,
- uint32_t reset_type)
</del><ins>+switch_status_t send_display_pri_notify(listener_t *listener,
+ uint32_t message_timeout,
+ uint32_t priority,
+ char *notify)
</ins><span class="cx"> {
</span><span class="cx"> skinny_message_t *message;
</span><ins>+ message = switch_core_alloc(listener->pool, 12+sizeof(message->data.display_pri_notify));
+ message->type = DISPLAY_PRI_NOTIFY_MESSAGE;
+ message->length = 4 + sizeof(message->data.display_pri_notify);
+ message->data.display_pri_notify.message_timeout = message_timeout;
+ message->data.display_pri_notify.priority = priority;
+ strncpy(message->data.display_pri_notify.notify, notify, 32);
+ return skinny_send_reply(listener, message);
+}
+
+
+switch_status_t send_reset(listener_t *listener, uint32_t reset_type)
+{
+ skinny_message_t *message;
</ins><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reset));
</span><span class="cx"> message->type = RESET_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.reset);
</span><span class="cx"> message->data.reset.reset_type = reset_type;
</span><del>- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return skinny_send_reply(listener, message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Message handling */
</span><span class="lines">@@ -1020,14 +1370,13 @@
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Alarm-Param1", "%d", request->data.alarm.alarm_param1);
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Skinny-Alarm-Param2", "%d", request->data.alarm.alarm_param2);
</span><span class="cx"> switch_event_fire(&event);
</span><del>-
</del><ins>+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><del>- skinny_message_t *message;
</del><span class="cx"> skinny_profile_t *profile;
</span><span class="cx"> switch_event_t *event = NULL;
</span><span class="cx"> switch_event_t *params = NULL;
</span><span class="lines">@@ -1041,11 +1390,7 @@
</span><span class="cx"> if(!zstr(listener->device_name)) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</span><span class="cx"> "A device is already registred on this listener.\n");
</span><del>- message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_rej));
- message->type = REGISTER_REJ_MESSAGE;
- message->length = 4 + sizeof(message->data.reg_rej);
- strcpy(message->data.reg_rej.error, "A device is already registred on this listener");
- skinny_send_reply(listener, message);
</del><ins>+ send_register_reject(listener, "A device is already registred on this listener");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1057,11 +1402,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't find device [%s@%s]\n"
</span><span class="cx"> "You must define a domain called '%s' in your directory and add a user with id=\"%s\".\n"
</span><span class="cx"> , request->data.reg.device_name, profile->domain, profile->domain, request->data.reg.device_name);
</span><del>- message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_rej));
- message->type = REGISTER_REJ_MESSAGE;
- message->length = 4 + sizeof(message->data.reg_rej);
- strcpy(message->data.reg_rej.error, "Device not found");
- skinny_send_reply(listener, message);
</del><ins>+ send_register_reject(listener, "Device not found");
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -1078,18 +1419,19 @@
</span><span class="cx"> request->data.reg.max_streams,
</span><span class="cx"> "" /* codec_string */
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- strcpy(listener->device_name, request->data.reg.device_name);
</del><ins>+ strncpy(listener->device_name, request->data.reg.device_name, 16);
</ins><span class="cx"> listener->device_instance = request->data.reg.instance;
</span><span class="cx">
</span><span class="cx"> xskinny = switch_xml_child(xuser, "skinny");
</span><span class="cx"> if (xskinny) {
</span><span class="cx"> xbuttons = switch_xml_child(xskinny, "buttons");
</span><span class="cx"> if (xbuttons) {
</span><ins>+ uint32_t line_instance = 1;
</ins><span class="cx"> for (xbutton = switch_xml_child(xbuttons, "button"); xbutton; xbutton = xbutton->next) {
</span><span class="cx"> uint32_t position = atoi(switch_xml_attr_soft(xbutton, "position"));
</span><span class="cx"> uint32_t type = skinny_str2button(switch_xml_attr_soft(xbutton, "type"));
</span><span class="lines">@@ -1106,16 +1448,16 @@
</span><span class="cx"> uint32_t noanswer_duration = atoi(switch_xml_attr_soft(xbutton, "noanswer-duration"));
</span><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "INSERT INTO skinny_lines "
</span><del>- "(device_name, device_instance, position, "
</del><ins>+ "(device_name, device_instance, position, line_instance, "
</ins><span class="cx"> "label, value, caller_name, "
</span><span class="cx"> "ring_on_idle, ring_on_active, busy_trigger, "
</span><del>- "forward_all, forward_busy, forward_noanswer, noanswer_duration) "
- "VALUES('%s', %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d)",
- request->data.reg.device_name, request->data.reg.instance, position,
</del><ins>+ "forward_all, forward_busy, forward_noanswer, noanswer_duration) "
+ "VALUES('%s', %d, %d, %d, '%s', '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d)",
+ request->data.reg.device_name, request->data.reg.instance, position, line_instance++,
</ins><span class="cx"> label, value, caller_name,
</span><span class="cx"> ring_on_idle, ring_on_active, busy_trigger,
</span><del>- forward_all, forward_busy, forward_noanswer, noanswer_duration))) {
- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ forward_all, forward_busy, forward_noanswer, noanswer_duration))) {
+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -1131,7 +1473,7 @@
</span><span class="cx"> label,
</span><span class="cx"> value,
</span><span class="cx"> settings))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1142,38 +1484,29 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> /* Reply with RegisterAckMessage */
</span><del>- message = switch_core_alloc(listener->pool, 12+sizeof(message->data.reg_ack));
- message->type = REGISTER_ACK_MESSAGE;
- message->length = 4 + sizeof(message->data.reg_ack);
- message->data.reg_ack.keepAlive = profile->keep_alive;
- memcpy(message->data.reg_ack.dateFormat, profile->date_format, 6);
- message->data.reg_ack.secondaryKeepAlive = profile->keep_alive;
- skinny_send_reply(listener, message);
</del><ins>+ send_register_ack(listener, profile->keep_alive, profile->date_format, "", profile->keep_alive, "");
</ins><span class="cx">
</span><span class="cx"> /* Send CapabilitiesReqMessage */
</span><del>- message = switch_core_alloc(listener->pool, 12);
- message->type = CAPABILITIES_REQ_MESSAGE;
- message->length = 4;
- skinny_send_reply(listener, message);
</del><ins>+ send_capabilities_req(listener);
</ins><span class="cx">
</span><span class="cx"> /* skinny::register event */
</span><span class="cx"> skinny_device_event(listener, &event, SWITCH_EVENT_CUSTOM, SKINNY_EVENT_REGISTER);
</span><span class="cx"> switch_event_fire(&event);
</span><del>-
</del><ins>+
</ins><span class="cx"> keepalive_listener(listener, NULL);
</span><span class="cx">
</span><span class="cx"> end:
</span><span class="cx"> if(params) {
</span><span class="cx"> switch_event_destroy(&params);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_headset_status_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.headset_status));
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Nothing to do */
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1188,12 +1521,12 @@
</span><span class="cx"> char *server_name = argv[4];
</span><span class="cx"> int number_lines = atoi(argv[5]);
</span><span class="cx"> int number_speed_dials = atoi(argv[6]);
</span><del>-
- strcpy(message->data.config_res.device_name, device_name);
</del><ins>+
+ strncpy(message->data.config_res.device_name, device_name, 16);
</ins><span class="cx"> message->data.config_res.user_id = user_id;
</span><span class="cx"> message->data.config_res.instance = instance;
</span><del>- strcpy(message->data.config_res.user_name, user_name);
- strcpy(message->data.config_res.server_name, server_name);
</del><ins>+ strncpy(message->data.config_res.user_name, user_name, 40);
+ strncpy(message->data.config_res.server_name, server_name, 40);
</ins><span class="cx"> message->data.config_res.number_lines = number_lines;
</span><span class="cx"> message->data.config_res.number_speed_dials = number_speed_dials;
</span><span class="cx">
</span><span class="lines">@@ -1227,7 +1560,7 @@
</span><span class="cx"> SKINNY_BUTTON_SPEED_DIAL,
</span><span class="cx"> listener->device_name
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_config_stat_res_callback, message);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_config_stat_res_callback, message);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> skinny_send_reply(listener, message);
</span><span class="lines">@@ -1244,7 +1577,7 @@
</span><span class="cx"> uint32_t n = 0;
</span><span class="cx"> char *codec_order[SWITCH_MAX_CODECS];
</span><span class="cx"> char *codec_string;
</span><del>-
</del><ins>+
</ins><span class="cx"> size_t string_len, string_pos, pos;
</span><span class="cx">
</span><span class="cx"> switch_assert(listener->profile);
</span><span class="lines">@@ -1287,10 +1620,10 @@
</span><span class="cx"> codec_string,
</span><span class="cx"> listener->device_name
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Codecs %s supported.\n", codec_string);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1309,11 +1642,11 @@
</span><span class="cx">
</span><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "UPDATE skinny_devices SET port=%d WHERE name='%s' and instance=%d",
</span><del>- request->data.as_uint16,
</del><ins>+ request->data.port.port,
</ins><span class="cx"> listener->device_name,
</span><span class="cx"> listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql(profile, sql, profile->listener_mutex);
</del><ins>+ skinny_execute_sql(profile, sql, profile->sql_mutex);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1366,7 +1699,7 @@
</span><span class="cx"> message->data.button_template.button_offset = 0;
</span><span class="cx"> message->data.button_template.button_count = 0;
</span><span class="cx"> message->data.button_template.total_button_count = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> helper.message = message;
</span><span class="cx">
</span><span class="cx"> /* Add buttons */
</span><span class="lines">@@ -1378,10 +1711,10 @@
</span><span class="cx"> SKINNY_BUTTON_UNDEFINED,
</span><span class="cx"> listener->device_name, listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Add lines */
</span><span class="cx"> if ((sql = switch_mprintf(
</span><span class="cx"> "SELECT device_name, device_instance, position, %d AS type "
</span><span class="lines">@@ -1391,10 +1724,10 @@
</span><span class="cx"> SKINNY_BUTTON_LINE,
</span><span class="cx"> listener->device_name, listener->device_instance
</span><span class="cx"> ))) {
</span><del>- skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</del><ins>+ skinny_execute_sql_callback(profile, profile->sql_mutex, sql, skinny_handle_button_template_request_callback, &helper);
</ins><span class="cx"> switch_safe_free(sql);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Fill remaining buttons with Undefined */
</span><span class="cx"> for(int i = 0; i+1 < helper.max_position; i++) {
</span><span class="cx"> if(message->data.button_template.btn[i].button_definition == SKINNY_BUTTON_UNKNOWN) {
</span><span class="lines">@@ -1427,11 +1760,11 @@
</span><span class="cx"> message->data.soft_key_template.soft_key_offset = 0;
</span><span class="cx"> message->data.soft_key_template.soft_key_count = 21;
</span><span class="cx"> message->data.soft_key_template.total_soft_key_count = 21;
</span><del>-
</del><ins>+
</ins><span class="cx"> memcpy(message->data.soft_key_template.soft_key,
</span><span class="cx"> soft_key_template_default,
</span><span class="cx"> sizeof(soft_key_template_default));
</span><del>-
</del><ins>+
</ins><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1454,7 +1787,7 @@
</span><span class="cx"> message->data.soft_key_set.soft_key_set_offset = 0;
</span><span class="cx"> message->data.soft_key_set.soft_key_set_count = 11;
</span><span class="cx"> message->data.soft_key_set.total_soft_key_set_count = 11;
</span><del>-
</del><ins>+
</ins><span class="cx"> /* TODO fill the set */
</span><span class="cx"> message->data.soft_key_set.soft_key_set[SKINNY_KEY_SET_ON_HOOK].soft_key_template_index[0] = SOFTKEY_REDIAL;
</span><span class="cx"> message->data.soft_key_set.soft_key_set[SKINNY_KEY_SET_ON_HOOK].soft_key_template_index[1] = SOFTKEY_NEWCALL;
</span><span class="lines">@@ -1464,8 +1797,8 @@
</span><span class="cx"> skinny_send_reply(listener, message);
</span><span class="cx">
</span><span class="cx"> /* Init the states */
</span><del>- skinny_line_set_state(listener, 0, SKINNY_KEY_SET_ON_HOOK, 0);
-
</del><ins>+ send_select_soft_keys(listener, 0, 0, SKINNY_KEY_SET_ON_HOOK, 0xffff);
+
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1479,7 +1812,7 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.line_res));
</span><span class="cx"> message->type = LINE_STAT_RES_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.line_res);
</span><del>-
</del><ins>+
</ins><span class="cx"> skinny_line_get(listener, request->data.line_req.number, &button);
</span><span class="cx">
</span><span class="cx"> memcpy(&message->data.line_res, button, sizeof(struct line_stat_res_message));
</span><span class="lines">@@ -1499,7 +1832,7 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.speed_dial_res));
</span><span class="cx"> message->type = SPEED_DIAL_STAT_RES_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.speed_dial_res);
</span><del>-
</del><ins>+
</ins><span class="cx"> skinny_speed_dial_get(listener, request->data.speed_dial_req.number, &button);
</span><span class="cx">
</span><span class="cx"> memcpy(&message->data.speed_dial_res, button, sizeof(struct speed_dial_stat_res_message));
</span><span class="lines">@@ -1519,7 +1852,7 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.service_url_res));
</span><span class="cx"> message->type = SERVICE_URL_STAT_RES_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.service_url_res);
</span><del>-
</del><ins>+
</ins><span class="cx"> skinny_service_url_get(listener, request->data.service_url_req.service_url_index, &button);
</span><span class="cx">
</span><span class="cx"> memcpy(&message->data.service_url_res, button, sizeof(struct service_url_stat_res_message));
</span><span class="lines">@@ -1539,7 +1872,7 @@
</span><span class="cx"> message = switch_core_alloc(listener->pool, 12+sizeof(message->data.feature_res));
</span><span class="cx"> message->type = FEATURE_STAT_RES_MESSAGE;
</span><span class="cx"> message->length = 4 + sizeof(message->data.feature_res);
</span><del>-
</del><ins>+
</ins><span class="cx"> skinny_feature_get(listener, request->data.feature_req.feature_index, &button);
</span><span class="cx">
</span><span class="cx"> memcpy(&message->data.feature_res, button, sizeof(struct feature_stat_res_message));
</span><span class="lines">@@ -1559,26 +1892,7 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_time_date_request(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- skinny_message_t *message;
- switch_time_t ts;
- switch_time_exp_t tm;
-
- message = switch_core_alloc(listener->pool, 12+sizeof(message->data.define_time_date));
- message->type = DEFINE_TIME_DATE_MESSAGE;
- message->length = 4+sizeof(message->data.define_time_date);
- ts = switch_micro_time_now();
- switch_time_exp_lt(&tm, ts);
- message->data.define_time_date.year = tm.tm_year + 1900;
- message->data.define_time_date.month = tm.tm_mon + 1;
- message->data.define_time_date.day_of_week = tm.tm_wday;
- message->data.define_time_date.day = tm.tm_yday + 1;
- message->data.define_time_date.hour = tm.tm_hour;
- message->data.define_time_date.minute = tm.tm_min;
- message->data.define_time_date.seconds = tm.tm_sec + 1;
- message->data.define_time_date.milliseconds = tm.tm_usec / 1000;
- message->data.define_time_date.timestamp = ts / 1000000;
- skinny_send_reply(listener, message);
- return SWITCH_STATUS_SUCCESS;
</del><ins>+ return send_define_current_time_date(listener);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_keep_alive_message(listener_t *listener, skinny_message_t *request)
</span><span class="lines">@@ -1596,173 +1910,128 @@
</span><span class="cx"> switch_status_t skinny_handle_soft_key_event_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>-
- skinny_profile_t *profile;
</del><ins>+ uint32_t line_instance = 0;
+ switch_core_session_t *session = NULL;
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><del>- uint32_t line;
</del><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx">
</span><del>-
</del><ins>+ switch_assert(listener);
</ins><span class="cx"> switch_assert(listener->profile);
</span><del>- switch_assert(listener->device_name);
</del><ins>+
+ skinny_check_data_length(request, sizeof(request->data.soft_key_event));
</ins><span class="cx">
</span><del>- profile = listener->profile;
</del><ins>+ line_instance = request->data.soft_key_event.line_instance;
</ins><span class="cx">
</span><del>- skinny_check_data_length(request, sizeof(request->data.soft_key_event));
</del><ins>+ switch(request->data.soft_key_event.event) {
+ case SOFTKEY_REDIAL:
+ status = skinny_create_ingoing_session(listener, &line_instance, &session);
</ins><span class="cx">
</span><del>- if(request->data.soft_key_event.line_instance) {
- line = request->data.soft_key_event.line_instance;
- } else {
- line = 1;
</del><ins>+ skinny_session_process_dest(session, listener, line_instance, "redial", '\0', 0);
+ break;
+ case SOFTKEY_NEWCALL:
+ status = skinny_create_ingoing_session(listener, &line_instance, &session);
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+
+ skinny_session_process_dest(session, listener, line_instance, NULL, '\0', 0);
+ break;
+ case SOFTKEY_HOLD:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
+
+ if(session) {
+ status = skinny_session_hold_line(session, listener, line_instance);
+ }
+ break;
+ case SOFTKEY_ENDCALL:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
+
+ if(session) {
+ channel = switch_core_session_get_channel(session);
+
+ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
+ }
+ break;
+ case SOFTKEY_RESUME:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
+
+ if(session) {
+ status = skinny_session_unhold_line(session, listener, line_instance);
+ }
+ break;
+ case SOFTKEY_ANSWER:
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.soft_key_event.call_id);
+
+ if(session) {
+ status = skinny_session_answer(session, listener, line_instance);
+ }
+ break;
+ default:
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
+ "Unknown SoftKeyEvent type while busy: %d.\n", request->data.soft_key_event.event);
</ins><span class="cx"> }
</span><del>- /* Close/Hold busy lines */
- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(i == line) {
- continue;
- }
- if(listener->session[i]) {
- channel = switch_core_session_get_channel(listener->session[i]);
- assert(channel != NULL);
- if((skinny_line_get_state(listener, i) == SKINNY_KEY_SET_ON_HOOK)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_OFF_HOOK)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_RING_OUT)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES)) {
</del><span class="cx">
</span><del>- switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
- channel = NULL;
- } else if((skinny_line_get_state(listener, i) == SKINNY_KEY_SET_RING_IN)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_CONNECTED)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER)
- || (skinny_line_get_state(listener, i) == SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE)) {
- skinny_hold_line(listener, i);
- } /* remaining: SKINNY_KEY_SET_ON_HOLD */
- }
</del><ins>+ if(session) {
+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><del>-
- if(!listener->session[line]) { /*the line is not busy */
- switch(request->data.soft_key_event.event) {
- case SOFTKEY_REDIAL:
- skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
-
- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
-
- strcpy(tech_pvt->dest, "redial");
- skinny_process_dest(listener, line);
- break;
- case SOFTKEY_NEWCALL:
- skinny_create_session(listener, line, SKINNY_KEY_SET_OFF_HOOK);
- break;
- default:
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
- "Unknown SoftKeyEvent type while not busy: %d.\n", request->data.soft_key_event.event);
- }
- } else { /* the line is busy */
- if(skinny_line_get_state(listener, line) == SKINNY_KEY_SET_ON_HOLD) {
- skinny_unhold_line(listener, line);
- }
- switch(request->data.soft_key_event.event) {
- case SOFTKEY_ANSWER:
- skinny_answer(listener->session[line]);
- break;
- case SOFTKEY_ENDCALL:
- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><span class="cx">
</span><del>- switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
-
- break;
- default:
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
- "Unknown SoftKeyEvent type while busy: %d.\n", request->data.soft_key_event.event);
- }
- }
</del><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_off_hook_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- skinny_profile_t *profile;
- uint32_t line;
</del><ins>+ uint32_t line_instance;
+ switch_core_session_t *session = NULL;
+ private_t *tech_pvt = NULL;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.off_hook));
</span><span class="cx">
</span><del>- if(request->data.off_hook.line_instance) {
- line = request->data.off_hook.line_instance;
</del><ins>+ if(request->data.off_hook.line_instance > 0) {
+ line_instance = request->data.off_hook.line_instance;
</ins><span class="cx"> } else {
</span><del>- line = 1;
</del><ins>+ line_instance = 1;
</ins><span class="cx"> }
</span><del>- if(listener->session[line]) { /*answering a call */
- skinny_answer(listener->session[line]);
</del><ins>+
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.off_hook.call_id);
+
+ if(session) { /*answering a call */
+ skinny_session_answer(session, listener, line_instance);
</ins><span class="cx"> } else { /* start a new call */
</span><del>- skinny_create_session(listener, line, SKINNY_KEY_SET_OFF_HOOK);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ tech_pvt = switch_core_session_get_private(session);
+ assert(tech_pvt != NULL);
+
+ skinny_session_process_dest(session, listener, line_instance, NULL, '\0', 0);
</ins><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_stimulus_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- skinny_profile_t *profile;
</del><span class="cx"> struct speed_dial_stat_res_message *button = NULL;
</span><del>- uint32_t line = 0;
- private_t *tech_pvt = NULL;
</del><ins>+ uint32_t line_instance = 0;
+ uint32_t call_id = 0;
+ switch_core_session_t *session = NULL;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
</del><ins>+ skinny_check_data_length(request, sizeof(request->data.stimulus)-sizeof(request->data.stimulus.call_id));
</ins><span class="cx">
</span><del>- profile = listener->profile;
</del><ins>+ if(skinny_check_data_length_soft(request, sizeof(request->data.stimulus))) {
+ call_id = request->data.stimulus.call_id;
+ }
</ins><span class="cx">
</span><del>- skinny_check_data_length(request, sizeof(request->data.stimulus));
-
- if(request->data.stimulus.instance_type == SKINNY_BUTTON_LINE) {/* Choose the specified line */
- line = request->data.stimulus.instance;
- }
- if(line == 0) {/* If none, find the first busy line */
- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(listener->session[i]) {
- line = i;
- break;
- }
- }
- }
- if(line == 0) {/* If none, choose the first line */
- line = 1;
- }
</del><span class="cx"> switch(request->data.stimulus.instance_type) {
</span><span class="cx"> case SKINNY_BUTTON_LAST_NUMBER_REDIAL:
</span><del>- skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
-
- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
-
- strcpy(tech_pvt->dest, "redial");
- skinny_process_dest(listener, line);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ skinny_session_process_dest(session, listener, line_instance, "redial", '\0', 0);
</ins><span class="cx"> break;
</span><span class="cx"> case SKINNY_BUTTON_VOICEMAIL:
</span><del>- skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
-
- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
-
- strcpy(tech_pvt->dest, "vmain");
- skinny_process_dest(listener, line);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ skinny_session_process_dest(session, listener, line_instance, "vmain", '\0', 0);
</ins><span class="cx"> break;
</span><span class="cx"> case SKINNY_BUTTON_SPEED_DIAL:
</span><span class="cx"> skinny_speed_dial_get(listener, request->data.stimulus.instance, &button);
</span><span class="cx"> if(strlen(button->line) > 0) {
</span><del>- skinny_create_session(listener, line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT);
-
- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
-
- strcpy(tech_pvt->dest, button->line);
- skinny_process_dest(listener, line);
</del><ins>+ skinny_create_ingoing_session(listener, &line_instance, &session);
+ skinny_session_process_dest(session, listener, line_instance, button->line, '\0', 0);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -1774,35 +2043,21 @@
</span><span class="cx"> switch_status_t skinny_handle_open_receive_channel_ack_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>- skinny_profile_t *profile;
- uint32_t line = 0;
</del><ins>+ uint32_t line_instance = 0;
+ switch_core_session_t *session;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.open_receive_channel_ack));
</span><span class="cx">
</span><del>- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(listener->session[i]) {
- private_t *tech_pvt = NULL;
- tech_pvt = switch_core_session_get_private(listener->session[i]);
-
- if(tech_pvt->party_id == request->data.open_receive_channel_ack.pass_thru_party_id) {
- line = i;
- }
- }
- }
</del><ins>+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.open_receive_channel_ack.pass_thru_party_id);
</ins><span class="cx">
</span><del>- if(listener->session[line]) {
</del><ins>+ if(session) {
</ins><span class="cx"> const char *err = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> struct in_addr addr;
</span><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- channel = switch_core_session_get_channel(listener->session[line]);
</del><ins>+ tech_pvt = switch_core_session_get_private(session);
+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><span class="cx"> /* Codec */
</span><span class="cx"> tech_pvt->iananame = "PCMU"; /* TODO */
</span><span class="lines">@@ -1810,18 +2065,18 @@
</span><span class="cx"> tech_pvt->rm_rate = 8000; /* TODO */
</span><span class="cx"> tech_pvt->rm_fmtp = NULL; /* TODO */
</span><span class="cx"> tech_pvt->agreed_pt = (switch_payload_t) 0; /* TODO */
</span><del>- tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), "");
</del><ins>+ tech_pvt->rm_encoding = switch_core_strdup(switch_core_session_get_pool(session), "");
</ins><span class="cx"> skinny_tech_set_codec(tech_pvt, 0);
</span><span class="cx"> if ((status = skinny_tech_set_codec(tech_pvt, 0)) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Request a local port from the core's allocator */
</span><span class="cx"> if (!(tech_pvt->local_sdp_audio_port = switch_rtp_request_port(listener->profile->ip))) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>- tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(listener->session[line]), listener->profile->ip);
</del><ins>+ tech_pvt->local_sdp_audio_ip = switch_core_strdup(switch_core_session_get_pool(session), listener->profile->ip);
</ins><span class="cx">
</span><span class="cx"> tech_pvt->remote_sdp_audio_ip = inet_ntoa(request->data.open_receive_channel_ack.ip);
</span><span class="cx"> tech_pvt->remote_sdp_audio_port = request->data.open_receive_channel_ack.port;
</span><span class="lines">@@ -1834,7 +2089,7 @@
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet,
</span><span class="cx"> tech_pvt->codec_ms * 1000,
</span><span class="cx"> (switch_rtp_flag_t) 0, "soft", &err,
</span><del>- switch_core_session_get_pool(listener->session[line]));
</del><ins>+ switch_core_session_get_pool(session));
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG,
</span><span class="cx"> "AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
</span><span class="cx"> switch_channel_get_name(channel),
</span><span class="lines">@@ -1846,7 +2101,7 @@
</span><span class="cx"> tech_pvt->read_impl.microseconds_per_packet / 1000,
</span><span class="cx"> switch_rtp_ready(tech_pvt->rtp_session) ? "SUCCESS" : err);
</span><span class="cx"> inet_aton(tech_pvt->local_sdp_audio_ip, &addr);
</span><del>- start_media_transmission(listener,
</del><ins>+ send_start_media_transmission(listener,
</ins><span class="cx"> tech_pvt->call_id, /* uint32_t conference_id, */
</span><span class="cx"> tech_pvt->party_id, /* uint32_t pass_thru_party_id, */
</span><span class="cx"> addr.s_addr, /* uint32_t remote_ip, */
</span><span class="lines">@@ -1858,7 +2113,12 @@
</span><span class="cx"> 0, /* uint16_t max_frames_per_packet, */
</span><span class="cx"> 0 /* uint32_t g723_bitrate */
</span><span class="cx"> );
</span><ins>+ if (switch_channel_get_state(channel) == CS_NEW) {
+ switch_channel_set_state(channel, CS_INIT);
+ }
</ins><span class="cx"> switch_channel_mark_answered(channel);
</span><ins>+
+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><span class="cx"> end:
</span><span class="cx"> return status;
</span><span class="lines">@@ -1866,35 +2126,28 @@
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_handle_keypad_button_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><del>- uint32_t line = 0;
</del><ins>+ uint32_t line_instance = 0;
+ switch_core_session_t *session;
</ins><span class="cx">
</span><span class="cx"> skinny_check_data_length(request, sizeof(request->data.keypad_button));
</span><ins>+
+ if(request->data.keypad_button.line_instance) {
+ line_instance = request->data.keypad_button.line_instance;
+ } else {
+ line_instance = 1;
+ }
</ins><span class="cx">
</span><del>- /* Choose the specified line */
- line = request->data.keypad_button.line_instance;
- if(line == 0) {/* If none, find the first busy line */
- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(listener->session[i]) {
- line = i;
- break;
- }
- }
- }
- if(line == 0) {/* If none, choose the first line */
- line = 1;
- }
- if(listener->session[line]) {
</del><ins>+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.keypad_button.call_id);
+
+ if(session) {
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> char digit = '\0';
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ channel = switch_core_session_get_channel(session);
+ tech_pvt = switch_core_session_get_private(session);
</ins><span class="cx">
</span><del>- tech_pvt = switch_core_session_get_private(listener->session[line]);
- assert(tech_pvt != NULL);
-
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[line]), SWITCH_LOG_DEBUG, "SEND DTMF ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SEND DTMF ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</ins><span class="cx">
</span><span class="cx"> if (request->data.keypad_button.button == 14) {
</span><span class="cx"> digit = '*';
</span><span class="lines">@@ -1903,21 +2156,14 @@
</span><span class="cx"> } else if (request->data.keypad_button.button >= 0 && request->data.keypad_button.button <= 9) {
</span><span class="cx"> digit = '0' + request->data.keypad_button.button;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session[line]), SWITCH_LOG_WARNING, "UNKNOW DTMF RECEIVED ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "UNKNOW DTMF RECEIVED ON CALL %d [%d]\n", tech_pvt->call_id, request->data.keypad_button.button);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* TODO check call_id and line */
</span><span class="cx">
</span><del>- if((skinny_line_get_state(listener, tech_pvt->line) == SKINNY_KEY_SET_OFF_HOOK)
- || (skinny_line_get_state(listener, tech_pvt->line) == SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT)) {
- if(strlen(tech_pvt->dest) == 0) {/* first digit */
- stop_tone(listener, tech_pvt->line, tech_pvt->call_id);
- skinny_line_set_state(listener, tech_pvt->line, SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT, tech_pvt->call_id);
- }
-
- tech_pvt->dest[strlen(tech_pvt->dest)] = digit;
-
- skinny_process_dest(listener, tech_pvt->line);
</del><ins>+ if((skinny_line_get_state(listener, line_instance, tech_pvt->call_id) == SKINNY_OFF_HOOK)) {
+
+ skinny_session_process_dest(session, listener, line_instance, NULL, digit, 0);
</ins><span class="cx"> } else {
</span><span class="cx"> if(digit != '\0') {
</span><span class="cx"> switch_dtmf_t dtmf = { 0, switch_core_default_dtmf_duration(0)};
</span><span class="lines">@@ -1925,6 +2171,7 @@
</span><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1933,35 +2180,23 @@
</span><span class="cx"> switch_status_t skinny_handle_on_hook_message(listener_t *listener, skinny_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>- skinny_profile_t *profile;
- uint32_t line = 0;
</del><ins>+ switch_core_session_t *session = NULL;
+ uint32_t line_instance = 0;
</ins><span class="cx">
</span><del>- switch_assert(listener->profile);
- switch_assert(listener->device_name);
-
- profile = listener->profile;
-
</del><span class="cx"> skinny_check_data_length(request, sizeof(request->data.on_hook));
</span><span class="cx">
</span><del>- if(request->data.on_hook.line_instance != 0) {
- line = request->data.on_hook.line_instance;
- } else {
- /* Find first active line */
- for(int i = 0 ; i < SKINNY_MAX_BUTTON_COUNT ; i++) {
- if(listener->session[i]) {
- line = i;
- break;
- }
- }
- }
</del><ins>+ line_instance = request->data.on_hook.line_instance;
+
+ session = skinny_profile_find_session(listener->profile, listener, &line_instance, request->data.on_hook.call_id);
</ins><span class="cx">
</span><del>- if(listener->session[line]) {
</del><ins>+ if(session) {
</ins><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx">
</span><del>- channel = switch_core_session_get_channel(listener->session[line]);
- assert(channel != NULL);
</del><ins>+ channel = switch_core_session_get_channel(session);
</ins><span class="cx">
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><ins>+
+ switch_core_session_rwunlock(session);
</ins><span class="cx"> }
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="lines">@@ -2069,3 +2304,14 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_protocolh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.h 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -49,57 +49,60 @@
</span><span class="cx"> /* RegisterMessage */
</span><span class="cx"> #define REGISTER_MESSAGE 0x0001
</span><span class="cx"> struct register_message {
</span><del>- char device_name[16];
- uint32_t user_id;
- uint32_t instance;
- struct in_addr ip;
- uint32_t device_type;
- uint32_t max_streams;
</del><ins>+ char device_name[16];
+ uint32_t user_id;
+ uint32_t instance;
+ struct in_addr ip;
+ uint32_t device_type;
+ uint32_t max_streams;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* PortMessage */
</span><span class="cx"> #define PORT_MESSAGE 0x0002
</span><ins>+struct port_message {
+ uint16_t port;
+};
</ins><span class="cx">
</span><span class="cx"> /* KeypadButtonMessage */
</span><span class="cx"> #define KEYPAD_BUTTON_MESSAGE 0x0003
</span><span class="cx"> struct keypad_button_message {
</span><del>- uint32_t button;
- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t button;
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* StimulusMessage */
</span><span class="cx"> #define STIMULUS_MESSAGE 0x0005
</span><span class="cx"> struct stimulus_message {
</span><del>- uint32_t instance_type; /* See enum skinny_button_definition */
- uint32_t instance;
- /* uint32_t call_reference; */
</del><ins>+ uint32_t instance_type; /* See enum skinny_button_definition */
+ uint32_t instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* OffHookMessage */
</span><span class="cx"> #define OFF_HOOK_MESSAGE 0x0006
</span><span class="cx"> struct off_hook_message {
</span><del>- uint32_t line_instance;
- /* uint32_t call_id; */
</del><ins>+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* OnHookMessage */
</span><span class="cx"> #define ON_HOOK_MESSAGE 0x0007
</span><span class="cx"> struct on_hook_message {
</span><del>- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SpeedDialStatReqMessage */
</span><span class="cx"> #define SPEED_DIAL_STAT_REQ_MESSAGE 0x000A
</span><span class="cx"> struct speed_dial_stat_req_message {
</span><del>- uint32_t number;
</del><ins>+ uint32_t number;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* LineStatReqMessage */
</span><span class="cx"> #define LINE_STAT_REQ_MESSAGE 0x000B
</span><span class="cx"> struct line_stat_req_message {
</span><del>- uint32_t number;
</del><ins>+ uint32_t number;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ConfigStatReqMessage */
</span><span class="lines">@@ -114,32 +117,32 @@
</span><span class="cx"> /* CapabilitiesResMessage */
</span><span class="cx"> #define CAPABILITIES_RES_MESSAGE 0x0010
</span><span class="cx"> struct station_capabilities {
</span><del>- uint32_t codec;
- uint16_t frames;
- char reserved[10];
</del><ins>+ uint32_t codec;
+ uint16_t frames;
+ char reserved[10];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct capabilities_res_message {
</span><del>- uint32_t count;
- struct station_capabilities caps[SWITCH_MAX_CODECS];
</del><ins>+ uint32_t count;
+ struct station_capabilities caps[SWITCH_MAX_CODECS];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* AlarmMessage */
</span><span class="cx"> #define ALARM_MESSAGE 0x0020
</span><span class="cx"> struct alarm_message {
</span><del>- uint32_t alarm_severity;
- char display_message[80];
- uint32_t alarm_param1;
- uint32_t alarm_param2;
</del><ins>+ uint32_t alarm_severity;
+ char display_message[80];
+ uint32_t alarm_param1;
+ uint32_t alarm_param2;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* OpenReceiveChannelAck */
</span><span class="cx"> #define OPEN_RECEIVE_CHANNEL_ACK_MESSAGE 0x0022
</span><span class="cx"> struct open_receive_channel_ack_message {
</span><del>- uint32_t status;
- struct in_addr ip;
- uint32_t port;
- uint32_t pass_thru_party_id;
</del><ins>+ uint32_t status;
+ struct in_addr ip;
+ uint32_t port;
+ uint32_t pass_thru_party_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SoftKeySetReqMessage */
</span><span class="lines">@@ -148,9 +151,9 @@
</span><span class="cx"> /* SoftKeyEventMessage */
</span><span class="cx"> #define SOFT_KEY_EVENT_MESSAGE 0x0026
</span><span class="cx"> struct soft_key_event_message {
</span><del>- uint32_t event;
- uint32_t line_instance;
- uint32_t callreference;
</del><ins>+ uint32_t event;
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* UnregisterMessage */
</span><span class="lines">@@ -162,196 +165,197 @@
</span><span class="cx"> /* ServiceUrlStatReqMessage */
</span><span class="cx"> #define SERVICE_URL_STAT_REQ_MESSAGE 0x0033
</span><span class="cx"> struct service_url_stat_req_message {
</span><del>- uint32_t service_url_index;
</del><ins>+ uint32_t service_url_index;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* FeatureStatReqMessage */
</span><span class="cx"> #define FEATURE_STAT_REQ_MESSAGE 0x0034
</span><span class="cx"> struct feature_stat_req_message {
</span><del>- uint32_t feature_index;
</del><ins>+ uint32_t feature_index;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* HeadsetStatusMessage */
</span><span class="cx"> #define HEADSET_STATUS_MESSAGE 0x002B
</span><span class="cx"> struct headset_status_message {
</span><del>- uint32_t mode;
</del><ins>+ uint32_t mode;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* RegisterAvailableLinesMessage */
</span><span class="cx"> #define REGISTER_AVAILABLE_LINES_MESSAGE 0x002D
</span><span class="cx"> struct register_available_lines_message {
</span><del>- uint32_t count;
</del><ins>+ uint32_t count;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* RegisterAckMessage */
</span><span class="cx"> #define REGISTER_ACK_MESSAGE 0x0081
</span><span class="cx"> struct register_ack_message {
</span><del>- uint32_t keepAlive;
- char dateFormat[6];
- char reserved[2];
- uint32_t secondaryKeepAlive;
- char reserved2[4];
</del><ins>+ uint32_t keep_alive;
+ char date_format[6];
+ char reserved[2];
+ uint32_t secondary_keep_alive;
+ char reserved2[4];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* StartToneMessage */
</span><span class="cx"> #define START_TONE_MESSAGE 0x0082
</span><span class="cx"> struct start_tone_message {
</span><del>- uint32_t tone; /* see enum skinny_tone */
- uint32_t reserved;
- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t tone; /* see enum skinny_tone */
+ uint32_t reserved;
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* StopToneMessage */
</span><span class="cx"> #define STOP_TONE_MESSAGE 0x0083
</span><span class="cx"> struct stop_tone_message {
</span><del>- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SetRingerMessage */
</span><span class="cx"> #define SET_RINGER_MESSAGE 0x0085
</span><span class="cx"> struct set_ringer_message {
</span><del>- uint32_t ring_type; /* See enum skinny_ring_type */
- uint32_t ring_mode; /* See enum skinny_ring_mode */
- uint32_t unknown; /* ?? */
</del><ins>+ uint32_t ring_type; /* See enum skinny_ring_type */
+ uint32_t ring_mode; /* See enum skinny_ring_mode */
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SetLampMessage */
</span><span class="cx"> #define SET_LAMP_MESSAGE 0x0086
</span><span class="cx"> struct set_lamp_message {
</span><del>- uint32_t stimulus; /* See enum skinny_button_definition */
- uint32_t stimulus_instance;
- uint32_t mode; /* See enum skinny_lamp_mode */
</del><ins>+ uint32_t stimulus; /* See enum skinny_button_definition */
+ uint32_t stimulus_instance;
+ uint32_t mode; /* See enum skinny_lamp_mode */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SetSpeakerModeMessage */
</span><span class="cx"> #define SET_SPEAKER_MODE_MESSAGE 0x0088
</span><span class="cx"> struct set_speaker_mode_message {
</span><del>- uint32_t mode; /* See enum skinny_speaker_mode */
</del><ins>+ uint32_t mode; /* See enum skinny_speaker_mode */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* StartMediaTransmissionMessage */
</span><span class="cx"> #define START_MEDIA_TRANSMISSION_MESSAGE 0x008A
</span><span class="cx"> struct start_media_transmission_message {
</span><del>- uint32_t conference_id;
- uint32_t pass_thru_party_id;
- uint32_t remote_ip;
- uint32_t remote_port;
- uint32_t ms_per_packet;
- uint32_t payload_capacity;
- uint32_t precedence;
- uint32_t silence_suppression;
- uint16_t max_frames_per_packet;
- uint32_t g723_bitrate;
- /* ... */
</del><ins>+ uint32_t conference_id;
+ uint32_t pass_thru_party_id;
+ uint32_t remote_ip;
+ uint32_t remote_port;
+ uint32_t ms_per_packet;
+ uint32_t payload_capacity;
+ uint32_t precedence;
+ uint32_t silence_suppression;
+ uint16_t max_frames_per_packet;
+ uint32_t g723_bitrate;
+ /* ... */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* StopMediaTransmissionMessage */
</span><span class="cx"> #define STOP_MEDIA_TRANSMISSION_MESSAGE 0x008B
</span><span class="cx"> struct stop_media_transmission_message {
</span><del>- uint32_t conference_id;
- uint32_t pass_thru_party_id;
- uint32_t conference_id2;
- /* ... */
</del><ins>+ uint32_t conference_id;
+ uint32_t pass_thru_party_id;
+ uint32_t conference_id2;
+ /* ... */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* CallInfoMessage */
</span><span class="cx"> #define CALL_INFO_MESSAGE 0x008F
</span><span class="cx"> struct call_info_message {
</span><del>- char calling_party_name[40];
- char calling_party[24];
- char called_party_name[40];
- char called_party[24];
- uint32_t line_instance;
- uint32_t call_id;
- uint32_t call_type; /* See enum skinny_call_type */
- char original_called_party_name[40];
- char original_called_party[24];
- char last_redirecting_party_name[40];
- char last_redirecting_party[24];
- uint32_t original_called_party_redirect_reason;
- uint32_t last_redirecting_reason;
- char calling_party_voice_mailbox[24];
- char called_party_voice_mailbox[24];
- char original_called_party_voice_mailbox[24];
- char last_redirecting_voice_mailbox[24];
- uint32_t call_instance;
- uint32_t call_security_status;
- uint32_t party_pi_restriction_bits;
</del><ins>+ char calling_party_name[40];
+ char calling_party[24];
+ char called_party_name[40];
+ char called_party[24];
+ uint32_t line_instance;
+ uint32_t call_id;
+ uint32_t call_type; /* See enum skinny_call_type */
+ char original_called_party_name[40];
+ char original_called_party[24];
+ char last_redirecting_party_name[40];
+ char last_redirecting_party[24];
+ uint32_t original_called_party_redirect_reason;
+ uint32_t last_redirecting_reason;
+ char calling_party_voice_mailbox[24];
+ char called_party_voice_mailbox[24];
+ char original_called_party_voice_mailbox[24];
+ char last_redirecting_voice_mailbox[24];
+ uint32_t call_instance;
+ uint32_t call_security_status;
+ uint32_t party_pi_restriction_bits;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SpeedDialStatMessage */
</span><span class="cx"> #define SPEED_DIAL_STAT_RES_MESSAGE 0x0091
</span><span class="cx"> struct speed_dial_stat_res_message {
</span><del>- uint32_t number;
- char line[24];
- char label[40];
</del><ins>+ uint32_t number;
+ char line[24];
+ char label[40];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* LineStatMessage */
</span><span class="cx"> #define LINE_STAT_RES_MESSAGE 0x0092
</span><span class="cx"> struct line_stat_res_message {
</span><del>- uint32_t number;
- char name[24];
- char shortname[40];
- char displayname[44];
</del><ins>+ uint32_t number;
+ char name[24];
+ char shortname[40];
+ char displayname[44];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ConfigStatMessage */
</span><span class="cx"> #define CONFIG_STAT_RES_MESSAGE 0x0093
</span><span class="cx"> struct config_stat_res_message {
</span><del>- char device_name[16];
- uint32_t user_id;
- uint32_t instance;
- char user_name[40];
- char server_name[40];
- uint32_t number_lines;
- uint32_t number_speed_dials;
</del><ins>+ char device_name[16];
+ uint32_t user_id;
+ uint32_t instance;
+ char user_name[40];
+ char server_name[40];
+ uint32_t number_lines;
+ uint32_t number_speed_dials;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* DefineTimeDate */
</span><span class="cx"> #define DEFINE_TIME_DATE_MESSAGE 0x0094
</span><span class="cx"> struct define_time_date_message {
</span><del>- uint32_t year;
- uint32_t month;
- uint32_t day_of_week; /* monday = 1 */
- uint32_t day;
- uint32_t hour;
- uint32_t minute;
- uint32_t seconds;
- uint32_t milliseconds;
- uint32_t timestamp;
</del><ins>+ uint32_t year;
+ uint32_t month;
+ uint32_t day_of_week; /* monday = 1 */
+ uint32_t day;
+ uint32_t hour;
+ uint32_t minute;
+ uint32_t seconds;
+ uint32_t milliseconds;
+ uint32_t timestamp;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ButtonTemplateMessage */
</span><span class="cx"> #define BUTTON_TEMPLATE_RES_MESSAGE 0x0097
</span><span class="cx"> struct button_definition {
</span><del>- uint8_t instance_number;
- uint8_t button_definition; /* See enum skinny_button_definition */
</del><ins>+ uint8_t instance_number;
+ uint8_t button_definition; /* See enum skinny_button_definition */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define SKINNY_MAX_BUTTON_COUNT 42
</span><span class="cx"> struct button_template_message {
</span><del>- uint32_t button_offset;
- uint32_t button_count;
- uint32_t total_button_count;
- struct button_definition btn[SKINNY_MAX_BUTTON_COUNT];
</del><ins>+ uint32_t button_offset;
+ uint32_t button_count;
+ uint32_t total_button_count;
+ struct button_definition btn[SKINNY_MAX_BUTTON_COUNT];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* CapabilitiesReqMessage */
</span><span class="cx"> #define CAPABILITIES_REQ_MESSAGE 0x009B
</span><span class="cx">
</span><span class="cx"> /* RegisterRejectMessage */
</span><del>-#define REGISTER_REJ_MESSAGE 0x009D
-struct register_rej_message {
- char error[33];
</del><ins>+#define REGISTER_REJECT_MESSAGE 0x009D
+struct register_reject_message {
+ char error[33];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ResetMessage */
</span><span class="cx"> #define RESET_MESSAGE 0x009F
</span><span class="cx"> struct reset_message {
</span><del>- uint32_t reset_type; /* See enum skinny_device_reset_types */
</del><ins>+ uint32_t reset_type; /* See enum skinny_device_reset_types */
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* KeepAliveAckMessage */
</span><span class="lines">@@ -360,122 +364,130 @@
</span><span class="cx"> /* OpenReceiveChannelMessage */
</span><span class="cx"> #define OPEN_RECEIVE_CHANNEL_MESSAGE 0x0105
</span><span class="cx"> struct open_receive_channel_message {
</span><del>- uint32_t conference_id;
- uint32_t pass_thru_party_id;
- uint32_t packets;
- uint32_t payload_capacity;
- uint32_t echo_cancel_type;
- uint32_t g723_bitrate;
- uint32_t conference_id2;
- uint32_t reserved[10];
</del><ins>+ uint32_t conference_id;
+ uint32_t pass_thru_party_id;
+ uint32_t packets;
+ uint32_t payload_capacity;
+ uint32_t echo_cancel_type;
+ uint32_t g723_bitrate;
+ uint32_t conference_id2;
+ uint32_t reserved[10];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* CloseReceiveChannelMessage */
</span><span class="cx"> #define CLOSE_RECEIVE_CHANNEL_MESSAGE 0x0106
</span><span class="cx"> struct close_receive_channel_message {
</span><del>- uint32_t conference_id;
- uint32_t pass_thru_party_id;
- uint32_t conference_id2;
</del><ins>+ uint32_t conference_id;
+ uint32_t pass_thru_party_id;
+ uint32_t conference_id2;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SoftKeyTemplateResMessage */
</span><span class="cx"> #define SOFT_KEY_TEMPLATE_RES_MESSAGE 0x0108
</span><span class="cx">
</span><span class="cx"> struct soft_key_template_definition {
</span><del>- char soft_key_label[16];
- uint32_t soft_key_event;
</del><ins>+ char soft_key_label[16];
+ uint32_t soft_key_event;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct soft_key_template_res_message {
</span><del>- uint32_t soft_key_offset;
- uint32_t soft_key_count;
- uint32_t total_soft_key_count;
- struct soft_key_template_definition soft_key[32];
</del><ins>+ uint32_t soft_key_offset;
+ uint32_t soft_key_count;
+ uint32_t total_soft_key_count;
+ struct soft_key_template_definition soft_key[32];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SoftKeySetResMessage */
</span><span class="cx"> #define SOFT_KEY_SET_RES_MESSAGE 0x0109
</span><span class="cx"> struct soft_key_set_definition {
</span><del>- uint8_t soft_key_template_index[16]; /* See enum skinny_soft_key_event */
- uint16_t soft_key_info_index[16];
</del><ins>+ uint8_t soft_key_template_index[16]; /* See enum skinny_soft_key_event */
+ uint16_t soft_key_info_index[16];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct soft_key_set_res_message {
</span><del>- uint32_t soft_key_set_offset;
- uint32_t soft_key_set_count;
- uint32_t total_soft_key_set_count;
- struct soft_key_set_definition soft_key_set[16];
- uint32_t res;
</del><ins>+ uint32_t soft_key_set_offset;
+ uint32_t soft_key_set_count;
+ uint32_t total_soft_key_set_count;
+ struct soft_key_set_definition soft_key_set[16];
+ uint32_t res;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* SelectSoftKeysMessage */
</span><span class="cx"> #define SELECT_SOFT_KEYS_MESSAGE 0x0110
</span><span class="cx"> struct select_soft_keys_message {
</span><del>- uint32_t line_instance;
- uint32_t call_id;
- uint32_t soft_key_set; /* See enum skinny_key_set */
- uint32_t valid_key_mask;
</del><ins>+ uint32_t line_instance;
+ uint32_t call_id;
+ uint32_t soft_key_set; /* See enum skinny_key_set */
+ uint32_t valid_key_mask;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* CallStateMessage */
</span><span class="cx"> #define CALL_STATE_MESSAGE 0x0111
</span><span class="cx"> struct call_state_message {
</span><del>- uint32_t call_state; /* See enum skinny_call_state */
- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t call_state; /* See enum skinny_call_state */
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* DisplayPromptStatusMessage */
</span><span class="cx"> #define DISPLAY_PROMPT_STATUS_MESSAGE 0x0112
</span><span class="cx"> struct display_prompt_status_message {
</span><del>- uint32_t timeout;
- char display[32];
- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t timeout;
+ char display[32];
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ClearPromptStatusMessage */
</span><span class="cx"> #define CLEAR_PROMPT_STATUS_MESSAGE 0x0113
</span><span class="cx"> struct clear_prompt_status_message {
</span><del>- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* ActivateCallPlaneMessage */
</span><span class="cx"> #define ACTIVATE_CALL_PLANE_MESSAGE 0x0116
</span><span class="cx"> struct activate_call_plane_message {
</span><del>- uint32_t line_instance;
</del><ins>+ uint32_t line_instance;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* UnregisterAckMessage */
</span><span class="cx"> #define UNREGISTER_ACK_MESSAGE 0x0118
</span><span class="cx"> struct unregister_ack_message {
</span><del>- uint32_t unregister_status;
</del><ins>+ uint32_t unregister_status;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* DialedNumberMessage */
</span><span class="cx"> #define DIALED_NUMBER_MESSAGE 0x011D
</span><span class="cx"> struct dialed_number_message {
</span><del>- char called_party[24];
- uint32_t line_instance;
- uint32_t call_id;
</del><ins>+ char called_party[24];
+ uint32_t line_instance;
+ uint32_t call_id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /* FeatureStatMessage */
</span><span class="cx"> #define FEATURE_STAT_RES_MESSAGE 0x011F
</span><span class="cx"> struct feature_stat_res_message {
</span><del>- uint32_t index;
- uint32_t id;
- char text_label[40];
- uint32_t status;
</del><ins>+ uint32_t index;
+ uint32_t id;
+ char text_label[40];
+ uint32_t status;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+/* DisplayPriNotifyMessage */
+#define DISPLAY_PRI_NOTIFY_MESSAGE 0x0120
+struct display_pri_notify_message {
+ uint32_t message_timeout;
+ uint32_t priority;
+ char notify[32];
+};
+
</ins><span class="cx"> /* ServiceUrlStatMessage */
</span><span class="cx"> #define SERVICE_URL_STAT_RES_MESSAGE 0x012F
</span><span class="cx"> struct service_url_stat_res_message {
</span><del>- uint32_t index;
- char url[256];
- char display_name[40];
</del><ins>+ uint32_t index;
+ char url[256];
+ char display_name[40];
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*****************************************************************************/
</span><span class="lines">@@ -486,54 +498,56 @@
</span><span class="cx"> #define SKINNY_MESSAGE_MAXSIZE 1000
</span><span class="cx">
</span><span class="cx"> union skinny_data {
</span><del>- struct register_message reg;
- struct keypad_button_message keypad_button;
- struct stimulus_message stimulus;
- struct off_hook_message off_hook;
- struct on_hook_message on_hook;
- struct speed_dial_stat_req_message speed_dial_req;
- struct line_stat_req_message line_req;
- struct capabilities_res_message cap_res;
- struct alarm_message alarm;
- struct open_receive_channel_ack_message open_receive_channel_ack;
- struct soft_key_event_message soft_key_event;
- struct service_url_stat_req_message service_url_req;
- struct feature_stat_req_message feature_req;
- struct headset_status_message headset_status;
- struct register_available_lines_message reg_lines;
- struct register_ack_message reg_ack;
- struct start_tone_message start_tone;
- struct stop_tone_message stop_tone;
- struct set_ringer_message ringer;
- struct set_lamp_message lamp;
- struct set_speaker_mode_message speaker_mode;
- struct start_media_transmission_message start_media;
- struct stop_media_transmission_message stop_media;
- struct call_info_message call_info;
- struct speed_dial_stat_res_message speed_dial_res;
- struct line_stat_res_message line_res;
- struct config_stat_res_message config_res;
- struct define_time_date_message define_time_date;
- struct button_template_message button_template;
- struct register_rej_message reg_rej;
- struct reset_message reset;
- struct open_receive_channel_message open_receive_channel;
- struct close_receive_channel_message close_receive_channel;
- struct soft_key_template_res_message soft_key_template;
- struct soft_key_set_res_message soft_key_set;
- struct select_soft_keys_message select_soft_keys;
- struct call_state_message call_state;
- struct display_prompt_status_message display_prompt_status;
- struct clear_prompt_status_message clear_prompt_status;
- struct activate_call_plane_message activate_call_plane;
- struct unregister_ack_message unregister_ack;
- struct dialed_number_message dialed_number;
- struct feature_stat_res_message feature_res;
- struct service_url_stat_res_message service_url_res;
-
- uint16_t as_uint16;
- char as_char;
- void *raw;
</del><ins>+ struct register_message reg;
+ struct port_message port;
+ struct keypad_button_message keypad_button;
+ struct stimulus_message stimulus;
+ struct off_hook_message off_hook;
+ struct on_hook_message on_hook;
+ struct speed_dial_stat_req_message speed_dial_req;
+ struct line_stat_req_message line_req;
+ struct capabilities_res_message cap_res;
+ struct alarm_message alarm;
+ struct open_receive_channel_ack_message open_receive_channel_ack;
+ struct soft_key_event_message soft_key_event;
+ struct service_url_stat_req_message service_url_req;
+ struct feature_stat_req_message feature_req;
+ struct headset_status_message headset_status;
+ struct register_available_lines_message reg_lines;
+ struct register_ack_message reg_ack;
+ struct start_tone_message start_tone;
+ struct stop_tone_message stop_tone;
+ struct set_ringer_message ringer;
+ struct set_lamp_message lamp;
+ struct set_speaker_mode_message speaker_mode;
+ struct start_media_transmission_message start_media;
+ struct stop_media_transmission_message stop_media;
+ struct call_info_message call_info;
+ struct speed_dial_stat_res_message speed_dial_res;
+ struct line_stat_res_message line_res;
+ struct config_stat_res_message config_res;
+ struct define_time_date_message define_time_date;
+ struct button_template_message button_template;
+ struct register_reject_message reg_rej;
+ struct reset_message reset;
+ struct open_receive_channel_message open_receive_channel;
+ struct close_receive_channel_message close_receive_channel;
+ struct soft_key_template_res_message soft_key_template;
+ struct soft_key_set_res_message soft_key_set;
+ struct select_soft_keys_message select_soft_keys;
+ struct call_state_message call_state;
+ struct display_prompt_status_message display_prompt_status;
+ struct clear_prompt_status_message clear_prompt_status;
+ struct activate_call_plane_message activate_call_plane;
+ struct unregister_ack_message unregister_ack;
+ struct dialed_number_message dialed_number;
+ struct feature_stat_res_message feature_res;
+ struct display_pri_notify_message display_pri_notify;
+ struct service_url_stat_res_message service_url_res;
+
+ uint16_t as_uint16;
+ char as_char;
+ void *raw;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*
</span><span class="lines">@@ -541,10 +555,10 @@
</span><span class="cx"> * body is type+data
</span><span class="cx"> */
</span><span class="cx"> struct skinny_message {
</span><del>- uint32_t length;
- uint32_t reserved;
- uint32_t type;
- union skinny_data data;
</del><ins>+ uint32_t length;
+ uint32_t reserved;
+ uint32_t type;
+ union skinny_data data;
</ins><span class="cx"> };
</span><span class="cx"> typedef struct skinny_message skinny_message_t;
</span><span class="cx">
</span><span class="lines">@@ -552,40 +566,40 @@
</span><span class="cx"> /* SKINNY TYPES */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> enum skinny_codecs {
</span><del>- SKINNY_CODEC_ALAW_64K = 2,
- SKINNY_CODEC_ALAW_56K = 3,
- SKINNY_CODEC_ULAW_64K = 4,
- SKINNY_CODEC_ULAW_56K = 5,
- SKINNY_CODEC_G722_64K = 6,
- SKINNY_CODEC_G722_56K = 7,
- SKINNY_CODEC_G722_48K = 8,
- SKINNY_CODEC_G723_1 = 9,
- SKINNY_CODEC_G728 = 10,
- SKINNY_CODEC_G729 = 11,
- SKINNY_CODEC_G729A = 12,
- SKINNY_CODEC_IS11172 = 13,
- SKINNY_CODEC_IS13818 = 14,
- SKINNY_CODEC_G729B = 15,
- SKINNY_CODEC_G729AB = 16,
- SKINNY_CODEC_GSM_FULL = 18,
- SKINNY_CODEC_GSM_HALF = 19,
- SKINNY_CODEC_GSM_EFULL = 20,
- SKINNY_CODEC_WIDEBAND_256K = 25,
- SKINNY_CODEC_DATA_64K = 32,
- SKINNY_CODEC_DATA_56K = 33,
- SKINNY_CODEC_GSM = 80,
- SKINNY_CODEC_ACTIVEVOICE = 81,
- SKINNY_CODEC_G726_32K = 82,
- SKINNY_CODEC_G726_24K = 83,
- SKINNY_CODEC_G726_16K = 84,
- SKINNY_CODEC_G729B_BIS = 85,
- SKINNY_CODEC_G729B_LOW = 86,
- SKINNY_CODEC_H261 = 100,
- SKINNY_CODEC_H263 = 101,
- SKINNY_CODEC_VIDEO = 102,
- SKINNY_CODEC_T120 = 105,
- SKINNY_CODEC_H224 = 106,
- SKINNY_CODEC_RFC2833_DYNPAYLOAD = 257
</del><ins>+ SKINNY_CODEC_ALAW_64K = 2,
+ SKINNY_CODEC_ALAW_56K = 3,
+ SKINNY_CODEC_ULAW_64K = 4,
+ SKINNY_CODEC_ULAW_56K = 5,
+ SKINNY_CODEC_G722_64K = 6,
+ SKINNY_CODEC_G722_56K = 7,
+ SKINNY_CODEC_G722_48K = 8,
+ SKINNY_CODEC_G723_1 = 9,
+ SKINNY_CODEC_G728 = 10,
+ SKINNY_CODEC_G729 = 11,
+ SKINNY_CODEC_G729A = 12,
+ SKINNY_CODEC_IS11172 = 13,
+ SKINNY_CODEC_IS13818 = 14,
+ SKINNY_CODEC_G729B = 15,
+ SKINNY_CODEC_G729AB = 16,
+ SKINNY_CODEC_GSM_FULL = 18,
+ SKINNY_CODEC_GSM_HALF = 19,
+ SKINNY_CODEC_GSM_EFULL = 20,
+ SKINNY_CODEC_WIDEBAND_256K = 25,
+ SKINNY_CODEC_DATA_64K = 32,
+ SKINNY_CODEC_DATA_56K = 33,
+ SKINNY_CODEC_GSM = 80,
+ SKINNY_CODEC_ACTIVEVOICE = 81,
+ SKINNY_CODEC_G726_32K = 82,
+ SKINNY_CODEC_G726_24K = 83,
+ SKINNY_CODEC_G726_16K = 84,
+ SKINNY_CODEC_G729B_BIS = 85,
+ SKINNY_CODEC_G729B_LOW = 86,
+ SKINNY_CODEC_H261 = 100,
+ SKINNY_CODEC_H263 = 101,
+ SKINNY_CODEC_VIDEO = 102,
+ SKINNY_CODEC_T120 = 105,
+ SKINNY_CODEC_H224 = 106,
+ SKINNY_CODEC_RFC2833_DYNPAYLOAD = 257
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef switch_status_t (*skinny_command_t) (char **argv, int argc, switch_stream_handle_t *stream);
</span><span class="lines">@@ -594,20 +608,28 @@
</span><span class="cx"> /* SKINNY FUNCTIONS */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> #define skinny_check_data_length(message, len) \
</span><del>- if (message->length < len+4) {\
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received Too Short Skinny Message (Expected %" SWITCH_SIZE_T_FMT ", got %d).\n", len+4, message->length);\
- return SWITCH_STATUS_FALSE;\
- }
</del><ins>+ if (message->length < len+4) {\
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received Too Short Skinny Message (Expected %" SWITCH_SIZE_T_FMT ", got %d).\n", len+4, message->length);\
+ return SWITCH_STATUS_FALSE;\
+ }
+#define skinny_check_data_length_soft(message, len) \
+ (message->length >= len+4)
</ins><span class="cx">
</span><span class="cx"> switch_status_t skinny_read_packet(listener_t *listener, skinny_message_t **req);
</span><span class="cx">
</span><span class="cx"> switch_status_t skinny_device_event(listener_t *listener, switch_event_t **ev, switch_event_types_t event_id, const char *subclass_name);
</span><span class="cx">
</span><del>-switch_status_t skinny_send_call_info(switch_core_session_t *session);
</del><ins>+switch_status_t skinny_send_call_info(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_walk_lines(skinny_profile_t *profile, char *channel_uuid, switch_core_db_callback_func_t callback, void *data);
+switch_call_cause_t skinny_ring_lines(private_t *tech_pvt);
</ins><span class="cx">
</span><del>-switch_status_t skinny_create_session(listener_t *listener, uint32_t line, uint32_t to_state);
-switch_status_t skinny_process_dest(listener_t *listener, uint32_t line);
-switch_status_t skinny_answer(switch_core_session_t *session);
</del><ins>+switch_status_t skinny_create_ingoing_session(listener_t *listener, uint32_t *line_instance, switch_core_session_t **session);
+switch_status_t skinny_session_process_dest(switch_core_session_t *session, listener_t *listener, uint32_t line_instance, char *dest, char append_dest, uint32_t backspace);
+switch_status_t skinny_session_ring_out(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_answer(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_start_media(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_hold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
+switch_status_t skinny_session_unhold_line(switch_core_session_t *session, listener_t *listener, uint32_t line_instance);
</ins><span class="cx">
</span><span class="cx"> void skinny_line_get(listener_t *listener, uint32_t instance, struct line_stat_res_message **button);
</span><span class="cx"> void skinny_speed_dial_get(listener_t *listener, uint32_t instance, struct speed_dial_stat_res_message **button);
</span><span class="lines">@@ -620,98 +642,131 @@
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> /* SKINNY MESSAGE HELPER */
</span><span class="cx"> /*****************************************************************************/
</span><del>-switch_status_t start_tone(listener_t *listener,
- uint32_t tone,
- uint32_t reserved,
- uint32_t line_instance,
- uint32_t call_id);
-switch_status_t stop_tone(listener_t *listener,
- uint32_t line_instance,
- uint32_t call_id);
-switch_status_t set_ringer(listener_t *listener,
- uint32_t ring_type,
- uint32_t ring_mode,
- uint32_t unknown);
-switch_status_t set_lamp(listener_t *listener,
- uint32_t stimulus,
- uint32_t stimulus_instance,
- uint32_t mode);
-switch_status_t set_speaker_mode(listener_t *listener,
- uint32_t mode);
-switch_status_t start_media_transmission(listener_t *listener,
- uint32_t conference_id,
- uint32_t pass_thru_party_id,
- uint32_t remote_ip,
- uint32_t remote_port,
- uint32_t ms_per_packet,
- uint32_t payload_capacity,
- uint32_t precedence,
- uint32_t silence_suppression,
- uint16_t max_frames_per_packet,
- uint32_t g723_bitrate);
-switch_status_t stop_media_transmission(listener_t *listener,
- uint32_t conference_id,
- uint32_t pass_thru_party_id,
- uint32_t conference_id2);
</del><ins>+switch_status_t send_register_ack(listener_t *listener,
+ uint32_t keep_alive,
+ char *date_format,
+ char *reserved,
+ uint32_t secondary_keep_alive,
+ char *reserved2);
+switch_status_t send_start_tone(listener_t *listener,
+ uint32_t tone,
+ uint32_t reserved,
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_stop_tone(listener_t *listener,
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_set_ringer(listener_t *listener,
+ uint32_t ring_type,
+ uint32_t ring_mode,
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_set_lamp(listener_t *listener,
+ uint32_t stimulus,
+ uint32_t stimulus_instance,
+ uint32_t mode);
+switch_status_t send_set_speaker_mode(listener_t *listener,
+ uint32_t mode);
+switch_status_t send_start_media_transmission(listener_t *listener,
+ uint32_t conference_id,
+ uint32_t pass_thru_party_id,
+ uint32_t remote_ip,
+ uint32_t remote_port,
+ uint32_t ms_per_packet,
+ uint32_t payload_capacity,
+ uint32_t precedence,
+ uint32_t silence_suppression,
+ uint16_t max_frames_per_packet,
+ uint32_t g723_bitrate);
+switch_status_t send_stop_media_transmission(listener_t *listener,
+ uint32_t conference_id,
+ uint32_t pass_thru_party_id,
+ uint32_t conference_id2);
</ins><span class="cx"> switch_status_t send_call_info(listener_t *listener,
</span><del>- char calling_party_name[40],
- char calling_party[24],
- char called_party_name[40],
- char called_party[24],
- uint32_t line_instance,
- uint32_t call_id,
- uint32_t call_type,
- char original_called_party_name[40],
- char original_called_party[24],
- char last_redirecting_party_name[40],
- char last_redirecting_party[24],
- uint32_t original_called_party_redirect_reason,
- uint32_t last_redirecting_reason,
- char calling_party_voice_mailbox[24],
- char called_party_voice_mailbox[24],
- char original_called_party_voice_mailbox[24],
- char last_redirecting_voice_mailbox[24],
- uint32_t call_instance,
- uint32_t call_security_status,
- uint32_t party_pi_restriction_bits);
-switch_status_t open_receive_channel(listener_t *listener,
- uint32_t conference_id,
- uint32_t pass_thru_party_id,
- uint32_t packets,
- uint32_t payload_capacity,
- uint32_t echo_cancel_type,
- uint32_t g723_bitrate,
- uint32_t conference_id2,
- uint32_t reserved[10]);
-switch_status_t close_receive_channel(listener_t *listener,
- uint32_t conference_id,
- uint32_t pass_thru_party_id,
- uint32_t conference_id2);
</del><ins>+ char calling_party_name[40],
+ char calling_party[24],
+ char called_party_name[40],
+ char called_party[24],
+ uint32_t line_instance,
+ uint32_t call_id,
+ uint32_t call_type,
+ char original_called_party_name[40],
+ char original_called_party[24],
+ char last_redirecting_party_name[40],
+ char last_redirecting_party[24],
+ uint32_t original_called_party_redirect_reason,
+ uint32_t last_redirecting_reason,
+ char calling_party_voice_mailbox[24],
+ char called_party_voice_mailbox[24],
+ char original_called_party_voice_mailbox[24],
+ char last_redirecting_voice_mailbox[24],
+ uint32_t call_instance,
+ uint32_t call_security_status,
+ uint32_t party_pi_restriction_bits);
+switch_status_t send_define_time_date(listener_t *listener,
+ uint32_t year,
+ uint32_t month,
+ uint32_t day_of_week, /* monday = 1 */
+ uint32_t day,
+ uint32_t hour,
+ uint32_t minute,
+ uint32_t seconds,
+ uint32_t milliseconds,
+ uint32_t timestamp);
+switch_status_t send_define_current_time_date(listener_t *listener);
+switch_status_t send_open_receive_channel(listener_t *listener,
+ uint32_t conference_id,
+ uint32_t pass_thru_party_id,
+ uint32_t packets,
+ uint32_t payload_capacity,
+ uint32_t echo_cancel_type,
+ uint32_t g723_bitrate,
+ uint32_t conference_id2,
+ uint32_t reserved[10]);
+switch_status_t send_close_receive_channel(listener_t *listener,
+ uint32_t conference_id,
+ uint32_t pass_thru_party_id,
+ uint32_t conference_id2);
</ins><span class="cx"> switch_status_t send_select_soft_keys(listener_t *listener,
</span><del>- uint32_t line_instance,
- uint32_t call_id,
- uint32_t soft_key_set,
- uint32_t valid_key_mask);
</del><ins>+ uint32_t line_instance,
+ uint32_t call_id,
+ uint32_t soft_key_set,
+ uint32_t valid_key_mask);
</ins><span class="cx"> switch_status_t send_call_state(listener_t *listener,
</span><del>- uint32_t call_state,
- uint32_t line_instance,
- uint32_t call_id);
-switch_status_t display_prompt_status(listener_t *listener,
- uint32_t timeout,
- char display[32],
- uint32_t line_instance,
- uint32_t call_id);
-switch_status_t clear_prompt_status(listener_t *listener,
- uint32_t line_instance,
- uint32_t call_id);
-switch_status_t activate_call_plane(listener_t *listener,
- uint32_t line_instance);
</del><ins>+ uint32_t call_state,
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_display_prompt_status(listener_t *listener,
+ uint32_t timeout,
+ char display[32],
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_clear_prompt_status(listener_t *listener,
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_activate_call_plane(listener_t *listener,
+ uint32_t line_instance);
</ins><span class="cx"> switch_status_t send_dialed_number(listener_t *listener,
</span><del>- char called_party[24],
- uint32_t line_instance,
- uint32_t call_id);
</del><ins>+ char called_party[24],
+ uint32_t line_instance,
+ uint32_t call_id);
+switch_status_t send_display_pri_notify(listener_t *listener,
+ uint32_t message_timeout,
+ uint32_t priority,
+ char *notify);
</ins><span class="cx"> switch_status_t send_reset(listener_t *listener,
</span><del>- uint32_t reset_type);
</del><ins>+ uint32_t reset_type);
</ins><span class="cx">
</span><span class="cx"> #endif /* _SKINNY_PROTOCOL_H */
</span><span class="cx">
</span><ins>+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.c 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -35,157 +35,169 @@
</span><span class="cx">
</span><span class="cx"> /* Translation tables */
</span><span class="cx"> struct skinny_table SKINNY_MESSAGE_TYPES[] = {
</span><del>- {"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
- {"RegisterMessage", REGISTER_MESSAGE},
- {"PortMessage", PORT_MESSAGE},
- {"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
- {"StimulusMessage", STIMULUS_MESSAGE},
- {"OffHookMessage", OFF_HOOK_MESSAGE},
- {"OnHookMessage", ON_HOOK_MESSAGE},
- {"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
- {"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
- {"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
- {"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
- {"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
- {"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
- {"AlarmMessage", ALARM_MESSAGE},
- {"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
- {"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
- {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
- {"UnregisterMessage", UNREGISTER_MESSAGE},
- {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
- {"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
- {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
- {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
- {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
- {"RegisterAckMessage", REGISTER_ACK_MESSAGE},
- {"StartToneMessage", START_TONE_MESSAGE},
- {"StopToneMessage", STOP_TONE_MESSAGE},
- {"SetRingerMessage", SET_RINGER_MESSAGE},
- {"SetLampMessage", SET_LAMP_MESSAGE},
- {"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
- {"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
- {"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
- {"CallInfoMessage", CALL_INFO_MESSAGE},
- {"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
- {"LineStatResMessage", LINE_STAT_RES_MESSAGE},
- {"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
- {"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
- {"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
- {"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
- {"RegisterRejMessage", REGISTER_REJ_MESSAGE},
- {"ResetMessage", RESET_MESSAGE},
- {"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
- {"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
- {"OCloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
- {"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
- {"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
- {"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
- {"CallStateMessage", CALL_STATE_MESSAGE},
- {"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
- {"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
- {"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
- {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
- {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
- {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
- {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
- {NULL, 0}
</del><ins>+ {"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
+ {"RegisterMessage", REGISTER_MESSAGE},
+ {"PortMessage", PORT_MESSAGE},
+ {"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
+ {"StimulusMessage", STIMULUS_MESSAGE},
+ {"OffHookMessage", OFF_HOOK_MESSAGE},
+ {"OnHookMessage", ON_HOOK_MESSAGE},
+ {"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
+ {"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
+ {"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
+ {"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
+ {"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
+ {"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
+ {"AlarmMessage", ALARM_MESSAGE},
+ {"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
+ {"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
+ {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
+ {"UnregisterMessage", UNREGISTER_MESSAGE},
+ {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
+ {"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
+ {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
+ {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
+ {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
+ {"RegisterAckMessage", REGISTER_ACK_MESSAGE},
+ {"StartToneMessage", START_TONE_MESSAGE},
+ {"StopToneMessage", STOP_TONE_MESSAGE},
+ {"SetRingerMessage", SET_RINGER_MESSAGE},
+ {"SetLampMessage", SET_LAMP_MESSAGE},
+ {"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
+ {"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
+ {"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
+ {"CallInfoMessage", CALL_INFO_MESSAGE},
+ {"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
+ {"LineStatResMessage", LINE_STAT_RES_MESSAGE},
+ {"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
+ {"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
+ {"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
+ {"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
+ {"RegisterRejectMessage", REGISTER_REJECT_MESSAGE},
+ {"ResetMessage", RESET_MESSAGE},
+ {"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
+ {"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
+ {"CloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
+ {"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
+ {"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
+ {"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
+ {"CallStateMessage", CALL_STATE_MESSAGE},
+ {"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
+ {"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
+ {"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
+ {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
+ {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
+ {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
+ {"DisplayPriNotifyMessage", DISPLAY_PRI_NOTIFY_MESSAGE},
+ {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2message_type, SKINNY_MESSAGE_TYPES, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_RING_TYPES[] = {
</span><del>- {"RingOff", SKINNY_RING_OFF},
- {"RingInside", SKINNY_RING_INSIDE},
- {"RingOutside", SKINNY_RING_OUTSIDE},
- {"RingFeature", SKINNY_RING_FEATURE},
- {NULL, 0}
</del><ins>+ {"RingOff", SKINNY_RING_OFF},
+ {"RingInside", SKINNY_RING_INSIDE},
+ {"RingOutside", SKINNY_RING_OUTSIDE},
+ {"RingFeature", SKINNY_RING_FEATURE},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_ring_type2str, SKINNY_RING_TYPES, "RingTypeUnknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2ring_type, SKINNY_RING_TYPES, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_RING_MODES[] = {
</span><del>- {"RingForever", SKINNY_RING_FOREVER},
- {"RingOnce", SKINNY_RING_ONCE},
- {NULL, 0}
</del><ins>+ {"RingForever", SKINNY_RING_FOREVER},
+ {"RingOnce", SKINNY_RING_ONCE},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_ring_mode2str, SKINNY_RING_MODES, "RingModeUnknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2ring_mode, SKINNY_RING_MODES, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_BUTTONS[] = {
</span><del>- {"Unknown", SKINNY_BUTTON_UNKNOWN},
- {"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
- {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
- {"Line", SKINNY_BUTTON_LINE},
- {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
- {"Privacy", SKINNY_BUTTON_PRIVACY},
- {"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
- {"Undefined", SKINNY_BUTTON_UNDEFINED},
- {NULL, 0}
</del><ins>+ {"Unknown", SKINNY_BUTTON_UNKNOWN},
+ {"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
+ {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
+ {"Line", SKINNY_BUTTON_LINE},
+ {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
+ {"Privacy", SKINNY_BUTTON_PRIVACY},
+ {"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
+ {"Undefined", SKINNY_BUTTON_UNDEFINED},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_button2str, SKINNY_BUTTONS, "Unknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_LAMP_MODES[] = {
</span><del>- {"Off", SKINNY_LAMP_OFF},
- {"On", SKINNY_LAMP_ON},
- {"Wink", SKINNY_LAMP_WINK},
- {"Flash", SKINNY_LAMP_FLASH},
- {"Blink", SKINNY_LAMP_BLINK},
- {NULL, 0}
</del><ins>+ {"Off", SKINNY_LAMP_OFF},
+ {"On", SKINNY_LAMP_ON},
+ {"Wink", SKINNY_LAMP_WINK},
+ {"Flash", SKINNY_LAMP_FLASH},
+ {"Blink", SKINNY_LAMP_BLINK},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_lamp_mode2str, SKINNY_LAMP_MODES, "Unknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2lamp_mode, SKINNY_LAMP_MODES, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_SPEAKER_MODES[] = {
</span><del>- {"SpeakerOn", SKINNY_SPEAKER_ON},
- {"SpeakerOff", SKINNY_SPEAKER_OFF},
- {NULL, 0}
</del><ins>+ {"SpeakerOn", SKINNY_SPEAKER_ON},
+ {"SpeakerOff", SKINNY_SPEAKER_OFF},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_speaker_mode2str, SKINNY_SPEAKER_MODES, "Unknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2speaker_mode, SKINNY_SPEAKER_MODES, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_KEY_SETS[] = {
</span><del>- {"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
- {"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
- {"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
- {"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
- {"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
- {"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
- {"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
- {"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
- {"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
- {"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
- {NULL, 0}
</del><ins>+ {"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
+ {"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
+ {"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
+ {"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
+ {"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
+ {"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
+ {"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
+ {"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
+ {"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
+ {"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_soft_key_set2str, SKINNY_KEY_SETS, "UNKNOWN_SOFT_KEY_SET")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2soft_key_set, SKINNY_KEY_SETS, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_CALL_STATES[] = {
</span><del>- {"OffHook", SKINNY_OFF_HOOK},
- {"OnHook", SKINNY_ON_HOOK},
- {"RingOut", SKINNY_RING_OUT},
- {"RingIn", SKINNY_RING_IN},
- {"Connected", SKINNY_CONNECTED},
- {"Busy", SKINNY_BUSY},
- {"Congestion", SKINNY_CONGESTION},
- {"Hold", SKINNY_HOLD},
- {"CallWaiting", SKINNY_CALL_WAITING},
- {"CallTransfer", SKINNY_CALL_TRANSFER},
- {"CallPark", SKINNY_CALL_PARK},
- {"Proceed", SKINNY_PROCEED},
- {"CallRemoteMultiline", SKINNY_CALL_REMOTE_MULTILINE},
- {"InvalidNumber", SKINNY_INVALID_NUMBER},
- {NULL, 0}
</del><ins>+ {"OffHook", SKINNY_OFF_HOOK},
+ {"OnHook", SKINNY_ON_HOOK},
+ {"RingOut", SKINNY_RING_OUT},
+ {"RingIn", SKINNY_RING_IN},
+ {"Connected", SKINNY_CONNECTED},
+ {"Busy", SKINNY_BUSY},
+ {"LineInUse", SKINNY_LINE_IN_USE},
+ {"Hold", SKINNY_HOLD},
+ {"CallWaiting", SKINNY_CALL_WAITING},
+ {"CallTransfer", SKINNY_CALL_TRANSFER},
+ {"CallPark", SKINNY_CALL_PARK},
+ {"Proceed", SKINNY_PROCEED},
+ {"InUseRemotely", SKINNY_IN_USE_REMOTELY},
+ {"InvalidNumber", SKINNY_INVALID_NUMBER},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_call_state2str, SKINNY_CALL_STATES, "CallStateUnknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2call_state, SKINNY_CALL_STATES, -1)
</span><span class="cx">
</span><span class="cx"> struct skinny_table SKINNY_DEVICE_RESET_TYPES[] = {
</span><del>- {"DeviceReset", SKINNY_DEVICE_RESET},
- {"DeviceRestart", SKINNY_DEVICE_RESTART},
- {NULL, 0}
</del><ins>+ {"DeviceReset", SKINNY_DEVICE_RESET},
+ {"DeviceRestart", SKINNY_DEVICE_RESTART},
+ {NULL, 0}
</ins><span class="cx"> };
</span><span class="cx"> SKINNY_DECLARE_ID2STR(skinny_device_reset_type2str, SKINNY_DEVICE_RESET_TYPES, "DeviceResetTypeUnknown")
</span><span class="cx"> SKINNY_DECLARE_STR2ID(skinny_str2device_reset_type, SKINNY_DEVICE_RESET_TYPES, -1)
</span><span class="cx">
</span><ins>+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnyskinny_tablesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_tables.h 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -36,74 +36,74 @@
</span><span class="cx"> /* SKINNY TABLES */
</span><span class="cx"> /*****************************************************************************/
</span><span class="cx"> struct skinny_table {
</span><del>- const char *name;
- uint32_t id;
</del><ins>+ const char *name;
+ uint32_t id;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \
</span><span class="cx"> const char *func(uint32_t id) \
</span><span class="cx"> { \
</span><del>- const char *str = DEFAULT_STR; \
- \
- for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
- if (TABLE[x].id == id) {\
- str = TABLE[x].name;\
- break;\
- }\
- }\
- \
- return str;\
</del><ins>+ const char *str = DEFAULT_STR; \
+ \
+ for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+ if (TABLE[x].id == id) {\
+ str = TABLE[x].name;\
+ break;\
+ }\
+ }\
+ \
+ return str;\
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define SKINNY_DECLARE_STR2ID(func, TABLE, DEFAULT_ID) \
</span><span class="cx"> uint32_t func(const char *str)\
</span><span class="cx"> {\
</span><del>- uint32_t id = DEFAULT_ID;\
- \
- if (*str > 47 && *str < 58) {\
- id = atoi(str);\
- } else {\
- for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
- if (!strcasecmp(TABLE[x].name, str)) {\
- id = TABLE[x].id;\
- break;\
- }\
- }\
- }\
- return id;\
</del><ins>+ uint32_t id = DEFAULT_ID;\
+ \
+ if (*str > 47 && *str < 58) {\
+ id = atoi(str);\
+ } else {\
+ for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
+ if (!strcasecmp(TABLE[x].name, str)) {\
+ id = TABLE[x].id;\
+ break;\
+ }\
+ }\
+ }\
+ return id;\
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #define SKINNY_DECLARE_PUSH_MATCH(TABLE) \
</span><del>- switch_console_callback_match_t *my_matches = NULL;\
- for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
- switch_console_push_match(&my_matches, TABLE[x].name);\
- }\
- if (my_matches) {\
- *matches = my_matches;\
- status = SWITCH_STATUS_SUCCESS;\
- }
-
</del><ins>+ switch_console_callback_match_t *my_matches = NULL;\
+ for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+ switch_console_push_match(&my_matches, TABLE[x].name);\
+ }\
+ if (my_matches) {\
+ *matches = my_matches;\
+ status = SWITCH_STATUS_SUCCESS;\
+ }
</ins><span class="cx">
</span><del>-struct skinny_table SKINNY_MESSAGE_TYPES[55];
</del><ins>+
+struct skinny_table SKINNY_MESSAGE_TYPES[56];
</ins><span class="cx"> const char *skinny_message_type2str(uint32_t id);
</span><span class="cx"> uint32_t skinny_str2message_type(const char *str);
</span><span class="cx"> #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
</span><span class="cx">
</span><span class="cx"> enum skinny_tone {
</span><del>- SKINNY_TONE_SILENCE = 0x00,
- SKINNY_TONE_DIALTONE = 0x21,
- SKINNY_TONE_BUSYTONE = 0x23,
- SKINNY_TONE_ALERT = 0x24,
- SKINNY_TONE_REORDER = 0x25,
- SKINNY_TONE_CALLWAITTONE = 0x2D,
- SKINNY_TONE_NOTONE = 0x7F,
</del><ins>+ SKINNY_TONE_SILENCE = 0x00,
+ SKINNY_TONE_DIALTONE = 0x21,
+ SKINNY_TONE_BUSYTONE = 0x23,
+ SKINNY_TONE_ALERT = 0x24,
+ SKINNY_TONE_REORDER = 0x25,
+ SKINNY_TONE_CALLWAITTONE = 0x2D,
+ SKINNY_TONE_NOTONE = 0x7F,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum skinny_ring_type {
</span><del>- SKINNY_RING_OFF = 1,
- SKINNY_RING_INSIDE = 2,
- SKINNY_RING_OUTSIDE = 3,
- SKINNY_RING_FEATURE = 4
</del><ins>+ SKINNY_RING_OFF = 1,
+ SKINNY_RING_INSIDE = 2,
+ SKINNY_RING_OUTSIDE = 3,
+ SKINNY_RING_FEATURE = 4
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_RING_TYPES[5];
</span><span class="cx"> const char *skinny_ring_type2str(uint32_t id);
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx"> #define SKINNY_PUSH_RING_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_TYPES)
</span><span class="cx">
</span><span class="cx"> enum skinny_ring_mode {
</span><del>- SKINNY_RING_FOREVER = 1,
- SKINNY_RING_ONCE = 2,
</del><ins>+ SKINNY_RING_FOREVER = 1,
+ SKINNY_RING_ONCE = 2,
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_RING_MODES[3];
</span><span class="cx"> const char *skinny_ring_mode2str(uint32_t id);
</span><span class="lines">@@ -121,11 +121,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> enum skinny_lamp_mode {
</span><del>- SKINNY_LAMP_OFF = 1,
- SKINNY_LAMP_ON = 2,
- SKINNY_LAMP_WINK = 3,
- SKINNY_LAMP_FLASH = 4,
- SKINNY_LAMP_BLINK = 5,
</del><ins>+ SKINNY_LAMP_OFF = 1,
+ SKINNY_LAMP_ON = 2,
+ SKINNY_LAMP_WINK = 3,
+ SKINNY_LAMP_FLASH = 4,
+ SKINNY_LAMP_BLINK = 5,
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_LAMP_MODES[6];
</span><span class="cx"> const char *skinny_lamp_mode2str(uint32_t id);
</span><span class="lines">@@ -133,8 +133,8 @@
</span><span class="cx"> #define SKINNY_PUSH_LAMP_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_LAMP_MODES)
</span><span class="cx">
</span><span class="cx"> enum skinny_speaker_mode {
</span><del>- SKINNY_SPEAKER_ON = 1,
- SKINNY_SPEAKER_OFF = 2,
</del><ins>+ SKINNY_SPEAKER_ON = 1,
+ SKINNY_SPEAKER_OFF = 2,
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_SPEAKER_MODES[3];
</span><span class="cx"> const char *skinny_speaker_mode2str(uint32_t id);
</span><span class="lines">@@ -142,20 +142,20 @@
</span><span class="cx"> #define SKINNY_PUSH_SPEAKER_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_SPEAKER_MODES)
</span><span class="cx">
</span><span class="cx"> enum skinny_call_type {
</span><del>- SKINNY_INBOUND_CALL = 1,
- SKINNY_OUTBOUND_CALL = 2,
- SKINNY_FORWARD_CALL = 3,
</del><ins>+ SKINNY_INBOUND_CALL = 1,
+ SKINNY_OUTBOUND_CALL = 2,
+ SKINNY_FORWARD_CALL = 3,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum skinny_button_definition {
</span><del>- SKINNY_BUTTON_UNKNOWN = 0x00,
- SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
- SKINNY_BUTTON_SPEED_DIAL = 0x02,
- SKINNY_BUTTON_LINE = 0x09,
- SKINNY_BUTTON_VOICEMAIL = 0x0F,
- SKINNY_BUTTON_PRIVACY = 0x13,
- SKINNY_BUTTON_SERVICE_URL = 0x14,
- SKINNY_BUTTON_UNDEFINED = 0xFF,
</del><ins>+ SKINNY_BUTTON_UNKNOWN = 0x00,
+ SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
+ SKINNY_BUTTON_SPEED_DIAL = 0x02,
+ SKINNY_BUTTON_LINE = 0x09,
+ SKINNY_BUTTON_VOICEMAIL = 0x0F,
+ SKINNY_BUTTON_PRIVACY = 0x13,
+ SKINNY_BUTTON_SERVICE_URL = 0x14,
+ SKINNY_BUTTON_UNDEFINED = 0xFF,
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_BUTTONS[9];
</span><span class="cx"> const char *skinny_button2str(uint32_t id);
</span><span class="lines">@@ -163,39 +163,39 @@
</span><span class="cx"> #define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)
</span><span class="cx">
</span><span class="cx"> enum skinny_soft_key_event {
</span><del>- SOFTKEY_REDIAL = 0x01,
- SOFTKEY_NEWCALL = 0x02,
- SOFTKEY_HOLD = 0x03,
- SOFTKEY_TRANSFER = 0x04,
- SOFTKEY_CFWDALL = 0x05,
- SOFTKEY_CFWDBUSY = 0x06,
- SOFTKEY_CFWDNOANSWER = 0x07,
- SOFTKEY_BACKSPACE = 0x08,
- SOFTKEY_ENDCALL = 0x09,
- SOFTKEY_RESUME = 0x0A,
- SOFTKEY_ANSWER = 0x0B,
- SOFTKEY_INFO = 0x0C,
- SOFTKEY_CONFRM = 0x0D,
- SOFTKEY_PARK = 0x0E,
- SOFTKEY_JOIN = 0x0F,
- SOFTKEY_MEETMECONFRM = 0x10,
- SOFTKEY_CALLPICKUP = 0x11,
- SOFTKEY_GRPCALLPICKUP = 0x12,
- SOFTKEY_DND = 0x13,
- SOFTKEY_IDIVERT = 0x14,
</del><ins>+ SOFTKEY_REDIAL = 0x01,
+ SOFTKEY_NEWCALL = 0x02,
+ SOFTKEY_HOLD = 0x03,
+ SOFTKEY_TRANSFER = 0x04,
+ SOFTKEY_CFWDALL = 0x05,
+ SOFTKEY_CFWDBUSY = 0x06,
+ SOFTKEY_CFWDNOANSWER = 0x07,
+ SOFTKEY_BACKSPACE = 0x08,
+ SOFTKEY_ENDCALL = 0x09,
+ SOFTKEY_RESUME = 0x0A,
+ SOFTKEY_ANSWER = 0x0B,
+ SOFTKEY_INFO = 0x0C,
+ SOFTKEY_CONFRM = 0x0D,
+ SOFTKEY_PARK = 0x0E,
+ SOFTKEY_JOIN = 0x0F,
+ SOFTKEY_MEETMECONFRM = 0x10,
+ SOFTKEY_CALLPICKUP = 0x11,
+ SOFTKEY_GRPCALLPICKUP = 0x12,
+ SOFTKEY_DND = 0x13,
+ SOFTKEY_IDIVERT = 0x14,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum skinny_key_set {
</span><del>- SKINNY_KEY_SET_ON_HOOK = 0,
- SKINNY_KEY_SET_CONNECTED = 1,
- SKINNY_KEY_SET_ON_HOLD = 2,
- SKINNY_KEY_SET_RING_IN = 3,
- SKINNY_KEY_SET_OFF_HOOK = 4,
- SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
- SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
- SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
- SKINNY_KEY_SET_RING_OUT = 8,
- SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
</del><ins>+ SKINNY_KEY_SET_ON_HOOK = 0,
+ SKINNY_KEY_SET_CONNECTED = 1,
+ SKINNY_KEY_SET_ON_HOLD = 2,
+ SKINNY_KEY_SET_RING_IN = 3,
+ SKINNY_KEY_SET_OFF_HOOK = 4,
+ SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
+ SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
+ SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
+ SKINNY_KEY_SET_RING_OUT = 8,
+ SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_KEY_SETS[11];
</span><span class="cx"> const char *skinny_soft_key_set2str(uint32_t id);
</span><span class="lines">@@ -204,20 +204,20 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> enum skinny_call_state {
</span><del>- SKINNY_OFF_HOOK = 1,
- SKINNY_ON_HOOK = 2,
- SKINNY_RING_OUT = 3,
- SKINNY_RING_IN = 4,
- SKINNY_CONNECTED = 5,
- SKINNY_BUSY = 6,
- SKINNY_CONGESTION = 7,
- SKINNY_HOLD = 8,
- SKINNY_CALL_WAITING = 9,
- SKINNY_CALL_TRANSFER = 10,
- SKINNY_CALL_PARK = 11,
- SKINNY_PROCEED = 12,
- SKINNY_CALL_REMOTE_MULTILINE = 13,
- SKINNY_INVALID_NUMBER = 14
</del><ins>+ SKINNY_OFF_HOOK = 1,
+ SKINNY_ON_HOOK = 2,
+ SKINNY_RING_OUT = 3,
+ SKINNY_RING_IN = 4,
+ SKINNY_CONNECTED = 5,
+ SKINNY_BUSY = 6,
+ SKINNY_LINE_IN_USE = 7,
+ SKINNY_HOLD = 8,
+ SKINNY_CALL_WAITING = 9,
+ SKINNY_CALL_TRANSFER = 10,
+ SKINNY_CALL_PARK = 11,
+ SKINNY_PROCEED = 12,
+ SKINNY_IN_USE_REMOTELY = 13,
+ SKINNY_INVALID_NUMBER = 14
</ins><span class="cx"> };
</span><span class="cx"> struct skinny_table SKINNY_CALL_STATES[15];
</span><span class="cx"> const char *skinny_call_state2str(uint32_t id);
</span><span class="lines">@@ -235,3 +235,14 @@
</span><span class="cx">
</span><span class="cx"> #endif /* _SKINNY_TABLES_H */
</span><span class="cx">
</span><ins>+/* For Emacs:
+ * Local Variables:
+ * mode:c
+ * indent-tabs-mode:t
+ * tab-width:4
+ * c-basic-offset:4
+ * End:
+ * For VIM:
+ * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
+ */
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skinnytestskinnypl"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/test-skinny.pl 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -11,12 +11,13 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><ins>+use Sys::Hostname;
</ins><span class="cx"> use Net::Skinny;
</span><span class="cx"> use Net::Skinny::Protocol qw/:all/;
</span><span class="cx"> use Net::Skinny::Message;
</span><span class="cx">
</span><span class="cx"> #Config
</span><del>-my $skinny_server = '127.0.0.1';
</del><ins>+my $skinny_server = hostname;
</ins><span class="cx"> my $device_name = "SEP001120AABBCC";
</span><span class="cx"> my $device_ip = 10+256*(11+256*(12+256*13)); # 10.11.12.13
</span><span class="cx"> #======
</span><span class="lines">@@ -70,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> $socket->send_message(SOFT_KEY_SET_REQ_MESSAGE);
</span><span class="cx"> $socket->receive_message(); # SoftKeySetRes
</span><ins>+$socket->receive_message(); # SelectSoftKeys
</ins><span class="cx">
</span><span class="cx"> $socket->send_message(
</span><span class="cx"> LINE_STAT_REQ_MESSAGE,
</span><span class="lines">@@ -82,8 +84,68 @@
</span><span class="cx"> count => 2
</span><span class="cx"> );
</span><span class="cx">
</span><del>-while(1) {
- $socket->sleep(20);
</del><ins>+for(my $i = 0; $i < 1; $i++) {
+ $socket->sleep(5);
</ins><span class="cx"> $socket->send_message(KEEP_ALIVE_MESSAGE);
</span><span class="cx"> $socket->receive_message(); # keepaliveack
</span><span class="cx"> }
</span><ins>+$socket->sleep(5);
+
+#NewCall
+$socket->send_message(
+ SOFT_KEY_EVENT_MESSAGE,
+ event => 2, #NewCall
+ line_instance => 2,
+ call_id => 0
+ );
+$socket->receive_message(); # SetRinger
+$socket->receive_message(); # SetSpeakerMode
+$socket->receive_message(); # SetLamp
+$socket->receive_message(); # SelectSoftKeys
+$socket->receive_message(); # DisplayPromptStatus
+$socket->receive_message(); # ActivateCallPlane
+$socket->receive_message(); # StartTone
+
+$socket->sleep(5);
+
+#VoiceMail
+$socket->send_message(
+ STIMULUS_MESSAGE,
+ instance_type => 0xf, #VoiceMail
+ instance => 0,
+ );
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+$socket->receive_message(); #
+
+#
+$socket->send_message(
+ OPEN_RECEIVE_CHANNEL_ACK_MESSAGE,
+ status => 1,
+ ip => $device_ip,
+ port => 12,
+ pass_thru_party_id => 0,
+ );
+$socket->receive_message(); # StartMediaTransmission
+
+$socket->sleep(20);
+
+#EndCall
+$socket->send_message(
+ SOFT_KEY_EVENT_MESSAGE,
+ event => 0x09, #NewCall
+ line_instance => 1,
+ call_id => 0
+ );
+
+while(1) {
+ $socket->receive_message();
+}
+
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypopenMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypopen/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypopen/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypopen/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -2,6 +2,6 @@
</span><span class="cx"> MODNAME=mod_skypopen
</span><span class="cx"> mod_LTLIBRARIES = mod_skypopen.la
</span><span class="cx"> mod_skypopen_la_SOURCES = mod_skypopen.c skypopen_protocol.c
</span><del>-mod_skypopen_la_CFLAGS = $(AM_CFLAGS) -DSKYPOPEN_SVN_VERSION=\"`cat $(switch_builddir)/.version`\" -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff
</del><ins>+mod_skypopen_la_CFLAGS = $(AM_CFLAGS) -DSKYPOPEN_SVN_VERSION=\"`git describe`\" -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff
</ins><span class="cx"> mod_skypopen_la_LIBADD = $(switch_builddir)/libfreeswitch.la
</span><span class="cx"> mod_skypopen_la_LDFLAGS = -L../../../../libs/spandsp/src -avoid-version -module -no-undefined -shared -lX11 -lspandsp
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_portaudio_streamMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/formats/mod_portaudio_stream/Makefile.am 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx">
</span><span class="cx"> mod_LTLIBRARIES = mod_portaudio_stream.la
</span><span class="cx"> mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c $(MODPA_DIR)/pablio.c $(MODPA_DIR)/pa_ringbuffer.c
</span><del>-mod_portaudio_stream_la_CFLAGS = $(AM_CFLAGS)
-mod_portaudio_stream_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR)
</del><ins>+mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS)
</ins><span class="cx"> mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
</span><span class="cx"> mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedfreeswitch_wrapcxx"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -21403,6 +21403,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_export_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4, int jarg5) {
+ int jresult ;
+ switch_channel_t *arg1 = (switch_channel_t *) 0 ;
+ char *arg2 = (char *) 0 ;
+ char *arg3 = (char *) 0 ;
+ switch_bool_t arg4 ;
+ switch_bool_t arg5 ;
+ switch_status_t result;
+
+ arg1 = (switch_channel_t *)jarg1;
+ arg2 = (char *)jarg2;
+ arg3 = (char *)jarg3;
+ arg4 = (switch_bool_t)jarg4;
+ arg5 = (switch_bool_t)jarg5;
+ result = (switch_status_t)switch_channel_export_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4,arg5);
+ jresult = result;
+ return jresult;
+}
+
+
</ins><span class="cx"> SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3) {
</span><span class="cx"> char * jresult ;
</span><span class="cx"> switch_channel_t *arg1 = (switch_channel_t *) 0 ;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManageddll"></a>
<div class="delfile"><h4>Deleted: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.dll</h4></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedFreeSWITCHManagedpdb"></a>
<div class="delfile"><h4>Deleted: freeswitch/trunk/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.pdb</h4></div>
<a id="freeswitchtrunksrcmodlanguagesmod_managedmanagedswigcs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (17207 => 17208)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-04-02 18:52:16 UTC (rev 17207)
+++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 2010-04-02 18:52:35 UTC (rev 17208)
</span><span class="lines">@@ -2904,6 +2904,11 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ public static switch_status_t switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check, switch_bool_t nolocal) {
+ switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_export_variable_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check, (int)nolocal);
+ return ret;
+ }
+
</ins><span class="cx"> public static string switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel channel, string varname, switch_bool_t dup) {
</span><span class="cx"> string ret = freeswitchPINVOKE.switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, (int)dup);
</span><span class="cx"> return ret;
</span><span class="lines">@@ -10209,6 +10214,9 @@
</span><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_partner")]
</span><span class="cx"> public static extern string switch_channel_get_variable_partner(HandleRef jarg1, string jarg2);
</span><span class="cx">
</span><ins>+ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_export_variable_var_check")]
+ public static extern int switch_channel_export_variable_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4, int jarg5);
+
</ins><span class="cx"> [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_dup")]
</span><span class="cx"> public static extern string switch_channel_get_variable_dup(HandleRef jarg1, string jarg2, int jarg3);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodtimersempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/timers/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/src/switch_channel.c
</span><span class="cx">===================================================================
</span><del>--- freeswitch/trunk/src/switch_channel.c 2010-04-02 18:52:16 UTC (rev 17207)
</del><ins>+++ freeswitch/trunk/src/switch_channel.c 2010-04-02 18:52:35 UTC (rev 17208)
</ins><span class="lines">@@ -737,6 +737,37 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_channel_export_variable_var_check(switch_channel_t *channel, const char *varname, const char *value, switch_bool_t var_check, switch_bool_t nolocal)
+{
+ const char *exports, *exports_varname = varname;
+ switch_status_t status;
+
+ exports = switch_channel_get_variable(channel, SWITCH_EXPORT_VARS_VARIABLE);
+
+ if (nolocal) {
+ exports_varname = switch_mprintf("nolocal:%s", varname);
+ }
+
+ if ((status = switch_channel_set_variable_var_check(channel, exports_varname, value, var_check)) != SWITCH_STATUS_SUCCESS) {
+ goto done;
+ }
+
+ if (varname && value) {
+ if (exports) {
+ switch_channel_set_variable_printf(channel, SWITCH_EXPORT_VARS_VARIABLE, "%s,%s", exports, exports_varname);
+ } else {
+ switch_channel_set_variable(channel, SWITCH_EXPORT_VARS_VARIABLE, exports_varname);
+ }
+ }
+
+done:
+ if (exports_varname != varname) {
+ free((char*)exports_varname);
+ }
+
+ return status;
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel,
</span><span class="cx"> const char *varname, const char *value, switch_bool_t var_check)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkwebetcempty"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/web/etc/.empty ( => )</h4>
<pre class="diff"><span>
<span class="info">
Modified: freeswitch/trunk/web/planet/.empty
</span><span class="cx">===================================================================
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>