Merge branch 'master' of git.freeswitch.org:freeswitch

.gitignore

@@ -8,6 +8,28 @@
 .deps
 .\#*
 \#*
+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
 .version
 AUTHORS
 COPYING
@@ -17,6 +39,7 @@ Makefile.in
 NEWS
 README
 aclocal.m4
+autom4te.cache
 build/Makefile
 build/Makefile.in
 build/config/compile
@@ -29,9 +52,11 @@ build/freeswitch.pc
 build/getlib.sh
 build/getsounds.sh
 build/modmake.rules
+config.cache
 config.log
 config.status
 configure
+configure.lineno
 freeswitch
 fs_cli
 fs_ivrd

Makefile.am

@@ -349,7 +349,21 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree
 	  cat src/include/switch_version.h.in > src/include/switch_version.h ; \
 	  touch .version ; \
 	else \
-	  version=`svnversion . -n || echo hacked` ; \
+	  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 ; \
 	  oldversion=`cat .version 2>/dev/null || echo "0"` ; \
 	  if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
 	    cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
@@ -437,23 +451,30 @@ install-data-local:
 	test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
 	test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
 
-is-svn:
+is-scm:
-	@if [ ! -d .svn ] ; then \
+	@if [ ! -d .svn -a ! -d .git ] ; then \
 		echo ; echo ; \
-		echo "**************************************************************************************************" ; \
+		echo "*****************************************************************************************************" ; \
-		echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \
+		echo "You can not update a release tarball or without a git or svn working copy please clone our git tree: " ; \
-		echo "**************************************************************************************************" ; \
+		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 "*****************************************************************************************************" ; \
 		echo ; echo ; \
 		exit 1; \
 	fi 
 
-update: is-svn
+update: is-scm
 	@if test -d .svn ; then \
 	  test ! -f .version || rm -f .version ; \
 	  echo Updating... ; \
 	  svn update ; \
+	elif test -d .git ; then \
+	  test ! -f .version || rm -f .version ; \
+	  echo "Pulling updates..." ; \
+	  git pull ; \
 	else \
-	  echo "This source directory is not an svn working copy" ; \
+	  echo "This source directory is not a git tree or svn working copy" ; \
 	fi
 
 .nodepends:
@@ -483,18 +504,18 @@ core_install: install_core
 
 everything: install
 
-up: is-svn clean
+up: is-scm clean
-	svn update
+	$(MAKE) update
 	$(MAKE) -j core
 	$(MAKE) -j modules
 	$(MAKE) install
 
-sync: is-svn
+sync: is-scm
-	svn update
+	$(MAKE) update
 	$(MAKE) install
 
-speedy-sync: is-svn
+speedy-sync: is-scm
-	svn update
+	$(MAKE) update
 	$(MAKE) -j install
 
 libs/openzap/Makefile:
@@ -570,15 +591,15 @@ cluecon:
 	@echo
 	@echo http://www.cluecon.com
 	@sleep 5
-current: cluecon is-svn update-clean
+current: cluecon update-clean is-scm
-	svn update
+	$(MAKE) update
 	$(MAKE) all
 	$(MAKE) install
 
 installall: current
 
-speedy-current: is-svn update-clean
+speedy-current: update-clean is-scm
-	svn update
+	$(MAKE) update
 	$(MAKE) speedy-sure
 	$(MAKE) install
 

build/swigall.sh

@@ -1,6 +1,6 @@
 cd src/mod/languages/mod_lua
 make swigclean
-make mod_lua_wrap.cpp
+make lua_wrap
 cd ../../../..
 
 cd src/mod/languages/mod_perl

configure.in

@@ -3,11 +3,11 @@
 
 # Must change all of the below together
 # For a release, set revision for that tagged release as well and uncomment
-AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS)
+AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS)
 AC_SUBST(SWITCH_VERSION_MAJOR, [1])
 AC_SUBST(SWITCH_VERSION_MINOR, [0])
-AC_SUBST(SWITCH_VERSION_MICRO, [trunk])
+AC_SUBST(SWITCH_VERSION_MICRO, [head])
-#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
+#AC_SUBST(SWITCH_VERSION_REVISION, [])
 
 AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
 AC_CONFIG_FILES([.version:.version.in])

libs/.gitignore

@@ -189,6 +189,9 @@ ilbc/src/ilbc.h
 ilbc/src/stamp-h1
 ilbc/tests/Makefile
 ilbc/tests/Makefile.in
+js/nsprpub/lib/ds/libplds4.so.1
+js/nsprpub/lib/libc/src/libplc4.so.1
+js/nsprpub/pr/src/libnspr4.so.1
 js/Makefile
 js/aclocal.m4
 js/config.guess
@@ -990,3 +993,74 @@ unimrcp/build/acmacros/ltoptions.m4
 unimrcp/build/acmacros/ltsugar.m4
 unimrcp/build/acmacros/ltversion.m4
 unimrcp/build/acmacros/lt~obsolete.m4
+*.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

libs/freetdm/Makefile.am

@@ -105,7 +105,7 @@ core-install: install-libLTLIBRARIES
 #
 # tools & test programs
 #
-noinst_PROGRAMS = testtones detect_tones detect_dtmf testisdn testpri testr2 testanalog testapp testcid
+noinst_PROGRAMS = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid #testisdn
 if HAVE_SCTP
 noinst_PROGRAMS += testboost
 endif
@@ -131,9 +131,9 @@ detect_dtmf_SOURCES = $(SRC)/detect_dtmf.c
 detect_dtmf_LDADD   = libfreetdm.la
 detect_dtmf_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
 
-testisdn_SOURCES = $(SRC)/testisdn.c
+#testisdn_SOURCES = $(SRC)/testisdn.c
-testisdn_LDADD   = libfreetdm.la
+#testisdn_LDADD   = libfreetdm.la
-testisdn_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
+#testisdn_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
 
 testpri_SOURCES = $(SRC)/testpri.c
 testpri_LDADD   = libfreetdm.la
@@ -160,7 +160,7 @@ testanalog_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)
 #
 # ftmod modules
 #
-mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_isdn.la ftmod_analog.la ftmod_analog_em.la 
+mod_LTLIBRARIES = ftmod_zt.la ftmod_skel.la ftmod_analog.la ftmod_analog_em.la #ftmod_isdn.la
 
 
 if HAVE_SCTP 
@@ -196,32 +196,32 @@ ftmod_wanpipe_la_LDFLAGS = -module -avoid-version -lsangoma
 ftmod_wanpipe_la_LIBADD  = $(MYLIB)
 endif
 
-ftmod_isdn_la_SOURCES = \
+#ftmod_isdn_la_SOURCES = \
-$(SRC)/isdn/EuroISDNStateNT.c \
+#$(SRC)/isdn/EuroISDNStateNT.c \
-$(SRC)/isdn/EuroISDNStateTE.c \
+#$(SRC)/isdn/EuroISDNStateTE.c \
-$(SRC)/isdn/mfifo.c \
+#$(SRC)/isdn/mfifo.c \
-$(SRC)/isdn/Q921.c \
+#$(SRC)/isdn/Q921.c \
-$(SRC)/isdn/Q931api.c \
+#$(SRC)/isdn/Q931api.c \
-$(SRC)/isdn/Q931.c \
+#$(SRC)/isdn/Q931.c \
-$(SRC)/isdn/Q931ie.c \
+#$(SRC)/isdn/Q931ie.c \
-$(SRC)/isdn/Q931mes.c \
+#$(SRC)/isdn/Q931mes.c \
-$(SRC)/isdn/Q931StateNT.c \
+#$(SRC)/isdn/Q931StateNT.c \
-$(SRC)/isdn/Q931StateTE.c \
+#$(SRC)/isdn/Q931StateTE.c \
-$(SRC)/isdn/nationalmes.c \
+#$(SRC)/isdn/nationalmes.c \
-$(SRC)/isdn/nationalStateNT.c \
+#$(SRC)/isdn/nationalStateNT.c \
-$(SRC)/isdn/nationalStateTE.c \
+#$(SRC)/isdn/nationalStateTE.c \
-$(SRC)/isdn/DMSmes.c \
+#$(SRC)/isdn/DMSmes.c \
-$(SRC)/isdn/DMSStateNT.c \
+#$(SRC)/isdn/DMSStateNT.c \
-$(SRC)/isdn/DMSStateTE.c \
+#$(SRC)/isdn/DMSStateTE.c \
-$(SRC)/isdn/5ESSmes.c \
+#$(SRC)/isdn/5ESSmes.c \
-$(SRC)/isdn/5ESSStateNT.c \
+#$(SRC)/isdn/5ESSStateNT.c \
-$(SRC)/isdn/5ESSStateTE.c \
+#$(SRC)/isdn/5ESSStateTE.c \
-$(SRC)/isdn/Q932mes.c \
+#$(SRC)/isdn/Q932mes.c \
-$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
+#$(SRC)/ftmod/ftmod_isdn/ftmod_isdn.c
 
-ftmod_isdn_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
+#ftmod_isdn_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS) -D_GNU_SOURCE
-ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
+#ftmod_isdn_la_LDFLAGS = $(PCAP_LIB_FLAGS) -module -avoid-version
-ftmod_isdn_la_LIBADD  = $(MYLIB)
+#ftmod_isdn_la_LIBADD  = $(MYLIB)
 
 ftmod_analog_la_SOURCES = $(SRC)/ftmod/ftmod_analog/ftmod_analog.c
 ftmod_analog_la_CFLAGS  = $(AM_CFLAGS) $(MY_CFLAGS)

libs/sofia-sip/configure.ac

@@ -100,13 +100,16 @@ if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
     fi
 fi
 
+SOFIA_PLAT_CFLAGS=
 # openbsd seems to not define NULL as a void pointer, I blame standards by committee for this.
 # This is a dirty hack, but shuts up all the warnings
 case "$host" in
-     *-openbsd*) SOFIA_CFLAGS="$SOFIA_CFLAGS -DNULL='(void *) 0L'";;
+     *-openbsd*) SOFIA_PLAT_CFLAGS="-DNULL='(void *) 0L'";;
      *) ;;
 esac
 
+AC_SUBST(SOFIA_PLAT_CFLAGS, $SOFIA_PLAT_CFLAGS)
+
 
 ### checks for header files
 ### -----------------------

libs/sofia-sip/libsofia-sip-ua/sofia.am

@@ -1,7 +1,7 @@
 # common Makefile targets for libsofia-sip-ua modules
 # ---------------------------------------------------
 
-AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_CFLAGS) $(SOFIA_COVERAGE) $(SOFIA_PLAT_CFLAGS)
 
 # Use with --enable-ndebug
 if NDEBUG

libs/sofia-sip/rules/sofia.am

@@ -4,7 +4,7 @@
 sofiasrcdir = ${top_srcdir}/libsofia-sip-ua
 sofiabuilddir = ${top_builddir}/libsofia-sip-ua
 
-AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS)
+AM_CFLAGS = $(CWFLAG) $(SOFIA_COVERAGE) $(SOFIA_CFLAGS) $(openssl_CFLAGS) $(SOFIA_PLAT_CFLAGS)
 
 SOFIA_COVERAGE = $(COVERAGE_FLAGS)
 

scripts/tagscript.sh

@@ -35,11 +35,12 @@ fi
 sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
     -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
     -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
-    -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+    -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \
     -i configure.in
 
 if [ -n "$rev" ]; then
-    sed -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
+    sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+        -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
         -i configure.in
 fi
 
@@ -61,16 +62,17 @@ rm -f docs/COPYING
 rm -f docs/ChangeLog
 rm -rf .git
 cd ..
-tar -czvf $dst_name.tar.gz $dst_dir
+tar -cvf $dst_name.tar $dst_dir
-tar -cjvf $dst_name.tar.bz2 $dst_dir
+gzip -9 -c $dst_name.tar > $dst_name.tar.gz || echo "gzip not available"
-tar -cJvf $dst_name.tar.xz $dst_dir
+bzip2 -z -k $dst_name.tar || echo "bzip2 not available"
-rm -rf $dst_dir
+xz -z -9 -k $dst_name.tar || echo "xz / xz-utils not available"
+rm -rf $dst_name.tar $dst_dir
 
 cat 1>&2 <<EOF
 ----------------------------------------------------------------------
 The v$ver tag has been committed locally, but it will not be
-globally visible until you 'git push' this repository up to the server
+globally visible until you 'git push --tags' this repository up to the
-(I didn't do that for you).
+server (I didn't do that for you, as you might want to review first).
 ----------------------------------------------------------------------
 EOF
 

src/include/switch_channel.h

@@ -245,6 +245,11 @@ SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_
 #define switch_channel_set_variable(_channel, _var, _val) switch_channel_set_variable_var_check(_channel, _var, _val, SWITCH_TRUE)
 #define switch_channel_set_variable_partner(_channel, _var, _val) switch_channel_set_variable_partner_var_check(_channel, _var, _val, SWITCH_TRUE)
 
+
+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)
+
 /*!
   \brief Retrieve a variable from a given channel
   \param channel channel to retrieve variable from

src/mod/.gitignore

@@ -50,3 +50,10 @@ loggers/mod_logfile/Makefile
 loggers/mod_syslog/Makefile
 say/mod_say_en/Makefile
 say/mod_say_ru/Makefile
+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

src/mod/applications/mod_cidlookup/mod_cidlookup.c

@@ -25,7 +25,7 @@
  * 
  * Rupa Schomaker <rupa@rupa.com>
  *
- * mod_cidlookup.c -- API for querying cid->name services
+ * mod_cidlookup.c -- API for querying cid->name services and local data
  *
  */
 

src/mod/applications/mod_enum/Makefile.am

@@ -2,13 +2,12 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_enum
 
 UDNS_DIR=$(switch_srcdir)/libs/udns
-AM_CFLAGS += -I$(UDNS_DIR) -DHAVE_POLL
+mod_enum_la_CFLAGS = -I$(UDNS_DIR) -DHAVE_POLL $(AM_CFLAGS)
 
 mod_LTLIBRARIES = mod_enum.la
 mod_enum_la_SOURCES  = mod_enum.c 
 mod_enum_la_SOURCES += $(UDNS_DIR)/udns_dn.c $(UDNS_DIR)/udns_dntosp.c $(UDNS_DIR)/udns_parse.c $(UDNS_DIR)/udns_misc.c
 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
 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
-mod_enum_la_CFLAGS   = $(AM_CFLAGS)
 mod_enum_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_enum_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/endpoints/mod_portaudio/Makefile.am

@@ -6,8 +6,7 @@ PALA=$(switch_builddir)/libs/portaudio/lib/libportaudio.la
 
 mod_LTLIBRARIES = mod_portaudio.la
 mod_portaudio_la_SOURCES = mod_portaudio.c pablio.c pa_ringbuffer.c
-mod_portaudio_la_CFLAGS  = $(AM_CFLAGS)
+mod_portaudio_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 $(AM_CFLAGS)
-mod_portaudio_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 
 mod_portaudio_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
 mod_portaudio_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
 

src/mod/endpoints/mod_skinny/Makefile.am

@@ -3,7 +3,7 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_skinny
 
 mod_LTLIBRARIES = mod_skinny.la
-mod_skinny_la_SOURCES  = mod_skinny.c skinny_protocol.c skinny_tables.c
+mod_skinny_la_SOURCES  = mod_skinny.c skinny_protocol.c skinny_tables.c skinny_api.c
-mod_skinny_la_CFLAGS   = $(AM_CFLAGS) -DSKINNY_SVN_VERSION=\"`cat $(switch_builddir)/.version`\"
+mod_skinny_la_CFLAGS   = $(AM_CFLAGS)
 mod_skinny_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_skinny_la_LDFLAGS  = -avoid-version -module -no-undefined -shared

src/mod/endpoints/mod_skinny/Net/Skinny/Message.pm

@@ -49,7 +49,9 @@ sub send {
         $parsed_count++;
     }
     if($parsed_count != scalar(keys %{$self->{'data'}})) {
-        printf "Incomplete message: %d out of %d\n", $parsed_count, scalar(keys %{$self->{'data'}});
+    	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);
         return;
     }
     $self->{'socket'}->send_data($self->{'type'}, $raw);

src/mod/endpoints/mod_skinny/mod_skinny.h

@@ -42,50 +42,54 @@
 #define SKINNY_EVENT_UNREGISTER "skinny::unregister"
 #define SKINNY_EVENT_EXPIRE "skinny::expire"
 #define SKINNY_EVENT_ALARM "skinny::alarm"
+#define SKINNY_EVENT_CALL_STATE "skinny::call_state"
 
 struct skinny_globals {
-	/* data */
+    int running;
-	int calls;
+    switch_memory_pool_t *pool;
-	switch_mutex_t *calls_mutex;
+    switch_mutex_t *mutex;
-	switch_hash_t *profile_hash;
+    switch_hash_t *profile_hash;
-	switch_event_node_t *heartbeat_node;
+    switch_event_node_t *heartbeat_node;
-	int running;
+    switch_event_node_t *call_state_node;
 };
 typedef struct skinny_globals skinny_globals_t;
 
 skinny_globals_t globals;
 
 struct skinny_profile {
-	/* prefs */
+    /* prefs */
-	char *name;
+    char *name;
-	char *domain;
+    char *domain;
-	char *ip;
+    char *ip;
-	unsigned int port;
+    unsigned int port;
-	char *dialplan;
+    char *dialplan;
-	char *context;
+    char *context;
-	uint32_t keep_alive;
+    uint32_t keep_alive;
-	char date_format[6];
+    char date_format[6];
-	int debug;
+    int debug;
-	/* db */
+    /* db */
-	char *dbname;
+    char *dbname;
-	char *odbc_dsn;
+    char *odbc_dsn;
-	char *odbc_user;
+    char *odbc_user;
-	char *odbc_pass;
+    char *odbc_pass;
-	switch_odbc_handle_t *master_odbc;
+    switch_odbc_handle_t *master_odbc;
-	/* stats */
+    switch_mutex_t *sql_mutex;	
-	uint32_t ib_calls;
+    /* stats */
-	uint32_t ob_calls;
+    uint32_t ib_calls;
-	uint32_t ib_failed_calls;
+    uint32_t ob_calls;
-	uint32_t ob_failed_calls;	
+    uint32_t ib_failed_calls;
-	/* listener */
+    uint32_t ob_failed_calls;	
-	int listener_threads;
+    /* listener */
-	switch_mutex_t *listener_mutex;	
+    int listener_threads;
-	switch_socket_t *sock;
+    switch_mutex_t *listener_mutex;	
-	switch_mutex_t *sock_mutex;
+    switch_socket_t *sock;
-	struct listener *listeners;
+    switch_mutex_t *sock_mutex;
-	uint8_t listener_ready;
+    struct listener *listeners;
-	/* call id */
+    uint8_t listener_ready;
-	uint32_t next_call_id;
+    /* call id */
+    uint32_t next_call_id;
+    /* others */
+    switch_memory_pool_t *pool;
 };
 typedef struct skinny_profile skinny_profile_t;
 
@@ -95,28 +99,26 @@ typedef struct skinny_profile skinny_profile_t;
 /*****************************************************************************/
 
 typedef enum {
-	LFLAG_RUNNING = (1 << 0),
+    LFLAG_RUNNING = (1 << 0),
 } event_flag_t;
 
 #define SKINNY_MAX_LINES 42
 struct listener {
-	skinny_profile_t *profile;
+    skinny_profile_t *profile;
-	char device_name[16];
+    char device_name[16];
-	uint32_t device_instance;
+    uint32_t device_instance;
-	switch_core_session_t *session[SKINNY_MAX_LINES];
-	uint32_t line_state[SKINNY_MAX_LINES]; /* See enum skinny_key_set */
 
-	switch_socket_t *sock;
+    switch_socket_t *sock;
-	switch_memory_pool_t *pool;
+    switch_memory_pool_t *pool;
-	switch_thread_rwlock_t *rwlock;
+    switch_thread_rwlock_t *rwlock;
-	switch_sockaddr_t *sa;
+    switch_sockaddr_t *sa;
-	char remote_ip[50];
+    char remote_ip[50];
-	switch_mutex_t *flag_mutex;
+    switch_mutex_t *flag_mutex;
-	uint32_t flags;
+    uint32_t flags;
-	switch_port_t remote_port;
+    switch_port_t remote_port;
-	uint32_t id;
+    uint32_t id;
-	time_t expire_time;
+    time_t expire_time;
-	struct listener *next;
+    struct listener *next;
 };
 
 typedef struct listener listener_t;
@@ -127,83 +129,92 @@ typedef switch_status_t (*skinny_listener_callback_func_t) (listener_t *listener
 /* CHANNEL TYPES */
 /*****************************************************************************/
 typedef enum {
-	TFLAG_IO = (1 << 0),
+    TFLAG_IO = (1 << 0),
-	TFLAG_INBOUND = (1 << 1),
+    TFLAG_INBOUND = (1 << 1),
-	TFLAG_OUTBOUND = (1 << 2),
+    TFLAG_OUTBOUND = (1 << 2),
-	TFLAG_DTMF = (1 << 3),
+    TFLAG_DTMF = (1 << 3),
-	TFLAG_VOICE = (1 << 4),
+    TFLAG_VOICE = (1 << 4),
-	TFLAG_HANGUP = (1 << 5),
+    TFLAG_HANGUP = (1 << 5),
-	TFLAG_LINEAR = (1 << 6),
+    TFLAG_LINEAR = (1 << 6),
-	TFLAG_CODEC = (1 << 7),
+    TFLAG_CODEC = (1 << 7),
 
-	TFLAG_READING = (1 << 9),
+    TFLAG_READING = (1 << 9),
-	TFLAG_WRITING = (1 << 10)
+    TFLAG_WRITING = (1 << 10)
 } TFLAGS;
 
 typedef enum {
-	GFLAG_MY_CODEC_PREFS = (1 << 0)
+    GFLAG_MY_CODEC_PREFS = (1 << 0)
 } GFLAGS;
 
 struct private_object {
-	unsigned int flags;
+    unsigned int flags;
-	switch_frame_t read_frame;
+    switch_frame_t read_frame;
-	unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
+    unsigned char databuf[SWITCH_RECOMMENDED_BUFFER_SIZE];
-	switch_core_session_t *session;
+    switch_core_session_t *session;
-	switch_caller_profile_t *caller_profile;
+    switch_caller_profile_t *caller_profile;
-	switch_mutex_t *mutex;
+    switch_mutex_t *mutex;
-	switch_mutex_t *flag_mutex;
+    switch_mutex_t *flag_mutex;
-	/* identification */
+    /* identification */
-	struct listener *listener;
+    uint32_t call_id;
-	uint32_t line;
+    uint32_t party_id;
-	uint32_t call_id;
+
-	uint32_t party_id;
+    skinny_profile_t *profile;
-	char *line_name;
+
-	char *line_shortname;
+    /* codec */
-	char *line_displayname;
+    char *iananame;	
-	char dest[10];
+    switch_codec_t read_codec;
-	/* codec */
+    switch_codec_t write_codec;
-	char *iananame;	
+    switch_codec_implementation_t read_impl;
-	switch_codec_t read_codec;
+    switch_codec_implementation_t write_impl;
-	switch_codec_t write_codec;
+    unsigned long rm_rate;
-	switch_codec_implementation_t read_impl;
+    uint32_t codec_ms;
-	switch_codec_implementation_t write_impl;
+    char *rm_encoding;
-	unsigned long rm_rate;
+    char *rm_fmtp;
-	uint32_t codec_ms;
+    switch_payload_t agreed_pt;
-	char *rm_encoding;
+    /* RTP */
-	char *rm_fmtp;
+    switch_rtp_t *rtp_session;
-	switch_payload_t agreed_pt;
+    char *local_sdp_audio_ip;
-	/* RTP */
+    switch_port_t local_sdp_audio_port;
-	switch_rtp_t *rtp_session;
+    char *remote_sdp_audio_ip;
-	char *local_sdp_audio_ip;
+    switch_port_t remote_sdp_audio_port;
-	switch_port_t local_sdp_audio_port;
-	char *remote_sdp_audio_ip;
-	switch_port_t remote_sdp_audio_port;
 };
 
 typedef struct private_object private_t;
 
+/*****************************************************************************/
+/* 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);
+
 /*****************************************************************************/
 /* SQL FUNCTIONS */
 /*****************************************************************************/
 void skinny_execute_sql(skinny_profile_t *profile, char *sql, switch_mutex_t *mutex);
 switch_bool_t skinny_execute_sql_callback(skinny_profile_t *profile,
-											  switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
+										      switch_mutex_t *mutex, char *sql, switch_core_db_callback_func_t callback, void *pdata);
 
 /*****************************************************************************/
 /* LISTENER FUNCTIONS */
 /*****************************************************************************/
+uint8_t listener_is_ready(listener_t *listener);
 switch_status_t keepalive_listener(listener_t *listener, void *pvt);
 
 /*****************************************************************************/
 /* CHANNEL FUNCTIONS */
 /*****************************************************************************/
-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);
+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, instance, state, call_id)  skinny_line_perform_set_state(listener, __FILE__, __SWITCH_FUNC__, __LINE__, instance, state, call_id)
+#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)
 
-uint32_t skinny_line_get_state(listener_t *listener, uint32_t instance);
+uint32_t skinny_line_get_state(listener_t *listener, uint32_t line_instance, uint32_t call_id);
 
 switch_status_t skinny_tech_set_codec(private_t *tech_pvt, int force);
-void tech_init(private_t *tech_pvt, switch_core_session_t *session, listener_t *listener, uint32_t line);
+void tech_init(private_t *tech_pvt, skinny_profile_t *profile, switch_core_session_t *session);
 switch_status_t channel_on_init(switch_core_session_t *session);
 switch_status_t channel_on_hangup(switch_core_session_t *session);
 switch_status_t channel_on_destroy(switch_core_session_t *session);
@@ -211,8 +222,8 @@ switch_status_t channel_on_routing(switch_core_session_t *session);
 switch_status_t channel_on_exchange_media(switch_core_session_t *session);
 switch_status_t channel_on_soft_execute(switch_core_session_t *session);
 switch_call_cause_t channel_outgoing_channel(switch_core_session_t *session, switch_event_t *var_event,
-													switch_caller_profile_t *outbound_profile,
+												    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);
+												    switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags, switch_call_cause_t *cancel_cause);
 switch_status_t channel_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id);
 switch_status_t channel_write_frame(switch_core_session_t *session, switch_frame_t *frame, switch_io_flag_t flags, int stream_id);
 switch_status_t channel_kill_channel(switch_core_session_t *session, int sig);
@@ -224,3 +235,14 @@ switch_endpoint_interface_t *skinny_get_endpoint_interface();
 
 #endif /* _MOD_SKINNY_H */
 
+/* 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:
+ */
+

src/mod/endpoints/mod_skinny/skinny_api.c

@@ -0,0 +1,473 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2010, Mathieu Parent <math.parent@gmail.com>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Mathieu Parent <math.parent@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Parent <math.parent@gmail.com>
+ *
+ *
+ * skinny_api.c -- Skinny Call Control Protocol (SCCP) Endpoint Module
+ *
+ */
+
+#include <switch.h>
+#include "mod_skinny.h"
+#include "skinny_protocol.h"
+#include "skinny_tables.h"
+
+/*****************************************************************************/
+/* skinny_api_list_* */
+/*****************************************************************************/
+
+static switch_status_t skinny_api_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 */
+    switch_mutex_lock(globals.mutex);
+    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);
+    }
+    switch_mutex_unlock(globals.mutex);
+
+    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_api_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_api_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->sql_mutex, sql, skinny_api_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_api_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_api_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_api_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_api_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_api_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_api_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_api_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_api_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_api_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_api_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;
+}
+
+/*****************************************************************************/
+/* skinny_api_cmd_* */
+/*****************************************************************************/
+static switch_status_t skinny_api_cmd_status_profile(const char *profile_name, switch_stream_handle_t *stream)
+{
+    skinny_profile_t *profile;
+    if ((profile = skinny_find_profile(profile_name))) {
+	    skinny_profile_dump(profile, stream);
+    } else {
+	    stream->write_function(stream, "Profile not found!\n");
+    }
+
+    return SWITCH_STATUS_SUCCESS;
+}
+
+static switch_status_t skinny_api_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 skinny_api_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))) {
+	    listener_t *listener = NULL;
+	    skinny_profile_find_listener_by_device_name(profile, device_name, &listener);
+	    if(listener) {
+		    send_set_ringer(listener, skinny_str2ring_type(ring_type), skinny_str2ring_mode(ring_mode), 0, 0);
+	    } 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 skinny_api_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) {
+		    send_set_lamp(listener, skinny_str2button(stimulus), atoi(instance), skinny_str2lamp_mode(lamp_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 skinny_api_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;
+
+    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_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 skinny_api_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 skinny_api_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;
+}
+
+/*****************************************************************************/
+/* API */
+/*****************************************************************************/
+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 = skinny_api_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 = skinny_api_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 = skinny_api_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 = skinny_api_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 = skinny_api_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 = skinny_api_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 = skinny_api_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;
+}
+
+switch_status_t skinny_api_register(switch_loadable_module_interface_t **module_interface)
+{
+    switch_api_interface_t *api_interface;
+
+    SWITCH_ADD_API(api_interface, "skinny", "Skinny Controls", skinny_function, "<cmd> <args>");
+    switch_console_set_complete("add skinny help");
+
+    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");
+
+    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");
+
+    switch_console_add_complete_func("::skinny::list_profiles", skinny_api_list_profiles);
+    switch_console_add_complete_func("::skinny::list_devices", skinny_api_list_devices);
+    switch_console_add_complete_func("::skinny::list_reset_types", skinny_api_list_reset_types);
+    switch_console_add_complete_func("::skinny::list_ring_types", skinny_api_list_ring_types);
+    switch_console_add_complete_func("::skinny::list_ring_modes", skinny_api_list_ring_modes);
+    switch_console_add_complete_func("::skinny::list_stimuli", skinny_api_list_stimuli);
+    switch_console_add_complete_func("::skinny::list_stimulus_instances", skinny_api_list_stimulus_instances);
+    switch_console_add_complete_func("::skinny::list_stimulus_modes", skinny_api_list_stimulus_modes);
+    switch_console_add_complete_func("::skinny::list_speaker_modes", skinny_api_list_speaker_modes);
+    switch_console_add_complete_func("::skinny::list_call_states", skinny_api_list_call_states);
+    switch_console_add_complete_func("::skinny::list_line_instances", skinny_api_list_line_instances);
+    switch_console_add_complete_func("::skinny::list_call_ids", skinny_api_list_call_ids);
+    return SWITCH_STATUS_SUCCESS;
+}
+
+/* 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:
+ */
+

src/mod/endpoints/mod_skinny/skinny_api.h

@@ -0,0 +1,50 @@
+/* 
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2010, Mathieu Parent <math.parent@gmail.com>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Mathieu Parent <math.parent@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 
+ * Mathieu Parent <math.parent@gmail.com>
+ *
+ *
+ * skinny_api.h -- Skinny Call Control Protocol (SCCP) Endpoint Module
+ *
+ */
+
+#ifndef _SKINNY_API_H
+#define _SKINNY_API_H
+
+switch_status_t skinny_api_register(switch_loadable_module_interface_t **module_interface);
+
+#endif /* _SKINNY_API_H */
+
+/* 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:
+ */
+

src/mod/endpoints/mod_skinny/skinny_tables.c

@@ -35,157 +35,169 @@
 
 /* Translation tables */
 struct skinny_table SKINNY_MESSAGE_TYPES[] = {
-	{"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
+    {"KeepAliveMessage", KEEP_ALIVE_MESSAGE},
-	{"RegisterMessage", REGISTER_MESSAGE},
+    {"RegisterMessage", REGISTER_MESSAGE},
-	{"PortMessage", PORT_MESSAGE},
+    {"PortMessage", PORT_MESSAGE},
-	{"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
+    {"KeypadButtonMessage", KEYPAD_BUTTON_MESSAGE},
-	{"StimulusMessage", STIMULUS_MESSAGE},
+    {"StimulusMessage", STIMULUS_MESSAGE},
-	{"OffHookMessage", OFF_HOOK_MESSAGE},
+    {"OffHookMessage", OFF_HOOK_MESSAGE},
-	{"OnHookMessage", ON_HOOK_MESSAGE},
+    {"OnHookMessage", ON_HOOK_MESSAGE},
-	{"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
+    {"SpeedDialStatReqMessage", SPEED_DIAL_STAT_REQ_MESSAGE},
-	{"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
+    {"LineStatReqMessage", LINE_STAT_REQ_MESSAGE},
-	{"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
+    {"ConfigStatReqMessage", CONFIG_STAT_REQ_MESSAGE},
-	{"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
+    {"TimeDateReqMessage", TIME_DATE_REQ_MESSAGE},
-	{"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
+    {"ButtonTemplateReqMessage", BUTTON_TEMPLATE_REQ_MESSAGE},
-	{"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
+    {"CapabilitiesReqMessage", CAPABILITIES_RES_MESSAGE},
-	{"AlarmMessage", ALARM_MESSAGE},
+    {"AlarmMessage", ALARM_MESSAGE},
-	{"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
+    {"OpenReceiveChannelAckMessage", OPEN_RECEIVE_CHANNEL_ACK_MESSAGE},
-	{"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
+    {"SoftKeySetReqMessage", SOFT_KEY_SET_REQ_MESSAGE},
-	{"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
+    {"SoftKeyEventMessage", SOFT_KEY_EVENT_MESSAGE},
-	{"UnregisterMessage", UNREGISTER_MESSAGE},
+    {"UnregisterMessage", UNREGISTER_MESSAGE},
-	{"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
+    {"SoftKeyTemplateReqMessage", SOFT_KEY_TEMPLATE_REQ_MESSAGE},
-	{"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
+    {"ServiceUrlStatReqMessage", SERVICE_URL_STAT_REQ_MESSAGE},
-	{"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
+    {"FeatureStatReqMessage", FEATURE_STAT_REQ_MESSAGE},
-	{"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
+    {"HeadsetStatusMessage", HEADSET_STATUS_MESSAGE},
-	{"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
+    {"RegisterAvailableLinesMessage", REGISTER_AVAILABLE_LINES_MESSAGE},
-	{"RegisterAckMessage", REGISTER_ACK_MESSAGE},
+    {"RegisterAckMessage", REGISTER_ACK_MESSAGE},
-	{"StartToneMessage", START_TONE_MESSAGE},
+    {"StartToneMessage", START_TONE_MESSAGE},
-	{"StopToneMessage", STOP_TONE_MESSAGE},
+    {"StopToneMessage", STOP_TONE_MESSAGE},
-	{"SetRingerMessage", SET_RINGER_MESSAGE},
+    {"SetRingerMessage", SET_RINGER_MESSAGE},
-	{"SetLampMessage", SET_LAMP_MESSAGE},
+    {"SetLampMessage", SET_LAMP_MESSAGE},
-	{"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
+    {"SetSpeakerModeMessage", SET_SPEAKER_MODE_MESSAGE},
-	{"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
+    {"StartMediaTransmissionMessage", START_MEDIA_TRANSMISSION_MESSAGE},
-	{"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
+    {"StopMediaTransmissionMessage", STOP_MEDIA_TRANSMISSION_MESSAGE},
-	{"CallInfoMessage", CALL_INFO_MESSAGE},
+    {"CallInfoMessage", CALL_INFO_MESSAGE},
-	{"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
+    {"SpeedDialStatResMessage", SPEED_DIAL_STAT_RES_MESSAGE},
-	{"LineStatResMessage", LINE_STAT_RES_MESSAGE},
+    {"LineStatResMessage", LINE_STAT_RES_MESSAGE},
-	{"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
+    {"ConfigStatResMessage", CONFIG_STAT_RES_MESSAGE},
-	{"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
+    {"DefineTimeDateMessage", DEFINE_TIME_DATE_MESSAGE},
-	{"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
+    {"ButtonTemplateResMessage", BUTTON_TEMPLATE_RES_MESSAGE},
-	{"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
+    {"CapabilitiesReqMessage", CAPABILITIES_REQ_MESSAGE},
-	{"RegisterRejMessage", REGISTER_REJ_MESSAGE},
+    {"RegisterRejectMessage", REGISTER_REJECT_MESSAGE},
-	{"ResetMessage", RESET_MESSAGE},
+    {"ResetMessage", RESET_MESSAGE},
-	{"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
+    {"KeepAliveAckMessage", KEEP_ALIVE_ACK_MESSAGE},
-	{"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
+    {"OpenReceiveChannelMessage", OPEN_RECEIVE_CHANNEL_MESSAGE},
-	{"OCloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
+    {"CloseReceiveChannelMessage", CLOSE_RECEIVE_CHANNEL_MESSAGE},
-	{"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
+    {"SoftKeyTemplateResMessage", SOFT_KEY_TEMPLATE_RES_MESSAGE},
-	{"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
+    {"SoftKeySetResMessage", SOFT_KEY_SET_RES_MESSAGE},
-	{"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
+    {"SelectSoftKeysMessage", SELECT_SOFT_KEYS_MESSAGE},
-	{"CallStateMessage", CALL_STATE_MESSAGE},
+    {"CallStateMessage", CALL_STATE_MESSAGE},
-	{"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
+    {"DisplayPromptStatusMessage", DISPLAY_PROMPT_STATUS_MESSAGE},
-	{"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
+    {"ClearPromptStatusMessage", CLEAR_PROMPT_STATUS_MESSAGE},
-	{"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
+    {"ActivateCallPlaneMessage", ACTIVATE_CALL_PLANE_MESSAGE},
-	{"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
+    {"UnregisterAckMessage", UNREGISTER_ACK_MESSAGE},
-	{"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
+    {"DialedNumberMessage", DIALED_NUMBER_MESSAGE},
-	{"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
+    {"FeatureResMessage", FEATURE_STAT_RES_MESSAGE},
-	{"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
+    {"DisplayPriNotifyMessage", DISPLAY_PRI_NOTIFY_MESSAGE},
-	{NULL, 0}
+    {"ServiceUrlStatMessage", SERVICE_URL_STAT_RES_MESSAGE},
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_message_type2str, SKINNY_MESSAGE_TYPES, "UnknownMessage")
 SKINNY_DECLARE_STR2ID(skinny_str2message_type, SKINNY_MESSAGE_TYPES, -1)
 
 struct skinny_table SKINNY_RING_TYPES[] = {
-	{"RingOff", SKINNY_RING_OFF},
+    {"RingOff", SKINNY_RING_OFF},
-	{"RingInside", SKINNY_RING_INSIDE},
+    {"RingInside", SKINNY_RING_INSIDE},
-	{"RingOutside", SKINNY_RING_OUTSIDE},
+    {"RingOutside", SKINNY_RING_OUTSIDE},
-	{"RingFeature", SKINNY_RING_FEATURE},
+    {"RingFeature", SKINNY_RING_FEATURE},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_ring_type2str, SKINNY_RING_TYPES, "RingTypeUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2ring_type, SKINNY_RING_TYPES, -1)
 
 struct skinny_table SKINNY_RING_MODES[] = {
-	{"RingForever", SKINNY_RING_FOREVER},
+    {"RingForever", SKINNY_RING_FOREVER},
-	{"RingOnce", SKINNY_RING_ONCE},
+    {"RingOnce", SKINNY_RING_ONCE},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_ring_mode2str, SKINNY_RING_MODES, "RingModeUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2ring_mode, SKINNY_RING_MODES, -1)
 
 struct skinny_table SKINNY_BUTTONS[] = {
-	{"Unknown", SKINNY_BUTTON_UNKNOWN},
+    {"Unknown", SKINNY_BUTTON_UNKNOWN},
-	{"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
+    {"LastNumberRedial", SKINNY_BUTTON_LAST_NUMBER_REDIAL},
-	{"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
+    {"SpeedDial", SKINNY_BUTTON_SPEED_DIAL},
-	{"Line", SKINNY_BUTTON_LINE},
+    {"Line", SKINNY_BUTTON_LINE},
-	{"Voicemail", SKINNY_BUTTON_VOICEMAIL},
+    {"Voicemail", SKINNY_BUTTON_VOICEMAIL},
-	{"Privacy", SKINNY_BUTTON_PRIVACY},
+    {"Privacy", SKINNY_BUTTON_PRIVACY},
-	{"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
+    {"ServiceUrl", SKINNY_BUTTON_SERVICE_URL},
-	{"Undefined", SKINNY_BUTTON_UNDEFINED},
+    {"Undefined", SKINNY_BUTTON_UNDEFINED},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_button2str, SKINNY_BUTTONS, "Unknown")
 SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
 
 struct skinny_table SKINNY_LAMP_MODES[] = {
-	{"Off", SKINNY_LAMP_OFF},
+    {"Off", SKINNY_LAMP_OFF},
-	{"On", SKINNY_LAMP_ON},
+    {"On", SKINNY_LAMP_ON},
-	{"Wink", SKINNY_LAMP_WINK},
+    {"Wink", SKINNY_LAMP_WINK},
-	{"Flash", SKINNY_LAMP_FLASH},
+    {"Flash", SKINNY_LAMP_FLASH},
-	{"Blink", SKINNY_LAMP_BLINK},
+    {"Blink", SKINNY_LAMP_BLINK},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_lamp_mode2str, SKINNY_LAMP_MODES, "Unknown")
 SKINNY_DECLARE_STR2ID(skinny_str2lamp_mode, SKINNY_LAMP_MODES, -1)
 
 struct skinny_table SKINNY_SPEAKER_MODES[] = {
-	{"SpeakerOn", SKINNY_SPEAKER_ON},
+    {"SpeakerOn", SKINNY_SPEAKER_ON},
-	{"SpeakerOff", SKINNY_SPEAKER_OFF},
+    {"SpeakerOff", SKINNY_SPEAKER_OFF},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_speaker_mode2str, SKINNY_SPEAKER_MODES, "Unknown")
 SKINNY_DECLARE_STR2ID(skinny_str2speaker_mode, SKINNY_SPEAKER_MODES, -1)
 
 struct skinny_table SKINNY_KEY_SETS[] = {
-	{"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
+    {"KeySetOnHook", SKINNY_KEY_SET_ON_HOOK},
-	{"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
+    {"KeySetConnected", SKINNY_KEY_SET_CONNECTED},
-	{"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
+    {"KeySetOnHold", SKINNY_KEY_SET_ON_HOLD},
-	{"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
+    {"KeySetRingIn", SKINNY_KEY_SET_RING_IN},
-	{"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
+    {"KeySetOffHook", SKINNY_KEY_SET_OFF_HOOK},
-	{"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
+    {"KeySetConnectedWithTransfer", SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER},
-	{"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
+    {"KeySetDigitsAfterDialingFirstDigit", SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT},
-	{"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
+    {"KeySetConnectedWithConference", SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE},
-	{"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
+    {"KeySetRingOut", SKINNY_KEY_SET_RING_OUT},
-	{"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
+    {"KeySetOffHookWithFeatures", SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_soft_key_set2str, SKINNY_KEY_SETS, "UNKNOWN_SOFT_KEY_SET")
 SKINNY_DECLARE_STR2ID(skinny_str2soft_key_set, SKINNY_KEY_SETS, -1)
 
 struct skinny_table SKINNY_CALL_STATES[] = {
-	{"OffHook", SKINNY_OFF_HOOK},
+    {"OffHook", SKINNY_OFF_HOOK},
-	{"OnHook", SKINNY_ON_HOOK},
+    {"OnHook", SKINNY_ON_HOOK},
-	{"RingOut", SKINNY_RING_OUT},
+    {"RingOut", SKINNY_RING_OUT},
-	{"RingIn", SKINNY_RING_IN},
+    {"RingIn", SKINNY_RING_IN},
-	{"Connected", SKINNY_CONNECTED},
+    {"Connected", SKINNY_CONNECTED},
-	{"Busy", SKINNY_BUSY},
+    {"Busy", SKINNY_BUSY},
-	{"Congestion", SKINNY_CONGESTION},
+    {"LineInUse", SKINNY_LINE_IN_USE},
-	{"Hold", SKINNY_HOLD},
+    {"Hold", SKINNY_HOLD},
-	{"CallWaiting", SKINNY_CALL_WAITING},
+    {"CallWaiting", SKINNY_CALL_WAITING},
-	{"CallTransfer", SKINNY_CALL_TRANSFER},
+    {"CallTransfer", SKINNY_CALL_TRANSFER},
-	{"CallPark", SKINNY_CALL_PARK},
+    {"CallPark", SKINNY_CALL_PARK},
-	{"Proceed", SKINNY_PROCEED},
+    {"Proceed", SKINNY_PROCEED},
-	{"CallRemoteMultiline", SKINNY_CALL_REMOTE_MULTILINE},
+    {"InUseRemotely", SKINNY_IN_USE_REMOTELY},
-	{"InvalidNumber", SKINNY_INVALID_NUMBER},
+    {"InvalidNumber", SKINNY_INVALID_NUMBER},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_call_state2str, SKINNY_CALL_STATES, "CallStateUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2call_state, SKINNY_CALL_STATES, -1)
 
 struct skinny_table SKINNY_DEVICE_RESET_TYPES[] = {
-	{"DeviceReset", SKINNY_DEVICE_RESET},
+    {"DeviceReset", SKINNY_DEVICE_RESET},
-	{"DeviceRestart", SKINNY_DEVICE_RESTART},
+    {"DeviceRestart", SKINNY_DEVICE_RESTART},
-	{NULL, 0}
+    {NULL, 0}
 };
 SKINNY_DECLARE_ID2STR(skinny_device_reset_type2str, SKINNY_DEVICE_RESET_TYPES, "DeviceResetTypeUnknown")
 SKINNY_DECLARE_STR2ID(skinny_str2device_reset_type, SKINNY_DEVICE_RESET_TYPES, -1)
 
+/* 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:
+ */
+

src/mod/endpoints/mod_skinny/skinny_tables.h

@@ -36,74 +36,74 @@
 /* SKINNY TABLES */
 /*****************************************************************************/
 struct skinny_table {
-	const char *name;
+    const char *name;
-	uint32_t id;
+    uint32_t id;
 };
 
 #define SKINNY_DECLARE_ID2STR(func, TABLE, DEFAULT_STR) \
 const char *func(uint32_t id) \
 { \
-	const char *str = DEFAULT_STR; \
+    const char *str = DEFAULT_STR; \
-	\
+    \
-	for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+    for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
-		if (TABLE[x].id == id) {\
+	    if (TABLE[x].id == id) {\
-			str = TABLE[x].name;\
+		    str = TABLE[x].name;\
-			break;\
+		    break;\
-		}\
+	    }\
-	}\
+    }\
-	\
+    \
-	return str;\
+    return str;\
 }
 
 #define SKINNY_DECLARE_STR2ID(func, TABLE, DEFAULT_ID) \
 uint32_t func(const char *str)\
 {\
-	uint32_t id = DEFAULT_ID;\
+    uint32_t id = DEFAULT_ID;\
-	\
+    \
-	if (*str > 47 && *str < 58) {\
+    if (*str > 47 && *str < 58) {\
-		id = atoi(str);\
+	    id = atoi(str);\
-	} else {\
+    } else {\
-		for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
+	    for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1 && TABLE[x].name; x++) {\
-			if (!strcasecmp(TABLE[x].name, str)) {\
+		    if (!strcasecmp(TABLE[x].name, str)) {\
-				id = TABLE[x].id;\
+			    id = TABLE[x].id;\
-				break;\
+			    break;\
-			}\
+		    }\
-		}\
+	    }\
-	}\
+    }\
-	return id;\
+    return id;\
 }
 
 #define SKINNY_DECLARE_PUSH_MATCH(TABLE) \
-	switch_console_callback_match_t *my_matches = NULL;\
+    switch_console_callback_match_t *my_matches = NULL;\
-	for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
+    for (uint8_t x = 0; x < (sizeof(TABLE) / sizeof(struct skinny_table)) - 1; x++) {\
-		switch_console_push_match(&my_matches, TABLE[x].name);\
+	    switch_console_push_match(&my_matches, TABLE[x].name);\
-	}\
+    }\
-	if (my_matches) {\
+    if (my_matches) {\
-		*matches = my_matches;\
+	    *matches = my_matches;\
-		status = SWITCH_STATUS_SUCCESS;\
+	    status = SWITCH_STATUS_SUCCESS;\
-	}
+    }
 
 
-struct skinny_table SKINNY_MESSAGE_TYPES[55];
+struct skinny_table SKINNY_MESSAGE_TYPES[56];
 const char *skinny_message_type2str(uint32_t id);
 uint32_t skinny_str2message_type(const char *str);
 #define SKINNY_PUSH_MESSAGE_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_MESSAGE_TYPES)
 
 enum skinny_tone {
-	SKINNY_TONE_SILENCE = 0x00,
+    SKINNY_TONE_SILENCE = 0x00,
-	SKINNY_TONE_DIALTONE = 0x21,
+    SKINNY_TONE_DIALTONE = 0x21,
-	SKINNY_TONE_BUSYTONE = 0x23,
+    SKINNY_TONE_BUSYTONE = 0x23,
-	SKINNY_TONE_ALERT = 0x24,
+    SKINNY_TONE_ALERT = 0x24,
-	SKINNY_TONE_REORDER = 0x25,
+    SKINNY_TONE_REORDER = 0x25,
-	SKINNY_TONE_CALLWAITTONE = 0x2D,
+    SKINNY_TONE_CALLWAITTONE = 0x2D,
-	SKINNY_TONE_NOTONE = 0x7F,
+    SKINNY_TONE_NOTONE = 0x7F,
 };
 
 enum skinny_ring_type {
-	SKINNY_RING_OFF = 1,
+    SKINNY_RING_OFF = 1,
-	SKINNY_RING_INSIDE = 2,
+    SKINNY_RING_INSIDE = 2,
-	SKINNY_RING_OUTSIDE = 3,
+    SKINNY_RING_OUTSIDE = 3,
-	SKINNY_RING_FEATURE = 4
+    SKINNY_RING_FEATURE = 4
 };
 struct skinny_table SKINNY_RING_TYPES[5];
 const char *skinny_ring_type2str(uint32_t id);
@@ -111,8 +111,8 @@ uint32_t skinny_str2ring_type(const char *str);
 #define SKINNY_PUSH_RING_TYPES SKINNY_DECLARE_PUSH_MATCH(SKINNY_RING_TYPES)
 
 enum skinny_ring_mode {
-	SKINNY_RING_FOREVER = 1,
+    SKINNY_RING_FOREVER = 1,
-	SKINNY_RING_ONCE = 2,
+    SKINNY_RING_ONCE = 2,
 };
 struct skinny_table SKINNY_RING_MODES[3];
 const char *skinny_ring_mode2str(uint32_t id);
@@ -121,11 +121,11 @@ uint32_t skinny_str2ring_mode(const char *str);
 
 
 enum skinny_lamp_mode {
-	SKINNY_LAMP_OFF = 1,
+    SKINNY_LAMP_OFF = 1,
-	SKINNY_LAMP_ON = 2,
+    SKINNY_LAMP_ON = 2,
-	SKINNY_LAMP_WINK = 3,
+    SKINNY_LAMP_WINK = 3,
-	SKINNY_LAMP_FLASH = 4,
+    SKINNY_LAMP_FLASH = 4,
-	SKINNY_LAMP_BLINK = 5,
+    SKINNY_LAMP_BLINK = 5,
 };
 struct skinny_table SKINNY_LAMP_MODES[6];
 const char *skinny_lamp_mode2str(uint32_t id);
@@ -133,8 +133,8 @@ uint32_t skinny_str2lamp_mode(const char *str);
 #define SKINNY_PUSH_LAMP_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_LAMP_MODES)
 
 enum skinny_speaker_mode {
-	SKINNY_SPEAKER_ON = 1,
+    SKINNY_SPEAKER_ON = 1,
-	SKINNY_SPEAKER_OFF = 2,
+    SKINNY_SPEAKER_OFF = 2,
 };
 struct skinny_table SKINNY_SPEAKER_MODES[3];
 const char *skinny_speaker_mode2str(uint32_t id);
@@ -142,20 +142,20 @@ uint32_t skinny_str2speaker_mode(const char *str);
 #define SKINNY_PUSH_SPEAKER_MODES SKINNY_DECLARE_PUSH_MATCH(SKINNY_SPEAKER_MODES)
 
 enum skinny_call_type {
-	SKINNY_INBOUND_CALL = 1,
+    SKINNY_INBOUND_CALL = 1,
-	SKINNY_OUTBOUND_CALL = 2,
+    SKINNY_OUTBOUND_CALL = 2,
-	SKINNY_FORWARD_CALL = 3,
+    SKINNY_FORWARD_CALL = 3,
 };
 
 enum skinny_button_definition {
-	SKINNY_BUTTON_UNKNOWN = 0x00,
+    SKINNY_BUTTON_UNKNOWN = 0x00,
-	SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
+    SKINNY_BUTTON_LAST_NUMBER_REDIAL = 0x01,
-	SKINNY_BUTTON_SPEED_DIAL = 0x02,
+    SKINNY_BUTTON_SPEED_DIAL = 0x02,
-	SKINNY_BUTTON_LINE = 0x09,
+    SKINNY_BUTTON_LINE = 0x09,
-	SKINNY_BUTTON_VOICEMAIL = 0x0F,
+    SKINNY_BUTTON_VOICEMAIL = 0x0F,
-	SKINNY_BUTTON_PRIVACY = 0x13,
+    SKINNY_BUTTON_PRIVACY = 0x13,
-	SKINNY_BUTTON_SERVICE_URL = 0x14,
+    SKINNY_BUTTON_SERVICE_URL = 0x14,
-	SKINNY_BUTTON_UNDEFINED = 0xFF,
+    SKINNY_BUTTON_UNDEFINED = 0xFF,
 };
 struct skinny_table SKINNY_BUTTONS[9];
 const char *skinny_button2str(uint32_t id);
@@ -163,39 +163,39 @@ uint32_t skinny_str2button(const char *str);
 #define SKINNY_PUSH_STIMULI SKINNY_DECLARE_PUSH_MATCH(SKINNY_BUTTONS)
 
 enum skinny_soft_key_event {
-	SOFTKEY_REDIAL = 0x01,
+    SOFTKEY_REDIAL = 0x01,
-	SOFTKEY_NEWCALL = 0x02,
+    SOFTKEY_NEWCALL = 0x02,
-	SOFTKEY_HOLD = 0x03,
+    SOFTKEY_HOLD = 0x03,
-	SOFTKEY_TRANSFER = 0x04,
+    SOFTKEY_TRANSFER = 0x04,
-	SOFTKEY_CFWDALL = 0x05,
+    SOFTKEY_CFWDALL = 0x05,
-	SOFTKEY_CFWDBUSY = 0x06,
+    SOFTKEY_CFWDBUSY = 0x06,
-	SOFTKEY_CFWDNOANSWER = 0x07,
+    SOFTKEY_CFWDNOANSWER = 0x07,
-	SOFTKEY_BACKSPACE = 0x08,
+    SOFTKEY_BACKSPACE = 0x08,
-	SOFTKEY_ENDCALL = 0x09,
+    SOFTKEY_ENDCALL = 0x09,
-	SOFTKEY_RESUME = 0x0A,
+    SOFTKEY_RESUME = 0x0A,
-	SOFTKEY_ANSWER = 0x0B,
+    SOFTKEY_ANSWER = 0x0B,
-	SOFTKEY_INFO = 0x0C,
+    SOFTKEY_INFO = 0x0C,
-	SOFTKEY_CONFRM = 0x0D,
+    SOFTKEY_CONFRM = 0x0D,
-	SOFTKEY_PARK = 0x0E,
+    SOFTKEY_PARK = 0x0E,
-	SOFTKEY_JOIN = 0x0F,
+    SOFTKEY_JOIN = 0x0F,
-	SOFTKEY_MEETMECONFRM = 0x10,
+    SOFTKEY_MEETMECONFRM = 0x10,
-	SOFTKEY_CALLPICKUP = 0x11,
+    SOFTKEY_CALLPICKUP = 0x11,
-	SOFTKEY_GRPCALLPICKUP = 0x12,
+    SOFTKEY_GRPCALLPICKUP = 0x12,
-	SOFTKEY_DND = 0x13,
+    SOFTKEY_DND = 0x13,
-	SOFTKEY_IDIVERT = 0x14,
+    SOFTKEY_IDIVERT = 0x14,
 };
 
 enum skinny_key_set {
-	SKINNY_KEY_SET_ON_HOOK = 0,
+    SKINNY_KEY_SET_ON_HOOK = 0,
-	SKINNY_KEY_SET_CONNECTED = 1,
+    SKINNY_KEY_SET_CONNECTED = 1,
-	SKINNY_KEY_SET_ON_HOLD = 2,
+    SKINNY_KEY_SET_ON_HOLD = 2,
-	SKINNY_KEY_SET_RING_IN = 3,
+    SKINNY_KEY_SET_RING_IN = 3,
-	SKINNY_KEY_SET_OFF_HOOK = 4,
+    SKINNY_KEY_SET_OFF_HOOK = 4,
-	SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
+    SKINNY_KEY_SET_CONNECTED_WITH_TRANSFER = 5,
-	SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
+    SKINNY_KEY_SET_DIGITS_AFTER_DIALING_FIRST_DIGIT = 6,
-	SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
+    SKINNY_KEY_SET_CONNECTED_WITH_CONFERENCE = 7,
-	SKINNY_KEY_SET_RING_OUT = 8,
+    SKINNY_KEY_SET_RING_OUT = 8,
-	SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
+    SKINNY_KEY_SET_OFF_HOOK_WITH_FEATURES = 9,
 };
 struct skinny_table SKINNY_KEY_SETS[11];
 const char *skinny_soft_key_set2str(uint32_t id);
@@ -204,20 +204,20 @@ uint32_t skinny_str2soft_key_set(const char *str);
 
 
 enum skinny_call_state {
-	SKINNY_OFF_HOOK = 1,
+    SKINNY_OFF_HOOK = 1,
-	SKINNY_ON_HOOK = 2,
+    SKINNY_ON_HOOK = 2,
-	SKINNY_RING_OUT = 3,
+    SKINNY_RING_OUT = 3,
-	SKINNY_RING_IN = 4,
+    SKINNY_RING_IN = 4,
-	SKINNY_CONNECTED = 5,
+    SKINNY_CONNECTED = 5,
-	SKINNY_BUSY = 6,
+    SKINNY_BUSY = 6,
-	SKINNY_CONGESTION = 7,
+    SKINNY_LINE_IN_USE = 7,
-	SKINNY_HOLD = 8,
+    SKINNY_HOLD = 8,
-	SKINNY_CALL_WAITING = 9,
+    SKINNY_CALL_WAITING = 9,
-	SKINNY_CALL_TRANSFER = 10,
+    SKINNY_CALL_TRANSFER = 10,
-	SKINNY_CALL_PARK = 11,
+    SKINNY_CALL_PARK = 11,
-	SKINNY_PROCEED = 12,
+    SKINNY_PROCEED = 12,
-	SKINNY_CALL_REMOTE_MULTILINE = 13,
+    SKINNY_IN_USE_REMOTELY = 13,
-	SKINNY_INVALID_NUMBER = 14
+    SKINNY_INVALID_NUMBER = 14
 };
 struct skinny_table SKINNY_CALL_STATES[15];
 const char *skinny_call_state2str(uint32_t id);
@@ -235,3 +235,14 @@ uint32_t skinny_str2device_reset_type(const char *str);
 
 #endif /* _SKINNY_TABLES_H */
 
+/* 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:
+ */
+

src/mod/endpoints/mod_skinny/test-skinny.pl

@@ -11,12 +11,13 @@ BEGIN {
 use strict;
 use warnings;
 
+use Sys::Hostname;
 use Net::Skinny;
 use Net::Skinny::Protocol qw/:all/;
 use Net::Skinny::Message;
 
 #Config
-my $skinny_server = '127.0.0.1';
+my $skinny_server = hostname;
 my $device_name = "SEP001120AABBCC";
 my $device_ip = 10+256*(11+256*(12+256*13)); # 10.11.12.13
 #======
@@ -70,6 +71,7 @@ $socket->receive_message(); # SoftKeyTemplateRes
 
 $socket->send_message(SOFT_KEY_SET_REQ_MESSAGE);
 $socket->receive_message(); # SoftKeySetRes
+$socket->receive_message(); # SelectSoftKeys
 
 $socket->send_message(
     LINE_STAT_REQ_MESSAGE,
@@ -82,8 +84,68 @@ $socket->send_message(
     count => 2
     );
 
-while(1) {
+for(my $i = 0; $i < 1; $i++) {
-	$socket->sleep(20);
+	$socket->sleep(5);
 	$socket->send_message(KEEP_ALIVE_MESSAGE);
 	$socket->receive_message(); # keepaliveack
 }
+$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();
+}
+

src/mod/endpoints/mod_skypopen/Makefile.am

@@ -2,6 +2,6 @@ include $(top_srcdir)/build/modmake.rulesam
 MODNAME=mod_skypopen
 mod_LTLIBRARIES = mod_skypopen.la
 mod_skypopen_la_SOURCES  = mod_skypopen.c skypopen_protocol.c
-mod_skypopen_la_CFLAGS   = $(AM_CFLAGS) -DSKYPOPEN_SVN_VERSION=\"`cat $(switch_builddir)/.version`\" -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff
+mod_skypopen_la_CFLAGS   = $(AM_CFLAGS) -DSKYPOPEN_SVN_VERSION=\"`git describe`\" -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff
 mod_skypopen_la_LIBADD   = $(switch_builddir)/libfreeswitch.la
 mod_skypopen_la_LDFLAGS  = -L../../../../libs/spandsp/src -avoid-version -module -no-undefined -shared -lX11 -lspandsp

src/mod/formats/mod_portaudio_stream/Makefile.am

@@ -7,8 +7,7 @@ MODPA_DIR=$(switch_srcdir)/src/mod/endpoints/mod_portaudio
 
 mod_LTLIBRARIES = mod_portaudio_stream.la
 mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c $(MODPA_DIR)/pablio.c $(MODPA_DIR)/pa_ringbuffer.c
-mod_portaudio_stream_la_CFLAGS  = $(AM_CFLAGS)
+mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS)
-mod_portaudio_stream_la_CFLAGS += -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR)
 mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA)
 mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS)
 

src/mod/languages/mod_managed/freeswitch_wrap.cxx

@@ -21403,6 +21403,26 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_partner(void *
 }
 
 
+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;
+}
+
+
 SWIGEXPORT char * SWIGSTDCALL CSharp_switch_channel_get_variable_dup(void * jarg1, char * jarg2, int jarg3) {
   char * jresult ;
   switch_channel_t *arg1 = (switch_channel_t *) 0 ;

src/mod/languages/mod_managed/managed/swig.cs

@@ -2904,6 +2904,11 @@ public class freeswitch {
     return ret;
   }
 
+  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;
+  }
+
   public static string switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel channel, string varname, switch_bool_t dup) {
     string ret = freeswitchPINVOKE.switch_channel_get_variable_dup(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, (int)dup);
     return ret;
@@ -10209,6 +10214,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_partner")]
   public static extern string switch_channel_get_variable_partner(HandleRef jarg1, string jarg2);
 
+  [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);
+
   [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_dup")]
   public static extern string switch_channel_get_variable_dup(HandleRef jarg1, string jarg2, int jarg3);
 

src/switch_channel.c

@@ -737,6 +737,37 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_profile_var(switch_channel_t
 	return status;
 }
 
+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;
+}
+
 SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel,
 																	  const char *varname, const char *value, switch_bool_t var_check)
 {