]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fe8c532)
FS-2746 updated in tree patch to head
authorJeff Lenk <jeff@jefflenk.com>
Fri, 12 Oct 2012 21:59:32 +0000 (16:59 -0500)
committerJeff Lenk <jeff@jefflenk.com>
Fri, 12 Oct 2012 22:00:56 +0000 (17:00 -0500)
patches/FS-2746.diff patch | blob | blame | history

diff --git a/patches/FS-2746.diff b/patches/FS-2746.diff
index 39a88f665690b565cc2ccd9d3312acd530f73d34..369c8140f48019bdab6376e6eaff0d72aaad6566 100644 (file)
--- a/patches/FS-2746.diff
+++ b/patches/FS-2746.diff
@@ -178,7 +178,7 @@
  libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.h        |   94 +-
  libs/xmlrpc-c/lib/expat/xmltok/.cvsignore          |    1 -
  libs/xmlrpc-c/lib/expat/xmltok/Makefile            |   21 +-
- libs/xmlrpc-c/lib/expat/xmltok/nametab.h           |  300 +-
+ libs/xmlrpc-c/lib/expat/xmltok/nametab.h           |  150 -
  libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h           |    9 +-
  libs/xmlrpc-c/lib/expat/xmltok/xmltok.c            |   62 +-
  libs/xmlrpc-c/lib/expat/xmltok/xmltok.dsp          |  259 -
@@ -310,7 +310,7 @@
  .../tools/xmlrpc_transport/xmlrpc_transport.c      |    2 +-
  libs/xmlrpc-c/transport_config.make                |   39 -
  libs/xmlrpc-c/unix-common.make                     |   79 -
- libs/xmlrpc-c/version.h                            |   16 +-
+ libs/xmlrpc-c/version.h                            |    8 -
  libs/xmlrpc-c/xmlrpc-c-config.in                   |  180 -
  libs/xmlrpc-c/xmlrpc-c-config.main                 |   24 +-
  libs/xmlrpc-c/xmlrpc-c-config.test.in              |  153 -
@@ -319,14 +319,14 @@
  libs/xmlrpc-c/xmlrpc_config.h.in                   |   76 +-
  src/include/switch_event.h                         |   16 +-
  src/include/switch_xml.h                           |    8 +-
- src/mod/applications/mod_commands/mod_commands.c   |  750 +-
+ src/mod/applications/mod_commands/mod_commands.c   |  766 +-
  src/mod/languages/mod_lua/mod_lua.cpp              |   10 +-
  src/mod/xml_int/mod_xml_rpc/Makefile               |   27 +-
  .../xml_int/mod_xml_rpc/mod_xml_rpc.2010.vcxproj   |  320 +-
  src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c          |  467 +-
  src/switch_loadable_module.c                       |    4 +-
  src/switch_xml.c                                   |   25 +-
- 328 files changed, 20770 insertions(+), 34260 deletions(-)
+ 328 files changed, 20620 insertions(+), 34268 deletions(-)
 
 diff --git a/.gitignore b/.gitignore
 index 1039628..ffc7fb1 100644
@@ -14223,10 +14223,10 @@ index fd8eda1..dfbf2d7 100644
 +      EndGlobalSection
 +EndGlobal
 diff --git a/configure.in b/configure.in
-index e8ab623..a10daf8 100644
+index b8db9bc..89cf47d 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -490,9 +490,8 @@ AC_SUBST(LIBTOOL_LIB_EXTEN)
+@@ -497,9 +497,8 @@ AC_SUBST(LIBTOOL_LIB_EXTEN)
  # Checks for header files.
  AC_HEADER_DIRENT
  AC_HEADER_STDC
@@ -14237,7 +14237,7 @@ index e8ab623..a10daf8 100644
  if test x"$ac_cv_header_wchar_h" = xyes; then
    HAVE_WCHAR_H_DEFINE=1
  else
-@@ -500,6 +499,31 @@ else
+@@ -507,6 +506,31 @@ else
  fi
  AC_SUBST(HAVE_WCHAR_H_DEFINE)
  
@@ -14269,7 +14269,7 @@ index e8ab623..a10daf8 100644
  # Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
  AC_C_INLINE
-@@ -603,6 +627,7 @@ fi
+@@ -610,6 +634,7 @@ fi
  # xmlrpc-c checks
  #
  
@@ -14277,7 +14277,7 @@ index e8ab623..a10daf8 100644
  
  HAVE_LIBWWW_SSL_DEFINE=0
  AC_SUBST(HAVE_LIBWWW_SSL_DEFINE)
-@@ -1049,8 +1074,10 @@ AC_CONFIG_FILES([Makefile
+@@ -1056,8 +1081,10 @@ AC_CONFIG_FILES([Makefile
                build/getg729.sh
                build/freeswitch.pc
                build/modmake.rules
@@ -42614,10 +42614,11 @@ index cfcb8dd..4cb9723 100644
 -include Makefile.depend
 +include depend.mk
 diff --git a/libs/xmlrpc-c/lib/expat/xmltok/nametab.h b/libs/xmlrpc-c/lib/expat/xmltok/nametab.h
-index b05e62c..adea34c 100644
+deleted file mode 100644
+index b05e62c..0000000
 --- a/libs/xmlrpc-c/lib/expat/xmltok/nametab.h
-+++ b/libs/xmlrpc-c/lib/expat/xmltok/nametab.h
-@@ -1,150 +1,150 @@
++++ /dev/null
+@@ -1,150 +0,0 @@
 -static const unsigned namingBitmap[] = {
 -0x00000000, 0x00000000, 0x00000000, 0x00000000,
 -0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -42768,156 +42769,6 @@ index b05e62c..adea34c 100644
 -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 -0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 -};
-+static const unsigned namingBitmap[] = {\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\r
-+0x00000000, 0x04000000, 0x87FFFFFE, 0x07FFFFFE,\r
-+0x00000000, 0x00000000, 0xFF7FFFFF, 0xFF7FFFFF,\r
-+0xFFFFFFFF, 0x7FF3FFFF, 0xFFFFFDFE, 0x7FFFFFFF,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFE00F, 0xFC31FFFF,\r
-+0x00FFFFFF, 0x00000000, 0xFFFF0000, 0xFFFFFFFF,\r
-+0xFFFFFFFF, 0xF80001FF, 0x00000003, 0x00000000,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0xFFFFD740, 0xFFFFFFFB, 0x547F7FFF, 0x000FFFFD,\r
-+0xFFFFDFFE, 0xFFFFFFFF, 0xDFFEFFFF, 0xFFFFFFFF,\r
-+0xFFFF0003, 0xFFFFFFFF, 0xFFFF199F, 0x033FCFFF,\r
-+0x00000000, 0xFFFE0000, 0x027FFFFF, 0xFFFFFFFE,\r
-+0x0000007F, 0x00000000, 0xFFFF0000, 0x000707FF,\r
-+0x00000000, 0x07FFFFFE, 0x000007FE, 0xFFFE0000,\r
-+0xFFFFFFFF, 0x7CFFFFFF, 0x002F7FFF, 0x00000060,\r
-+0xFFFFFFE0, 0x23FFFFFF, 0xFF000000, 0x00000003,\r
-+0xFFF99FE0, 0x03C5FDFF, 0xB0000000, 0x00030003,\r
-+0xFFF987E0, 0x036DFDFF, 0x5E000000, 0x001C0000,\r
-+0xFFFBAFE0, 0x23EDFDFF, 0x00000000, 0x00000001,\r
-+0xFFF99FE0, 0x23CDFDFF, 0xB0000000, 0x00000003,\r
-+0xD63DC7E0, 0x03BFC718, 0x00000000, 0x00000000,\r
-+0xFFFDDFE0, 0x03EFFDFF, 0x00000000, 0x00000003,\r
-+0xFFFDDFE0, 0x03EFFDFF, 0x40000000, 0x00000003,\r
-+0xFFFDDFE0, 0x03FFFDFF, 0x00000000, 0x00000003,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0xFFFFFFFE, 0x000D7FFF, 0x0000003F, 0x00000000,\r
-+0xFEF02596, 0x200D6CAE, 0x0000001F, 0x00000000,\r
-+0x00000000, 0x00000000, 0xFFFFFEFF, 0x000003FF,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0x00000000, 0xFFFFFFFF, 0xFFFF003F, 0x007FFFFF,\r
-+0x0007DAED, 0x50000000, 0x82315001, 0x002C62AB,\r
-+0x40000000, 0xF580C900, 0x00000007, 0x02010800,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\r
-+0x0FFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x03FFFFFF,\r
-+0x3F3FFFFF, 0xFFFFFFFF, 0xAAFF3F3F, 0x3FFFFFFF,\r
-+0xFFFFFFFF, 0x5FDFFFFF, 0x0FCF1FDC, 0x1FDC1FFF,\r
-+0x00000000, 0x00004C40, 0x00000000, 0x00000000,\r
-+0x00000007, 0x00000000, 0x00000000, 0x00000000,\r
-+0x00000080, 0x000003FE, 0xFFFFFFFE, 0xFFFFFFFF,\r
-+0x001FFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0x07FFFFFF,\r
-+0xFFFFFFE0, 0x00001FFF, 0x00000000, 0x00000000,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\r
-+0xFFFFFFFF, 0x0000003F, 0x00000000, 0x00000000,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,\r
-+0xFFFFFFFF, 0x0000000F, 0x00000000, 0x00000000,\r
-+0x00000000, 0x07FF6000, 0x87FFFFFE, 0x07FFFFFE,\r
-+0x00000000, 0x00800000, 0xFF7FFFFF, 0xFF7FFFFF,\r
-+0x00FFFFFF, 0x00000000, 0xFFFF0000, 0xFFFFFFFF,\r
-+0xFFFFFFFF, 0xF80001FF, 0x00030003, 0x00000000,\r
-+0xFFFFFFFF, 0xFFFFFFFF, 0x0000003F, 0x00000003,\r
-+0xFFFFD7C0, 0xFFFFFFFB, 0x547F7FFF, 0x000FFFFD,\r
-+0xFFFFDFFE, 0xFFFFFFFF, 0xDFFEFFFF, 0xFFFFFFFF,\r
-+0xFFFF007B, 0xFFFFFFFF, 0xFFFF199F, 0x033FCFFF,\r
-+0x00000000, 0xFFFE0000, 0x027FFFFF, 0xFFFFFFFE,\r
-+0xFFFE007F, 0xBBFFFFFB, 0xFFFF0016, 0x000707FF,\r
-+0x00000000, 0x07FFFFFE, 0x0007FFFF, 0xFFFF03FF,\r
-+0xFFFFFFFF, 0x7CFFFFFF, 0xFFEF7FFF, 0x03FF3DFF,\r
-+0xFFFFFFEE, 0xF3FFFFFF, 0xFF1E3FFF, 0x0000FFCF,\r
-+0xFFF99FEE, 0xD3C5FDFF, 0xB080399F, 0x0003FFCF,\r
-+0xFFF987E4, 0xD36DFDFF, 0x5E003987, 0x001FFFC0,\r
-+0xFFFBAFEE, 0xF3EDFDFF, 0x00003BBF, 0x0000FFC1,\r
-+0xFFF99FEE, 0xF3CDFDFF, 0xB0C0398F, 0x0000FFC3,\r
-+0xD63DC7EC, 0xC3BFC718, 0x00803DC7, 0x0000FF80,\r
-+0xFFFDDFEE, 0xC3EFFDFF, 0x00603DDF, 0x0000FFC3,\r
-+0xFFFDDFEC, 0xC3EFFDFF, 0x40603DDF, 0x0000FFC3,\r
-+0xFFFDDFEC, 0xC3FFFDFF, 0x00803DCF, 0x0000FFC3,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0xFFFFFFFE, 0x07FF7FFF, 0x03FF7FFF, 0x00000000,\r
-+0xFEF02596, 0x3BFF6CAE, 0x03FF3F5F, 0x00000000,\r
-+0x03000000, 0xC2A003FF, 0xFFFFFEFF, 0xFFFE03FF,\r
-+0xFEBF0FDF, 0x02FE3FFF, 0x00000000, 0x00000000,\r
-+0x00000000, 0x00000000, 0x00000000, 0x00000000,\r
-+0x00000000, 0x00000000, 0x1FFF0000, 0x00000002,\r
-+0x000000A0, 0x003EFFFE, 0xFFFFFFFE, 0xFFFFFFFF,\r
-+0x661FFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0x77FFFFFF,\r
-+};\r
-+static const unsigned char nmstrtPages[] = {\r
-+0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00,\r
-+0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,\r
-+0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13,\r
-+0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x15, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x17,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+};\r
-+static const unsigned char namePages[] = {\r
-+0x19, 0x03, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x00,\r
-+0x00, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,\r
-+0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13,\r
-+0x26, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x27, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x17,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,\r
-+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-+};\r
 diff --git a/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h b/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h
 index 3cccb83..523b3da 100644
 --- a/libs/xmlrpc-c/lib/expat/xmltok/xmlrole.h
@@ -65982,10 +65833,11 @@ index b684c70..0000000
 -        rm -f $(<:%.$(MAJ).$(MIN)=%); \
 -          $(LN_S) $(<:%.$(MIN)=%) $(<:%.$(MAJ).$(MIN)=%)
 diff --git a/libs/xmlrpc-c/version.h b/libs/xmlrpc-c/version.h
-index 18e70f2..45625f5 100644
+deleted file mode 100644
+index 18e70f2..0000000
 --- a/libs/xmlrpc-c/version.h
-+++ b/libs/xmlrpc-c/version.h
-@@ -1,8 +1,8 @@
++++ /dev/null
+@@ -1,8 +0,0 @@
 -#ifndef XMLRPC_C_VERSION_INCLUDED 
 -#define XMLRPC_C_VERSION_INCLUDED 
 -/* generated by Windows/mkvers.bat on Fri 05/23/2008 ... */ 
@@ -65994,14 +65846,6 @@ index 18e70f2..45625f5 100644
 -#define XMLRPC_VERSION_MINOR 14 
 -#define XMLRPC_VERSION_POINT 99 
 -#endif 
-+#ifndef XMLRPC_C_VERSION_INCLUDED \r
-+#define XMLRPC_C_VERSION_INCLUDED \r
-+/* generated by Windows/mkvers.bat on Sun 09/23/2012 ... */ \r
-+#define XMLRPC_C_VERSION "1.26.0" \r
-+#define XMLRPC_VERSION_MAJOR 1 \r
-+#define XMLRPC_VERSION_MINOR 26 \r
-+#define XMLRPC_VERSION_POINT 0 \r
-+#endif \r
 diff --git a/libs/xmlrpc-c/xmlrpc-c-config.in b/libs/xmlrpc-c/xmlrpc-c-config.in
 deleted file mode 100644
 index 2095b5f..0000000
@@ -66607,7 +66451,7 @@ index 46e69ae..9cba718 100644
 +
  #endif
 diff --git a/src/include/switch_event.h b/src/include/switch_event.h
-index cc78336..550cba3 100644
+index 52187cb..b4b5f1d 100644
 --- a/src/include/switch_event.h
 +++ b/src/include/switch_event.h
 @@ -41,10 +41,10 @@
@@ -66643,7 +66487,7 @@ index cc78336..550cba3 100644
    \param event the event to render
    \param str a string pointer to point at the allocated data
    \param encode url encode the headers
-@@ -318,7 +318,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_brackets(char *data, char a,
+@@ -319,7 +319,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_create_array_pair(switch_event_t **
  
  #ifndef SWIG
  /*!
@@ -66652,7 +66496,7 @@ index cc78336..550cba3 100644
    \param event the event to render
    \param fmt optional body of the event (varargs see standard sprintf family)
    \return the xml object if the operation was successful
-@@ -328,7 +328,7 @@ SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const ch
+@@ -329,7 +329,7 @@ SWITCH_DECLARE(switch_xml_t) switch_event_xmlize(switch_event_t *event, const ch
  #endif
  
  /*!
@@ -66693,7 +66537,7 @@ index f2a6eb3..a29250a 100644
  ///\param xml the xml node
  ///\param buf buffer to use
 diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
-index 7287d95..afd7b28 100644
+index 679f29b..df87773 100644
 --- a/src/mod/applications/mod_commands/mod_commands.c
 +++ b/src/mod/applications/mod_commands/mod_commands.c
 @@ -1,4 +1,4 @@
@@ -67138,19 +66982,19 @@ index 7287d95..afd7b28 100644
 -      stream->write_function(stream, "%d session(s) %d/%d\n", switch_core_session_count(), last_sps, sps);
 -      stream->write_function(stream, "%d session(s) max\n", switch_core_session_limit(0));
 -      stream->write_function(stream, "min idle cpu %0.2f/%0.2f\n", switch_core_min_idle_cpu(-1.0), switch_core_idle_cpu());
+-
 +      stream->write_function(stream, "%d session(s) - %d out of max %d per sec %s", switch_core_session_count(), last_sps, sps, nl);
 +      stream->write_function(stream, "%d session(s) max%s", switch_core_session_limit(0), nl);
 +      stream->write_function(stream, "min idle cpu %0.2f/%0.2f%s", switch_core_min_idle_cpu(-1.0), switch_core_idle_cpu(), nl);
  
--
 -      if (switch_core_get_stacksizes(&cur, &max) == SWITCH_STATUS_SUCCESS) {
 -              stream->write_function(stream, "Current Stack Size/Max %ldK/%ldK\n", cur / 1024, max / 1024);
--      }
++      if (switch_core_get_stacksizes(&cur, &max) == SWITCH_STATUS_SUCCESS) {          stream->write_function(stream, "Current Stack Size/Max %ldK/%ldK\n", cur / 1024, max / 1024);
+       }
 -
 -      if (html) {
 -              stream->write_function(stream, "</b>\n");
-+      if (switch_core_get_stacksizes(&cur, &max) == SWITCH_STATUS_SUCCESS) {          stream->write_function(stream, "Current Stack Size/Max %ldK/%ldK\n", cur / 1024, max / 1024);
-       }
+-      }
 -
 -      if (cmd && strstr(cmd, "refresh=")) {
 -              char *refresh = strchr(cmd, '=');
@@ -68029,7 +67873,7 @@ index 7287d95..afd7b28 100644
        }
  
        switch_safe_free(mycmd);
-@@ -5494,7 +5533,7 @@ SWITCH_STANDARD_API(uuid_loglevel)
+@@ -5508,7 +5547,7 @@ SWITCH_STANDARD_API(uuid_loglevel)
                        stream->write_function(stream, "+OK\n");
                        switch_core_session_rwunlock(tsession);
                } else {
@@ -68038,7 +67882,7 @@ index 7287d95..afd7b28 100644
                }
        }
  
-@@ -5530,7 +5569,7 @@ SWITCH_STANDARD_API(limit_usage_function)
+@@ -5544,7 +5583,7 @@ SWITCH_STANDARD_API(limit_usage_function)
                switch_assert(mydata);
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        }
@@ -68047,7 +67891,7 @@ index 7287d95..afd7b28 100644
        /* backwards compat version */
        if (argc == 2) {
                switch_safe_free(mydata);
-@@ -5541,7 +5580,7 @@ SWITCH_STANDARD_API(limit_usage_function)
+@@ -5555,7 +5594,7 @@ SWITCH_STANDARD_API(limit_usage_function)
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Using deprecated limit api: Please specify backend.  Defaulting to 'db' backend.\n");
        }
@@ -68056,7 +67900,7 @@ index 7287d95..afd7b28 100644
        if (argc < 3) {
                stream->write_function(stream, "USAGE: limit_usage %s\n", LIMIT_USAGE_SYNTAX);
                goto end;
-@@ -5552,9 +5591,9 @@ SWITCH_STANDARD_API(limit_usage_function)
+@@ -5566,9 +5605,9 @@ SWITCH_STANDARD_API(limit_usage_function)
                        dorate = SWITCH_TRUE;
                }
        }
@@ -68068,7 +67912,7 @@ index 7287d95..afd7b28 100644
        if (dorate == SWITCH_TRUE) {
                stream->write_function(stream, "%d/%d", count, rcount);
        } else {
-@@ -5601,7 +5640,7 @@ SWITCH_STANDARD_API(limit_status_function)
+@@ -5615,7 +5654,7 @@ SWITCH_STANDARD_API(limit_status_function)
                stream->write_function(stream, "USAGE: limit_status %s\n", LIMIT_STATUS_SYNTAX);
                goto end;
        }
@@ -68077,7 +67921,7 @@ index 7287d95..afd7b28 100644
        ret = switch_limit_status(argv[0]);
  
        stream->write_function(stream, "%s", ret);
-@@ -5631,7 +5670,7 @@ SWITCH_STANDARD_API(limit_reset_function)
+@@ -5645,7 +5684,7 @@ SWITCH_STANDARD_API(limit_reset_function)
                stream->write_function(stream, "USAGE: limit_reset %s\n", LIMIT_RESET_SYNTAX);
                goto end;
        }
@@ -68086,7 +67930,7 @@ index 7287d95..afd7b28 100644
        ret = switch_limit_reset(argv[0]);
  
        stream->write_function(stream, "%s", (ret == SWITCH_STATUS_SUCCESS) ? "+OK" : "-ERR");
-@@ -5661,7 +5700,7 @@ SWITCH_STANDARD_API(uuid_limit_function)
+@@ -5675,7 +5714,7 @@ SWITCH_STANDARD_API(uuid_limit_function)
                switch_assert(mydata);
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        }
@@ -68095,7 +67939,7 @@ index 7287d95..afd7b28 100644
        if (argc < 4) {
                stream->write_function(stream, "USAGE: uuid_limit %s\n", LIMIT_SYNTAX);
                goto end;
-@@ -5697,7 +5736,7 @@ SWITCH_STANDARD_API(uuid_limit_function)
+@@ -5711,7 +5750,7 @@ SWITCH_STANDARD_API(uuid_limit_function)
  
        sess = switch_core_session_locate(argv[0]);
        if (!sess) {
@@ -68104,7 +67948,7 @@ index 7287d95..afd7b28 100644
                goto end;
        }
  
-@@ -5738,7 +5777,7 @@ SWITCH_STANDARD_API(uuid_limit_release_function)
+@@ -5752,7 +5791,7 @@ SWITCH_STANDARD_API(uuid_limit_release_function)
                switch_assert(mydata);
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        }
@@ -68113,7 +67957,7 @@ index 7287d95..afd7b28 100644
        if (argc < 2) {
                stream->write_function(stream, "USAGE: uuid_limit_release %s\n", LIMIT_RELEASE_SYNTAX);
                goto end;
-@@ -5754,14 +5793,14 @@ SWITCH_STANDARD_API(uuid_limit_release_function)
+@@ -5768,14 +5807,14 @@ SWITCH_STANDARD_API(uuid_limit_release_function)
  
        sess = switch_core_session_locate(argv[0]);
        if (!sess) {
@@ -68130,7 +67974,7 @@ index 7287d95..afd7b28 100644
        stream->write_function(stream, "+OK");
  
  end:
-@@ -5782,7 +5821,7 @@ SWITCH_STANDARD_API(limit_interval_reset_function)
+@@ -5796,7 +5835,7 @@ SWITCH_STANDARD_API(limit_interval_reset_function)
                switch_assert(mydata);
                argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
        }
@@ -68139,7 +67983,7 @@ index 7287d95..afd7b28 100644
        if (argc < 3) {
                stream->write_function(stream, "USAGE: limit_interval_reset %s\n", LIMIT_INTERVAL_RESET_SYNTAX);
                goto end;
-@@ -5876,23 +5915,23 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
+@@ -5890,132 +5929,131 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
  
        switch_thread_rwlock_create(&bgapi_rwlock, pool);
        switch_mutex_init(&reload_mutex, SWITCH_MUTEX_NESTED, pool);
@@ -68170,10 +68014,22 @@ index 7287d95..afd7b28 100644
 +      SWITCH_ADD_API(commands_api_interface, "echo", "Echo", echo_function, "<data>");
 +      SWITCH_ADD_API(commands_api_interface, "escape", "Escape a string", escape_function, "<data>");
        SWITCH_ADD_API(commands_api_interface, "eval", "eval (noop)", eval_function, "[uuid:<uuid> ]<expression>");
-       SWITCH_ADD_API(commands_api_interface, "expand", "expand vars and execute", expand_function, "[uuid:<uuid> ]<cmd> <args>");
-       SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a user", find_user_function, "<key> <user> <domain>");
-@@ -5904,104 +5943,103 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
-       SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX);
+-      SWITCH_ADD_API(commands_api_interface, "expand", "expand vars and execute", expand_function, "[uuid:<uuid> ]<cmd> <args>");
+-      SWITCH_ADD_API(commands_api_interface, "find_user_xml", "find a user", find_user_function, "<key> <user> <domain>");
+-      SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX);
+-      SWITCH_ADD_API(commands_api_interface, "...", "shutdown", shutdown_function, "");
+-      SWITCH_ADD_API(commands_api_interface, "shutdown", "shutdown", shutdown_function, "");
+-      SWITCH_ADD_API(commands_api_interface, "version", "version", version_function, "[short]");
+-      SWITCH_ADD_API(commands_api_interface, "global_getvar", "global_getvar", global_getvar_function, GLOBAL_GETVAR_SYNTAX);
+-      SWITCH_ADD_API(commands_api_interface, "global_setvar", "global_setvar", global_setvar_function, GLOBAL_SETVAR_SYNTAX);
++      SWITCH_ADD_API(commands_api_interface, "expand", "Execute an api with variable expansion", expand_function, "[uuid:<uuid> ]<cmd> <args>");
++      SWITCH_ADD_API(commands_api_interface, "find_user_xml", "Find a user", find_user_function, "<key> <user> <domain>");
++      SWITCH_ADD_API(commands_api_interface, "fsctl", "FS control messages", ctl_function, CTL_SYNTAX);
++      SWITCH_ADD_API(commands_api_interface, "...", "Shutdown", shutdown_function, "");
++      SWITCH_ADD_API(commands_api_interface, "shutdown", "Shutdown", shutdown_function, "");
++      SWITCH_ADD_API(commands_api_interface, "version", "Version", version_function, "[short]");
++      SWITCH_ADD_API(commands_api_interface, "global_getvar", "Get global var", global_getvar_function, GLOBAL_GETVAR_SYNTAX);
++      SWITCH_ADD_API(commands_api_interface, "global_setvar", "Set global var", global_setvar_function, GLOBAL_SETVAR_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "group_call", "Generate a dial string to call a group", group_call_function, "<group>[@<domain>]");
        SWITCH_ADD_API(commands_api_interface, "help", "Show help for all the api commands", help_function, "");
 -      SWITCH_ADD_API(commands_api_interface, "host_lookup", "host_lookup", host_lookup_function, "<hostname>");
@@ -68338,7 +68194,7 @@ index 7287d95..afd7b28 100644
  
        switch_console_set_complete("add alias add");
        switch_console_set_complete("add alias del");
-@@ -6086,6 +6124,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
+@@ -6100,6 +6138,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
        switch_console_set_complete("add show nat_map");
        switch_console_set_complete("add show registrations");
        switch_console_set_complete("add show say");
@@ -68346,7 +68202,7 @@ index 7287d95..afd7b28 100644
        switch_console_set_complete("add show timer");
        switch_console_set_complete("add shutdown");
        switch_console_set_complete("add sql_escape");
-@@ -6151,18 +6190,17 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
+@@ -6165,18 +6204,17 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
        switch_console_set_complete("add ...");
        switch_console_set_complete("add file_exists");
  
Mirror of https://github.com/signalwire/freeswitch.git